[openjpa] switch to XMvn

gil gil at fedoraproject.org
Tue Jul 9 11:12:51 UTC 2013 

commit 43dd7bb269b4075c76d45eaa89d3e560a5257aa2
Author: gil <puntogil at libero.it>
Date:   Tue Jul 9 13:12:32 2013 +0200

    switch to XMvn

 openjpa-2.2.0-depmap                         |   14 -
 openjpa-2.2.0-jdbc-pom.patch                 |   19 -
 openjpa-2.2.0-jest-pom.patch                 |   13 -
 openjpa-2.2.0-kernel-pom.patch               |   29 --
 openjpa-2.2.0-maven-plugin-pom.patch         |   26 --
 openjpa-2.2.0-parent-pom.patch               |   95 -----
 openjpa-2.2.0-persistence-pom.patch          |   25 --
 openjpa-2.2.0-remove-checkstyle-plugin.patch |   56 ---
 openjpa-2.2.0-remove-ianal-plugin.patch      |   41 --
 openjpa-2.2.0-remove-test-profiles.patch     |  547 --------------------------
 openjpa-2.2.0-slice-pom.patch                |   13 -
 openjpa-2.2.0-tools-it-poms.patch            |   56 ---
 openjpa.spec                                 |  114 +-----
 13 files changed, 20 insertions(+), 1028 deletions(-)
---
diff --git a/openjpa.spec b/openjpa.spec
index aaa2243..a8763cb 100644
--- a/openjpa.spec
+++ b/openjpa.spec
@@ -3,7 +3,7 @@
 
 Name:          openjpa
 Version:       2.2.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Java Persistence 2.0 API
 Group:         Development/Libraries
 # For a breakdown of the licensing, see NOTICE file
@@ -23,6 +23,7 @@ BuildRequires: maven-antrun-plugin
 BuildRequires: maven-dependency-plugin
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-invoker-plugin
+BuildRequires: maven-plugin-plugin
 BuildRequires: maven-remote-resources-plugin
 BuildRequires: maven-site-plugin
 BuildRequires: maven-surefire-provider-junit4
@@ -45,7 +46,7 @@ BuildRequires: geronimo-validation
 BuildRequires: glassfish-jaxb
 BuildRequires: glassfish-jaxb-api
 BuildRequires: hibernate-jpa-2.0-api
-BuildRequires: hsqldb1
+BuildRequires: hsqldb
 BuildRequires: log4j
 BuildRequires: mvn(org.apache.maven:maven-plugin-api)
 BuildRequires: mvn(org.apache.maven:maven-project)
@@ -69,29 +70,6 @@ BuildRequires: mysql-connector-java
 BuildRequires: regexp
 BuildRequires: simple-jndi
 
-Requires:      ant
-Requires:      apache-commons-collections
-Requires:      apache-commons-dbcp
-Requires:      apache-commons-lang
-Requires:      apache-commons-logging
-Requires:      apache-commons-pool
-Requires:      felix-osgi-core
-Requires:      geronimo-jms
-Requires:      geronimo-jta
-Requires:      geronimo-validation
-Requires:      glassfish-jaxb
-Requires:      glassfish-jaxb-api
-Requires:      hibernate-jpa-2.0-api
-Requires:      hsqldb1
-Requires:      log4j
-Requires:      objectweb-asm
-Requires:      postgresql-jdbc
-Requires:      serp
-Requires:      slf4j
-# servlet-api 2.4
-Requires:      tomcat-servlet-3.0-api
-
-Requires:      java
 BuildArch:     noarch
 
 %description
@@ -103,23 +81,13 @@ It is an object-relational mapping (ORM) solution for the Java language,
 which simplifies storing objects in databases.
 
 %package tools
-Group:         Development/Libraries
 Summary:       OpenJPA tools - Maven Plugin
-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:      %{name} = %{version}-%{release}
 
 %description tools
 OpenJPA tasks for enhancing, SQL creation and
 schema mapping creation using Apache maven.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
 
 %description javadoc
@@ -250,13 +218,20 @@ done
 # break build in f19
 %pom_remove_plugin :maven-invoker-plugin openjpa-tools/openjpa-maven-plugin
 
