[openjpa/f17] Add PATCH12. Disabled buildnumber-plugin, because jna is required (and currently broken)

gil gil at fedoraproject.org
Wed Jul 18 15:46:07 UTC 2012


commit 3dccfa6f96ac8f26b99780b97077c2da296a0a9e
Author: gil <puntogil at libero.it>
Date:   Wed Jul 18 17:45:44 2012 +0200

    Add PATCH12. Disabled buildnumber-plugin, because jna is required (and currently broken)

 openjpa-2.2.0-remove-buildnumber-plugin.patch |   51 +++++++++++++++++++++++++
 openjpa.spec                                  |    3 +
 2 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/openjpa-2.2.0-remove-buildnumber-plugin.patch b/openjpa-2.2.0-remove-buildnumber-plugin.patch
new file mode 100644
index 0000000..da3133a
--- /dev/null
+++ b/openjpa-2.2.0-remove-buildnumber-plugin.patch
@@ -0,0 +1,51 @@
+--- pom.xml	2012-07-18 15:48:18.275177007 +0200
++++ pom.xml-gil	2012-07-18 15:48:45.146812718 +0200
+@@ -700,7 +700,7 @@
+                     <artifactId>findbugs-maven-plugin</artifactId>
+                     <version>2.3.1</version>
+                 </plugin-->
+-                <plugin>
++                <!--plugin>
+                     <groupId>org.codehaus.mojo</groupId>
+                     <artifactId>buildnumber-maven-plugin</artifactId>
+                     <version>1.0-beta-4</version>
+@@ -718,7 +718,7 @@
+                             </goals>
+                         </execution>
+                     </executions>
+-                </plugin>
++                </plugin-->
+                 <plugin>
+                     <groupId>org.apache.rat</groupId>
+                     <artifactId>apache-rat-plugin</artifactId>
+@@ -957,7 +957,7 @@
+                                 </pluginExecution>
+ 
+                                 <!--maven plugin -->
+-                                <pluginExecution>
++                                <!--pluginExecution>
+                                     <pluginExecutionFilter>
+                                         <groupId>org.codehaus.mojo</groupId>
+                                         <artifactId>buildnumber-maven-plugin</artifactId>
+@@ -969,7 +969,7 @@
+                                     <action>
+                                         <ignore />
+                                     </action>
+-                                </pluginExecution>
++                                </pluginExecution-->
+ 
+                                 <!--javacc plugin -->
+                                 <pluginExecution>
+@@ -1074,10 +1074,10 @@
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>ianal-maven-plugin</artifactId>
+             </plugin-->
+-            <plugin>
++            <!--plugin>
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>buildnumber-maven-plugin</artifactId>
+-            </plugin>
++            </plugin-->
+             <!--plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/openjpa.spec b/openjpa.spec
index 061054b..e6b8f8b 100644
--- a/openjpa.spec
+++ b/openjpa.spec
@@ -37,6 +37,8 @@ Patch9:        %{name}-%{version}-jest-pom.patch
 Patch10:       %{name}-%{version}-tools-it-poms.patch
 # remove testing profiles for unavailable drivers: db2jcc informix-driver jcc-driver jdbc-driver jdbc-oracle jtds sqljdbc
 Patch11:       %{name}-%{version}-remove-test-profiles.patch
+# in f17 buildnumber dont work
+Patch12:       openjpa-2.2.0-remove-buildnumber-plugin.patch
 
 BuildRequires: java-devel
 BuildRequires: jpackage-utils
@@ -167,6 +169,7 @@ find . -name "*.jar" -delete
 %patch9 -p0
 %patch10 -p0
 %patch11 -p1
+%patch12 -p0
 
 sed -i "s|<module>openjpa</module>|<!--module>openjpa</module-->|" pom.xml
 sed -i "s|<module>openjpa-all</module>|<!--module>openjpa-all</module-->|" pom.xml


More information about the scm-commits mailing list