This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository uimaj.
commit 46fa10614a1d04ef57c7449307cf6c1a02d12e79 Author: Emmanuel Bourg <[email protected]> Date: Mon Jun 1 16:01:32 2015 +0200 Refreshed the patches --- debian/changelog | 7 +++++++ debian/patches/build-helper-version.diff | 2 +- debian/patches/disable-integration-tests.diff | 12 ++++++------ debian/patches/disable_internal_javadoc.diff | 2 +- debian/patches/maven-plugin-configuration.diff | 14 +++++++------- debian/patches/maven2-compatibility.diff | 20 +++++++++++++++++++- debian/patches/modules.diff | 10 +++++----- 7 files changed, 46 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 31da8ea..eb7536e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +uimaj (2.7.0-1) UNRELEASED; urgency=medium + + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Mon, 01 Jun 2015 13:03:49 +0200 + uimaj (2.6.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/build-helper-version.diff b/debian/patches/build-helper-version.diff index 4434a9d..32e17d1 100644 --- a/debian/patches/build-helper-version.diff +++ b/debian/patches/build-helper-version.diff @@ -1,6 +1,6 @@ --- a/uimaj-core/pom.xml +++ b/uimaj-core/pom.xml -@@ -166,6 +166,12 @@ +@@ -172,6 +172,12 @@ <artifactId>build-helper-maven-plugin</artifactId> <executions> <execution> diff --git a/debian/patches/disable-integration-tests.diff b/debian/patches/disable-integration-tests.diff index 6a3f48a..fd82ee5 100644 --- a/debian/patches/disable-integration-tests.diff +++ b/debian/patches/disable-integration-tests.diff @@ -4,10 +4,11 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/jcasgen-maven-plugin/pom.xml +++ b/jcasgen-maven-plugin/pom.xml -@@ -90,37 +90,6 @@ +@@ -89,37 +89,6 @@ + </pluginManagement> <plugins> - <plugin> +- <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <!-- <version>1.7</version> 1.8 from superpom --> - <configuration> @@ -38,7 +39,6 @@ Forwarded: not-needed - </execution> - </executions> - </plugin> -- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <configuration> + </plugins> + </build> + </project> diff --git a/debian/patches/disable_internal_javadoc.diff b/debian/patches/disable_internal_javadoc.diff index be38f89..ea2416d 100644 --- a/debian/patches/disable_internal_javadoc.diff +++ b/debian/patches/disable_internal_javadoc.diff @@ -1,6 +1,6 @@ --- a/pom.xml +++ b/pom.xml -@@ -179,8 +179,8 @@ +@@ -185,8 +185,8 @@ <executions> <execution> <id>javadocs-distr</id> <!-- name should match one in parent-pom --> diff --git a/debian/patches/maven-plugin-configuration.diff b/debian/patches/maven-plugin-configuration.diff index 1e5aa96..7284785 100644 --- a/debian/patches/maven-plugin-configuration.diff +++ b/debian/patches/maven-plugin-configuration.diff @@ -4,10 +4,10 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml -@@ -170,6 +170,22 @@ - </dependency> - </dependencies> --> - </plugin> +@@ -186,6 +186,22 @@ + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> @@ -24,6 +24,6 @@ Forwarded: not-needed + </execution> + </executions> + </plugin> - </plugins> - </pluginManagement> - <plugins> + </plugins> + </build> + </project> diff --git a/debian/patches/maven2-compatibility.diff b/debian/patches/maven2-compatibility.diff index 897f747..910c45e 100644 --- a/debian/patches/maven2-compatibility.diff +++ b/debian/patches/maven2-compatibility.diff @@ -14,7 +14,25 @@ Forwarded: not-needed <groupId>org.apache.uima</groupId> --- a/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java +++ b/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java -@@ -274,7 +274,7 @@ +@@ -111,7 +111,7 @@ + StringBuilder classpathBuilder = new StringBuilder(); + + // Source roots +- for (String element : this.project.getCompileSourceRoots()) { ++ for (String element : (List<String>) this.project.getCompileSourceRoots()) { + if (classpathBuilder.length() > 0) { + classpathBuilder.append(File.pathSeparatorChar); + } +@@ -120,7 +120,7 @@ + } + + // Resource roots +- for (Resource element : this.project.getResources()) { ++ for (Resource element : (List<Resource>) this.project.getResources()) { + if (classpathBuilder.length() > 0) { + classpathBuilder.append(File.pathSeparatorChar); + } +@@ -294,7 +294,7 @@ // map each resource from its target location to its source location Map<File, File> targetToSource = new HashMap<File, File>(); diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff index 7583640..53d3f86 100644 --- a/debian/patches/modules.diff +++ b/debian/patches/modules.diff @@ -40,7 +40,7 @@ Forwarded: not-needed +</project> --- a/pom.xml +++ b/pom.xml -@@ -113,6 +113,7 @@ +@@ -114,6 +114,7 @@ <artifactId>uimaj-tools</artifactId> <version>${project.version}</version> </dependency> @@ -48,11 +48,11 @@ Forwarded: not-needed <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-ep-cas-editor</artifactId> -@@ -153,6 +154,7 @@ +@@ -154,6 +155,7 @@ <artifactId>uimaj-ep-launcher</artifactId> <version>${project.version}</version> </dependency> +--> - </dependencies> - - + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-json</artifactId> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uimaj.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
