[hazelcast] update to 3.2.2
gil
gil at fedoraproject.org
Wed Jun 11 16:42:46 UTC 2014
commit 6766459b3ee9b0bd1c2fc20a01423bba619ea5d4
Author: gil <puntogil at libero.it>
Date: Wed Jun 11 18:42:37 2014 +0200
update to 3.2.2
.gitignore | 1 +
hazelcast.spec | 110 +++++++++++++++++++++++++++++++++----------------------
sources | 2 +-
3 files changed, 68 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9002dfe..229473b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/v2.6.3.tar.gz
+/v3.2.2.tar.gz
diff --git a/hazelcast.spec b/hazelcast.spec
index ef9a601..e279676 100644
--- a/hazelcast.spec
+++ b/hazelcast.spec
@@ -1,6 +1,6 @@
Name: hazelcast
-Version: 2.6.3
-Release: 2%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
Summary: Hazelcast CE In-Memory DataGrid
License: ASL 2.0
URL: http://www.hazelcast.com/
@@ -8,20 +8,30 @@ Source0: https://github.com/hazelcast/hazelcast/archive/v%{version}.tar.gz
BuildRequires: java-devel
-BuildRequires: glassfish-jsp-api
-# dont support hibernate 4.x series
-BuildRequires: hibernate3
-BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
-BuildRequires: mvn(com.google.guava:guava)
-BuildRequires: mvn(org.hibernate.common:hibernate-commons-annotations)
+%if %{fedora} >= 21
+BuildRequires: mvn(log4j:log4j:1.2.17)
+%else
BuildRequires: mvn(log4j:log4j)
+%endif
+BuildRequires: mvn(net.sourceforge.findbugs:annotations)
+BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
+# use groovy-all 2.1.8
+BuildRequires: mvn(org.codehaus.groovy:groovy)
+BuildRequires: mvn(org.hibernate:hibernate-core)
BuildRequires: mvn(org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec)
+BuildRequires: mvn(org.jruby:shared)
+%if %{fedora} >= 20
+BuildRequires: mvn(org.jruby:jruby)
+%else
+BuildRequires: mvn(org.jruby:shared)
+%endif
+BuildRequires: mvn(org.osgi:org.osgi.core)
BuildRequires: mvn(org.slf4j:slf4j-api)
-# required by hibernate3
-BuildRequires: mvn(javax.transaction:jta)
+BuildRequires: glassfish-jsp-api
%if 0
# hazelcast-spring
+BuildRequires: hibernate3
BuildRequires: mvn(javax.annotation:jsr250-api)
BuildRequires: mvn(org.springframework:spring-beans)
BuildRequires: mvn(org.springframework:spring-context)
@@ -33,18 +43,13 @@ BuildRequires: mvn(org.springframework.data:spring-data-mongodb) >= 1.0.1.RELEAS
# hazelcast-spring test deps
BuildRequires: mvn(org.springframework:spring-tx)
BuildRequires: mvn(org.springframework:spring-test)
-%endif
# test deps
-BuildRequires: glassfish-jsp
-#BuildRequires: mvn(org.eclipse.jetty:jetty-jsp)
BuildRequires: mvn(javassist:javassist)
+BuildRequires: mvn(org.hsqldb:hsqldb)
+#BuildRequires: mvn(org.eclipse.jetty:jetty-jsp)
BuildRequires: mvn(org.eclipse.jetty:jetty-webapp)
BuildRequires: mvn(org.slf4j:slf4j-simple)
-%if %{fedora} > 19
-BuildRequires: mvn(hsqldb:hsqldb:1)
-%else
-BuildRequires: mvn(hsqldb:hsqldb)
%endif
BuildRequires: mvn(junit:junit)
@@ -78,10 +83,12 @@ Summary: Hazelcast EC2 Auto Discovery
%description cloud
Hazelcast EC2 Auto Discovery.
-%package hibernate3
+%package hibernate
Summary: Integration of Hazelcast with Hibernate 3
+Provides: %{name}-hibernate3 = %{version}-%{release}
+Obsoletes: %{name}-hibernate3 < %{version}-%{release}
-%description hibernate3
+%description hibernate
Hazelcast second level cache provider for Hibernate 3.
%package ra
@@ -120,19 +127,25 @@ find . -name "*.rar" -delete
find . -name "*.war" -delete
%pom_remove_plugin :findbugs-maven-plugin
-%pom_remove_plugin :animal-sniffer-maven-plugin %{name}
-%pom_remove_plugin :animal-sniffer-maven-plugin %{name}-client
-%pom_remove_plugin :animal-sniffer-maven-plugin %{name}-cloud
-%pom_remove_plugin :animal-sniffer-maven-plugin %{name}-hibernate
-%pom_remove_plugin :animal-sniffer-maven-plugin %{name}-ra
-%pom_remove_plugin :animal-sniffer-maven-plugin %{name}-spring
-%pom_remove_plugin :animal-sniffer-maven-plugin %{name}-wm
+
+for p in %{name} \
+ %{name}-client \
+ %{name}-cloud \
+ %{name}-hibernate \
+ %{name}-ra/hazelcast-jca \
+ %{name}-spring \
+ %{name}-wm; do
+%pom_remove_plugin :maven-source-plugin ${p}
+%pom_remove_plugin :animal-sniffer-maven-plugin ${p}
+done
+
%pom_remove_plugin :jetty-maven-plugin %{name}-wm
%pom_disable_module %{name}-documentation
+%pom_disable_module hazelcast-hibernate3 %{name}-hibernate
+%pom_disable_module hazelcast-jca-rar %{name}-ra
# requires org.springframework.data:spring-data-mongodb
%pom_disable_module %{name}-spring
-%pom_xpath_remove "pom:project/pom:build/pom:resources/pom:resource[pom:directory='../hazelcast-spring/target/classes']" %{name}-all
%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:executions/pom:execution/pom:configuration/pom:instructions/pom:Import-Package" %{name}-all
%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:executions/pom:execution/pom:configuration/pom:instructions" "
@@ -147,23 +160,26 @@ find . -name "*.war" -delete
org.hibernate.*;resolution:=optional,
*
</Import-Package>" %{name}-all
-%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-dependency-plugin']/pom:executions/pom:execution/pom:configuration/pom:artifactItems/pom:artifactItem[pom:artifactId='hazelcast-spring']" %{name}-all
-
+%pom_remove_plugin :maven-shade-plugin %{name}-all
+sed -i 's|<artifactId>hazelcast-hibernate3</artifactId>|<artifactId>hazelcast-hibernate4</artifactId>|' %{name}-all/pom.xml
-%pom_xpath_set "pom:project/pom:properties/pom:hibernate.core.version" 3 %{name}-hibernate
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.mockito' ]/pom:artifactId" mockito-core
-%if %{fedora} > 19
-%pom_xpath_set "pom:project/pom:properties/pom:hsqldb.version" 1 %{name}-hibernate
+%if %{fedora} >= 20
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.jruby' ]/pom:artifactId" jruby %{name}
+%else
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.jruby' ]/pom:artifactId" shared %{name}
%endif
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.mockito' ]/pom:artifactId" mockito-core
-
-%pom_xpath_set "pom:project/pom:packaging" jar %{name}-ra
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy' ]/pom:artifactId" groovy %{name}
-%pom_remove_dep geronimo-spec:geronimo-spec-j2ee-connector %{name}-ra
-%pom_add_dep org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec::provided %{name}-ra
-%pom_remove_plugin :maven-rar-plugin %{name}-ra
+%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec %{name}-ra/%{name}-jca
+%pom_add_dep org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec::provided %{name}-ra/%{name}-jca
+%pom_remove_dep org.jboss.spec:jboss-javaee-6.0 %{name}-ra/%{name}-jca
+%pom_remove_dep org.jboss.arquillian.extension:arquillian-transaction-bom %{name}-ra/%{name}-jca
+%pom_remove_dep org.jboss.arquillian:arquillian-bom %{name}-ra/%{name}-jca
+%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:scope='test']" %{name}-ra/%{name}-jca
%pom_remove_dep javax.servlet:javax.servlet-api %{name}-wm
%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided %{name}-wm
@@ -177,9 +193,7 @@ cp -p src/main/resources/notice.txt .
sed -i 's|../lib/hazelcast-${project.version}.jar|%{_javadir}/%{name}/%{name}.jar|' \
%{name}/src/main/resources/*.sh
sed -i 's|../lib/hazelcast-client-${project.version}.jar|%{_javadir}/%{name}/%{name}-client.jar|' \
- %{name}-client/src/main/resources/*.sh
-sed -i 's|../lib/hazelcast-${project.version}.jar:../lib/hazelcast-wm-${project.version}.jar|%{_javadir}/%{name}/%{name}.jar:%{_javadir}/%{name}/%{name}-wm.jar|' \
- %{name}-wm/src/main/resources/*.sh
+%{name}/src/main/resources/client.sh
for m in client \
hibernate \
@@ -189,12 +203,17 @@ for m in client \
done
rm -rf hazelcast*/src/test/java/*
+%if %{fedora} >= 21
+sed -i "s|<log4j.version>1.2.12</log4j.version>|<log4j.version>1.2.17</log4j.version>|" pom.xml
+%endif
+
%build
-%mvn_package ":%{name}-all" %{name}
+#%%mvn_package ":%%{name}-all" %%{name}
%mvn_package ":%{name}-root" %{name}
-%mvn_package ":%{name}-hibernate" %{name}-hibernate3
+%mvn_package ":%{name}-hibernate*" %{name}-hibernate
+%mvn_package ":%{name}-jca" %{name}-ra
# takes too much time and @ random fails
# e.g.
# [INFO] hazelcast ......................................... SUCCESS [49:00.842s]
@@ -217,7 +236,7 @@ rm -rf hazelcast*/src/test/java/*
%files cloud -f .mfiles-%{name}-cloud
%doc license.txt notice.txt
-%files hibernate3 -f .mfiles-%{name}-hibernate3
+%files hibernate -f .mfiles-%{name}-hibernate
%doc license.txt notice.txt
%files ra -f .mfiles-%{name}-ra
@@ -235,6 +254,9 @@ rm -rf hazelcast*/src/test/java/*
%doc license.txt notice.txt
%changelog
+* Wed Jun 11 2014 gil cattaneo <puntogil at libero.it> 3.2.2-1
+- update to 3.2.2
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index c518c31..3bba683 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10d11846c6b8fe4b72e9877f6ab09c37 v2.6.3.tar.gz
+01165c8e69b8d412e322fc7f45fe5e70 v3.2.2.tar.gz
More information about the scm-commits
mailing list