This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository openjpa.
commit 4dadd84613ed3345a77e595c1e73f6859644ce2a Author: Markus Koschany <[email protected]> Date: Fri Jun 23 15:04:23 2017 +0200 Add openjpa-xmlstore-no-tests.patch --- debian/patches/exclude-was-uow.diff | 15 +++++--- debian/patches/openjpa-xmlstore-no-tests.patch | 50 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 61 insertions(+), 5 deletions(-) diff --git a/debian/patches/exclude-was-uow.diff b/debian/patches/exclude-was-uow.diff index c3a0abf..5da0ad6 100644 --- a/debian/patches/exclude-was-uow.diff +++ b/debian/patches/exclude-was-uow.diff @@ -1,8 +1,13 @@ -Description: Disable code depending on non-free code (WebSphere stuff) -Author: Miguel Landaeta <[email protected]> -Forwarded: no -Last-Update: 2013-10-08 +From: Debian Java Maintainers <[email protected]> +Date: Fri, 23 Jun 2017 15:01:11 +0200 +Subject: exclude-was-uow +--- + .../openjpa/ee/WASRegistryManagedRuntime.java | 38 +--------------------- + 1 file changed, 1 insertion(+), 37 deletions(-) + +diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java +index 4220609..fb834c6 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java @@ -18,12 +18,6 @@ @@ -18,7 +23,7 @@ Last-Update: 2013-10-08 /** * WASRegistryManagedRuntime provides WebSphere specific extensions to * {@link RegistryManagedRuntime}. Currently these extensions consist of using -@@ -38,37 +32,7 @@ +@@ -38,37 +32,7 @@ public class WASRegistryManagedRuntime extends RegistryManagedRuntime { */ public void doNonTransactionalWork(Runnable runnable) throws RuntimeException, UnsupportedOperationException { diff --git a/debian/patches/openjpa-xmlstore-no-tests.patch b/debian/patches/openjpa-xmlstore-no-tests.patch new file mode 100644 index 0000000..ea6aafd --- /dev/null +++ b/debian/patches/openjpa-xmlstore-no-tests.patch @@ -0,0 +1,50 @@ +From: Markus Koschany <[email protected]> +Date: Fri, 23 Jun 2017 15:03:42 +0200 +Subject: openjpa-xmlstore no tests + +--- + openjpa-xmlstore/pom.xml | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml +index b3958cb..4bde5b2 100644 +--- a/openjpa-xmlstore/pom.xml ++++ b/openjpa-xmlstore/pom.xml +@@ -59,7 +59,7 @@ + + <build> + <plugins> +- <!-- Extract the common test support files from o-p-j-tests.jar --> ++ <!-- Extract the common test support files from o-p-j-tests.jar + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> +@@ -86,7 +86,7 @@ + </executions> + </plugin> + +- <!-- new way of using openjpa-maven-plugin to enhance classes --> ++ new way of using openjpa-maven-plugin to enhance classes + <plugin> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-maven-plugin</artifactId> +@@ -106,7 +106,7 @@ + </execution> + </executions> + <dependencies> +- <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph --> ++ use o-p-j instead of openjpa to avoid cyclical dependency in maven graph + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-persistence-jdbc</artifactId> +@@ -135,9 +135,8 @@ + </property> + </systemProperties> + </configuration> +- </plugin> ++ </plugin>--> + </plugins> + </build> +- + </project> + diff --git a/debian/patches/series b/debian/patches/series index 483e690..b0953d7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ exclude-was-uow.diff +openjpa-xmlstore-no-tests.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjpa.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
