gil pushed to morphia (master). "remove bundle commons-collections"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat May 30 10:27:25 UTC 2015
From 72ccc6eada3479dceb227011aecffe146918a571 Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Sat, 30 May 2015 12:27:08 +0200
Subject: remove bundle commons-collections
diff --git a/morphia.spec b/morphia.spec
index 85969c6..4a20610 100644
--- a/morphia.spec
+++ b/morphia.spec
@@ -2,7 +2,7 @@ Name: morphia
# Latest release use mongo-java-driver >= 2.11.12
# https://bugzilla.redhat.com/show_bug.cgi?id=1178257
Version: 0.105
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A type-safe Java library for MongoDB
License: ASL 2.0
URL: https://github.com/mongodb/morphia
@@ -10,10 +10,14 @@ Source0: https://github.com/mongodb/morphia/archive/%{version}.tar.gz
BuildRequires: maven-local
BuildRequires: mvn(cglib:cglib)
-BuildRequires: mvn(com.google.collections:google-collections)
+BuildRequires: mvn(com.google.guava:guava)
+BuildRequires: mvn(com.google.inject:guice)
+BuildRequires: mvn(com.sun.xml.bind:jaxb-impl)
BuildRequires: mvn(com.thoughtworks.proxytoys:proxytoys)
+BuildRequires: mvn(commons-collections:commons-collections)
BuildRequires: mvn(javax.validation:validation-api)
BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin)
BuildRequires: mvn(org.mongodb:mongo-java-driver)
BuildRequires: mvn(org.reflections:reflections)
@@ -78,12 +82,15 @@ This package contains javadoc for %{name}.
find . -name "*.class" -print -delete
find . -name "*.jar" -print -delete
+rm -r %{name}/src/main/java/relocated
+%pom_add_dep commons-collections:commons-collections:3.2.1
+sed -i "s|relocated.morphia.||" $(find %{name} -name "*.java")
+
%pom_remove_plugin :gwt-maven-plugin
%pom_remove_plugin :maven-license-plugin
%pom_remove_plugin :maven-source-plugin
%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:executions"
-#%% pom_disable_module entityscanner-plug
%pom_disable_module gwt
%pom_disable_module jrebel-plug
%pom_disable_module no-proxy-deps-tests
@@ -100,6 +107,25 @@ find . -name "*.jar" -print -delete
%pom_remove_plugin :maven-shade-plugin entityscanner-plug
+%pom_remove_dep com.google.collections:google-collections entityscanner-plug
+%pom_add_dep com.google.guava:guava:14.0.1 entityscanner-plug
+
+# Add OSGi manifest
+for p in entityscanner-plug guice-plug logging-slf4j validation; do
+ %pom_xpath_set "pom:packaging" bundle ${p}
+ %pom_add_plugin org.apache.felix:maven-bundle-plugin:2.3.7 ${p} '
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>'
+done
+
%build
# Tests require web access
@@ -131,6 +157,11 @@ find . -name "*.jar" -print -delete
%license %{name}/LICENSE.txt
%changelog
+* Sat May 30 2015 gil cattaneo <puntogil at libero.it> 0.105-3
+- remove bundle commons-collections
+- add OSGi support
+- upgrade google-collections to guava
+
* Fri May 29 2015 gil cattaneo <puntogil at libero.it> 0.105-2
- remove duplicate files
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/morphia.git/commit/?h=master&id=72ccc6eada3479dceb227011aecffe146918a571
More information about the scm-commits
mailing list