[openjpa] 07/15: Drop fix_poms.diff
Markus Koschany
apo at moszumanska.debian.org
Fri Jun 23 13:36:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository openjpa.
commit b650f86a5c7e153b85a3d8bcab880f7e82d0b707
Author: Markus Koschany <apo at debian.org>
Date: Fri Jun 23 14:25:00 2017 +0200
Drop fix_poms.diff
---
debian/patches/fix_poms.diff | 242 -------------------------------------------
debian/patches/series | 1 -
2 files changed, 243 deletions(-)
diff --git a/debian/patches/fix_poms.diff b/debian/patches/fix_poms.diff
deleted file mode 100644
index 5283d16..0000000
--- a/debian/patches/fix_poms.diff
+++ /dev/null
@@ -1,242 +0,0 @@
-Description: Modify dependencies list to allow modules to build with Debian maven repo
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2013-09-01
-
---- a/openjpa-lib/pom.xml
-+++ b/openjpa-lib/pom.xml
-@@ -41,43 +41,52 @@
- <groupId>jakarta-regexp</groupId>
- <artifactId>jakarta-regexp</artifactId>
- <scope>test</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
-+ <version>1.2.x</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
-+ <version>3.x</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.serp</groupId>
- <artifactId>serp</artifactId>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- </dependencies>
-
---- a/openjpa-kernel/pom.xml
-+++ b/openjpa-kernel/pom.xml
-@@ -45,14 +45,17 @@
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>com.ibm.websphere</groupId>
-@@ -64,6 +67,7 @@
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- <!-- for osgi ManagedRuntime implementation, -->
- <!-- we pull in OSGi core at the same level as Apache Aries -->
---- a/openjpa-jdbc/pom.xml
-+++ b/openjpa-jdbc/pom.xml
-@@ -47,42 +47,50 @@
- <artifactId>jaxb-api</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <scope>provided</scope>
-+ <version>9.2.jdbc3</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
-+ <version>2.x</version>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit3</artifactId>
- <scope>test</scope>
-+ <version>2.x</version>
- </dependency>
- </dependencies>
- </project>
---- a/openjpa-persistence/pom.xml
-+++ b/openjpa-persistence/pom.xml
-@@ -45,11 +45,13 @@
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- <!-- for osgi bundle activator code, use same level as Apache Aries -->
- <dependency>
---- a/openjpa-persistence-jdbc/pom.xml
-+++ b/openjpa-persistence-jdbc/pom.xml
-@@ -855,22 +855,26 @@
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>test</scope>
-+ <version>3.x</version>
- </dependency>
- <dependency>
- <groupId>jakarta-regexp</groupId>
- <artifactId>jakarta-regexp</artifactId>
- <scope>test</scope>
-+ <version>debian</version>
- </dependency>
- <!-- Required for org.apache.openjpa.persistence.xmlmapping tests -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>test</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>test</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>simple-jndi</groupId>
---- a/openjpa-slice/pom.xml
-+++ b/openjpa-slice/pom.xml
-@@ -51,6 +51,7 @@
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <scope>test</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
---- a/openjpa/pom.xml
-+++ b/openjpa/pom.xml
-@@ -58,6 +58,7 @@
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
-+ <version>1.2.1</version>
- <executions>
- <execution>
- <id>shade-all</id>
-@@ -106,6 +107,7 @@
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-+ <version>2.3.5</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
---- a/openjpa-jest/pom.xml
-+++ b/openjpa-jest/pom.xml
-@@ -45,6 +45,7 @@
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
---- a/openjpa-xmlstore/pom.xml
-+++ b/openjpa-xmlstore/pom.xml
-@@ -60,6 +60,7 @@
- <build>
- <plugins>
- <!-- Extract the common test support files from o-p-j-tests.jar -->
-+ <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
-@@ -85,6 +86,7 @@
- </execution>
- </executions>
- </plugin>
-+ -->
-
- <!-- new way of using openjpa-maven-plugin to enhance classes -->
- <plugin>
diff --git a/debian/patches/series b/debian/patches/series
index 77a97cb..72bc529 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fix_poms.diff
exclude-was-uow.diff
java8-compatibility.patch
fix-compilation-error.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjpa.git
More information about the pkg-java-commits
mailing list