This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository uimaj.
commit 00d94219bc6b0f14a4733e6fecbbc8df0526658e Author: Emmanuel Bourg <[email protected]> Date: Fri Mar 21 00:10:21 2014 +0100 Refreshed the patches --- debian/patches/build-helper-version.diff | 2 +- debian/patches/disable_ecore.diff | 6 +++--- debian/patches/disable_internal_javadoc.diff | 2 +- debian/patches/maven-plugin-configuration.diff | 2 +- debian/patches/modules.diff | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/patches/build-helper-version.diff b/debian/patches/build-helper-version.diff index bf94996..4434a9d 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 -@@ -167,6 +167,12 @@ +@@ -166,6 +166,12 @@ <artifactId>build-helper-maven-plugin</artifactId> <executions> <execution> diff --git a/debian/patches/disable_ecore.diff b/debian/patches/disable_ecore.diff index 7f9f589..145335a 100644 --- a/debian/patches/disable_ecore.diff +++ b/debian/patches/disable_ecore.diff @@ -5,7 +5,7 @@ Last-Update: 2010-04-05 Forwared: not-needed --- a/uimaj-examples/pom.xml +++ b/uimaj-examples/pom.xml -@@ -83,7 +83,8 @@ +@@ -82,7 +82,8 @@ <artifactId>uimaj-tools</artifactId> <version>${project.parent.version}</version> <scope>compile</scope> @@ -15,7 +15,7 @@ Forwared: not-needed <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>common</artifactId> -@@ -102,6 +103,7 @@ +@@ -101,6 +102,7 @@ <version>2.1.0</version> <scope>provided</scope> </dependency> @@ -23,7 +23,7 @@ Forwared: not-needed </dependencies> <build> <finalName>uima-examples</finalName> -@@ -124,7 +126,18 @@ +@@ -123,7 +125,18 @@ </configuration> </execution> </executions> diff --git a/debian/patches/disable_internal_javadoc.diff b/debian/patches/disable_internal_javadoc.diff index a11534c..be38f89 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 -@@ -178,8 +178,8 @@ +@@ -179,8 +179,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 47119fe..d544ad5 100644 --- a/debian/patches/maven-plugin-configuration.diff +++ b/debian/patches/maven-plugin-configuration.diff @@ -30,4 +30,4 @@ Forwarded: not-needed + </pluginManagement> </build> - <profiles> + </project> diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff index a98d1f7..7583640 100644 --- a/debian/patches/modules.diff +++ b/debian/patches/modules.diff @@ -6,7 +6,7 @@ Last-Update: 2010-03-21 Forwarded: not-needed --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml -@@ -60,6 +60,7 @@ +@@ -59,6 +59,7 @@ </properties> <modules> @@ -14,7 +14,7 @@ Forwarded: not-needed <module>../uimaj-ep-debug</module> <module>../uimaj-ep-jcasgen</module> <module>../uimaj-ep-configurator</module> -@@ -73,5 +74,6 @@ +@@ -72,5 +73,6 @@ <!-- see https://issues.apache.org/jira/browse/UIMA-2497 --> <module>../uimaj-eclipse-feature-tools</module> <module>../uimaj-eclipse-feature-runtime</module> @@ -23,7 +23,7 @@ Forwarded: not-needed </project> --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml -@@ -68,7 +68,6 @@ +@@ -67,7 +67,6 @@ <module>../uimaj-test-util</module> <module>../uimaj-component-test-util</module> <module>../jVinci</module> @@ -31,7 +31,7 @@ Forwarded: not-needed <module>../aggregate-uimaj-docbooks</module> <!--module>distr-superPom</module--> <module>../uimaj-document-annotation</module> -@@ -80,4 +79,4 @@ +@@ -79,4 +78,4 @@ <!--module>../uimaj-internal-tools</module--> <module>../uimaj-bootstrap</module> </modules> @@ -40,7 +40,7 @@ Forwarded: not-needed +</project> --- a/pom.xml +++ b/pom.xml -@@ -114,6 +114,7 @@ +@@ -113,6 +113,7 @@ <artifactId>uimaj-tools</artifactId> <version>${project.version}</version> </dependency> @@ -48,7 +48,7 @@ Forwarded: not-needed <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-ep-cas-editor</artifactId> -@@ -154,6 +155,7 @@ +@@ -153,6 +154,7 @@ <artifactId>uimaj-ep-launcher</artifactId> <version>${project.version}</version> </dependency> -- 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
