[openjpa] update to 2.2.2

gil gil at fedoraproject.org
Fri May 31 14:33:04 UTC 2013 

commit 5c786cdd45255b35041eb45bc62027116dad6317
Author: gil <puntogil at libero.it>
Date:   Fri May 31 16:31:09 2013 +0200

    update to 2.2.2

 .gitignore   |    1 +
 openjpa.spec |   83 +++++++++++++++++++++++++++++++++++----------------------
 sources      |    2 +-
 3 files changed, 53 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94b5349..1fdc515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /apache-openjpa-2.2.0-source.zip
 /apache-openjpa-2.2.1-source.zip
+/apache-openjpa-2.2.2-source.zip
diff --git a/openjpa.spec b/openjpa.spec
index 5fb5d20..6b935c5 100644
--- a/openjpa.spec
+++ b/openjpa.spec
@@ -2,37 +2,29 @@
 %global with_tests 0
 
 Name:          openjpa
-Version:       2.2.1
-Release:       4%{?dist}
+Version:       2.2.2
+Release:       1%{?dist}
 Summary:       Java Persistence 2.0 API
 Group:         Development/Libraries
-# # For a breakdown of the licensing, see NOTICE file
+# For a breakdown of the licensing, see NOTICE file
 License:       ASL 2.0 and CDDL
 Url:           http://openjpa.apache.org/
-Source0:       ftp://ftp.gbnet.net/pub/apache/dist/%{name}/%{version}/apache-%{name}-%{version}-source.zip
-# force tomcat 7.x apis
-Source1:       %{name}-2.2.0-depmap
+Source0:       http://www.apache.org/dist/openjpa/%{version}/apache-%{name}-%{version}-source.zip
 # fix test failure
 Patch0:        %{name}-2.2.0-persistence-jdbc-DynamicEnhancementSuite.patch
-# remove testing profiles for unavailable drivers: db2jcc informix-driver jcc-driver jdbc-driver jdbc-oracle jtds sqljdbc
-Patch1:        %{name}-2.2.0-remove-test-profiles.patch
 
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
 
 BuildRequires: apache-rat-plugin
 BuildRequires: buildnumber-maven-plugin
 BuildRequires: javacc-maven-plugin
+BuildRequires: maven-local
 BuildRequires: maven-antrun-plugin
-BuildRequires: maven-compiler-plugin
 BuildRequires: maven-dependency-plugin
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
 BuildRequires: maven-invoker-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
+BuildRequires: maven-remote-resources-plugin
+BuildRequires: maven-site-plugin
 BuildRequires: maven-surefire-provider-junit4
 
 # maven-antrun-plugin deps
@@ -55,7 +47,9 @@ BuildRequires: glassfish-jaxb-api
 BuildRequires: hibernate-jpa-2.0-api
 BuildRequires: hsqldb
 BuildRequires: log4j
-BuildRequires: maven-local
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires: objectweb-asm
 BuildRequires: plexus-utils
 BuildRequires: postgresql-jdbc
@@ -98,7 +92,6 @@ Requires:      slf4j
 Requires:      tomcat-servlet-3.0-api
 
 Requires:      java
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description
@@ -112,13 +105,13 @@ which simplifies storing objects in databases.
 %package tools
 Group:         Development/Libraries
 Summary:       OpenJPA tools - Maven Plugin
-Requires:      maven
+Requires:      mvn(org.apache.maven:maven-plugin-api)
+Requires:      mvn(org.apache.maven:maven-project)
+Requires:      mvn(org.codehaus.plexus:plexus-utils)
 Requires:      bval
 Requires:      geronimo-validation
 Requires:      hibernate-jpa-2.0-api
 Requires:      log4j
-Requires:      plexus-utils
-Requires:      jpackage-utils
 Requires:      %{name} = %{version}-%{release}
 
 %description tools
@@ -128,7 +121,6 @@ schema mapping creation using Apache maven.
 %package javadoc
 Group:         Documentation
 Summary:       Javadoc for %{name}
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}.
@@ -137,12 +129,16 @@ This package contains javadoc for %{name}.
 %setup -q -n apache-openjpa-%{version}-source
 find . -name "*.class" -delete
 find . -name "*.jar" -delete
+# openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar
+%patch0 -p0
+
+%pom_remove_plugin :docbkx-maven-plugin
+%pom_remove_plugin :maven-checkstyle-plugin
+%pom_remove_plugin :findbugs-maven-plugin
+%pom_remove_plugin :ianal-maven-plugin
+%pom_remove_plugin :taglist-maven-plugin
 
-%pom_remove_plugin com.agilejava.docbkx:docbkx-maven-plugin
-%pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
-%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
-%pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin
-%pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='ydoc-profile']"
 
 %pom_remove_dep net.sourceforge.findbugs:annotations
 
@@ -220,11 +216,28 @@ done
     <artifactId>bval-jsr303</artifactId>
     <version>0.5</version>
   </dependency>" openjpa-tools/openjpa-maven-plugin
+  
+# remove testing profiles for unavailable drivers: 
+# db2jcc informix-driver jcc-driver jdbc-driver jdbc-oracle jtds sqljdbc
+#%%pom_xpath_remove "pom:profiles/pom:profile[pom:id='test-mysql']" openjpa-persistence-jdbc
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-sybase-jconnect']" openjpa-persistence-jdbc
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-soliddb']" openjpa-persistence-jdbc
+for p in openjpa-persistence-jdbc openjpa-persistence-locking; do
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-custom']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-custom2']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-db2-jcc']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-derbyjcc']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-ids-jcc']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-ids-informix']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-ingres']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-mssql']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-oracle']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-sqlserver']" ${p}
+%pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-sybase']" ${p}
+done
 
-%patch0 -p0
-%patch1 -p1
 # in f17 buildnumber dont work
-#om_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
+#%%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
 
 
 %pom_disable_module openjpa
@@ -237,9 +250,12 @@ done
 # break build in f19
 %pom_remove_plugin :maven-invoker-plugin openjpa-tools/openjpa-maven-plugin
 
+#%%pom_remove_dep org.apache.maven:maven-project openjpa-tools/openjpa-maven-plugin
+#%%pom_add_dep org.apache.maven:maven-core openjpa-tools/openjpa-maven-plugin
+
 %build
 # test random fails
-
+# force tomcat 7.x apis
 mvn-rpmbuild -e \
 %if %{with_tests}
   -Ptest-derby \
@@ -248,8 +264,8 @@ mvn-rpmbuild -e \
 %endif
   -DfailIfNoTests=false \
   -Dmaven.test.failure.ignore=true \
-  -Dmaven.local.depmap.file="%{SOURCE1}" \
-  install javadoc:aggregate process-resources
+  -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/tomcat-tomcat-servlet-api" \
+  package process-resources javadoc:aggregate
 
 %install
 
@@ -323,6 +339,9 @@ install -p -m 644 %{name}-ant %{buildroot}%{_sysconfdir}/ant.d/%{name}
 %doc LICENSE NOTICE
 
 %changelog
+* Thu May 23 2013 gil cattaneo <puntogil at libero.it> 2.2.2-1
+- update to 2.2.2
+
 * Sun Feb 17 2013 gil cattaneo <puntogil at libero.it> 2.2.1-4
 - disabled invoker-plugin in f19
 
diff --git a/sources b/sources
index 1d3f722..fad0318 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-642be4e6629a137aff8cc921208b17a6  apache-openjpa-2.2.1-source.zip
+8701b3bc63b25f8f92e257aca3e44817  apache-openjpa-2.2.2-source.zip

More information about the scm-commits mailing list