+%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:artifactId='hsqldb']" "
+<version>1</version>" openjpa-jdbc
+
+sed -i 's|<hsqldb.version>1.8.0.10</hsqldb.version>|<hsqldb.version>1</hsqldb.version>|' pom.xml
+
 #%%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
+%mvn_package ":%{name}-tools" tools
+%mvn_package ":%{name}-maven-plugin" tools
 # test random fails
 # force tomcat 7.x apis
-mvn-rpmbuild -e \
+%mvn_build -- \
 %if %{with_tests}
   -Ptest-derby \
 %else
@@ -265,80 +240,31 @@ mvn-rpmbuild -e \
   -DfailIfNoTests=false \
   -Dmaven.test.failure.ignore=true \
   -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/tomcat-tomcat-servlet-api" \
-  package process-resources javadoc:aggregate
+  process-resources
 
 %install
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-parent.pom
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-for m in jdbc \
-  jest \
-  kernel \
-  lib \
-  persistence \
-  persistence-jdbc \
-  persistence-locking \
-  slice \
-  xmlstore;do
-    install -m 644 %{name}-${m}/target/%{name}-${m}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar
-    install -pm 644 %{name}-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom
-    %add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar
-done
-
-install -pm 644 %{name}-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-tools.pom
-%add_maven_depmap -f tools JPP.%{name}-tools.pom
-install -pm 644 %{name}-tools/%{name}-maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-plugin.pom
-install -m 644 %{name}-tools/%{name}-maven-plugin/target/%{name}-maven-plugin-%{version}.jar \
-  %{buildroot}%{_javadir}/%{name}/maven-plugin.jar
-%add_maven_depmap -f tools JPP.%{name}-maven-plugin.pom %{name}/maven-plugin.jar -a "org.codehaus.mojo:openjpa-maven-plugin"
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
 
 mkdir -p %{buildroot}%{_sysconfdir}/ant.d
 echo "ant %{name}/jdbc %{name}/kernel %{name}/lib" > %{name}-ant
 install -p -m 644 %{name}-ant %{buildroot}%{_sysconfdir}/ant.d/%{name}
 
-%files
+%files -f .mfiles
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/jdbc.jar
-%{_javadir}/%{name}/jest.jar
-%{_javadir}/%{name}/kernel.jar
-%{_javadir}/%{name}/lib.jar
-%{_javadir}/%{name}/persistence.jar
-%{_javadir}/%{name}/persistence-jdbc.jar
-%{_javadir}/%{name}/persistence-locking.jar
-%{_javadir}/%{name}/slice.jar
-%{_javadir}/%{name}/xmlstore.jar
-%{_mavenpomdir}/JPP.%{name}-jdbc.pom
-%{_mavenpomdir}/JPP.%{name}-jest.pom
-%{_mavenpomdir}/JPP.%{name}-kernel.pom
-%{_mavenpomdir}/JPP.%{name}-lib.pom
-%{_mavenpomdir}/JPP.%{name}-parent.pom
-%{_mavenpomdir}/JPP.%{name}-persistence.pom
-%{_mavenpomdir}/JPP.%{name}-persistence-jdbc.pom
-%{_mavenpomdir}/JPP.%{name}-persistence-locking.pom
-%{_mavenpomdir}/JPP.%{name}-slice.pom
-%{_mavenpomdir}/JPP.%{name}-xmlstore.pom
-%{_mavendepmapfragdir}/%{name}
 %config(noreplace) %{_sysconfdir}/ant.d/%{name}
 %doc CHANGES.txt LICENSE NOTICE README.txt RELEASE-NOTES.html
 
-%files tools
-%{_javadir}/%{name}/maven-plugin.jar
-%{_mavenpomdir}/JPP.%{name}-tools.pom
-%{_mavenpomdir}/JPP.%{name}-maven-plugin.pom
-%{_mavendepmapfragdir}/%{name}-tools
+%files tools -f .mfiles-tools
 %doc LICENSE NOTICE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Tue Jul 09 2013 gil cattaneo <puntogil at libero.it> 2.2.2-3
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Mon Jun 24 2013 Tomas Radej <tradej at redhat.com> - 2.2.2-2
 - B(R) on hsqldb compat package

More information about the scm-commits mailing list