This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit 1e8524f0451088e571a55a72ff758d813c9239d9 Author: Gilles Filippini <[email protected]> Date: Mon May 12 23:56:12 2014 +0200 Re-activate and update patch add-classpath.patch Configure maven-jar-plugin to add the classpath to the MANIFEST of the generated jar files. --- debian/patches/add-classpath.patch | 77 +++++--------------------------------- debian/patches/series | 2 +- 2 files changed, 10 insertions(+), 69 deletions(-) diff --git a/debian/patches/add-classpath.patch b/debian/patches/add-classpath.patch index 8b70493..eb970ec 100644 --- a/debian/patches/add-classpath.patch +++ b/debian/patches/add-classpath.patch @@ -3,18 +3,18 @@ Description: Configure maven-jar-plugin to add the classpath to the generated Author: Gilles Filippini <[email protected]> Index: sikuli/pom.xml =================================================================== ---- sikuli.orig/pom.xml 2013-11-03 22:14:07.000000000 +0100 -+++ sikuli/pom.xml 2013-11-03 22:14:07.000000000 +0100 -@@ -45,5 +45,23 @@ +--- sikuli.orig/pom.xml 2014-05-12 22:51:51.969618284 +0200 ++++ sikuli/pom.xml 2014-05-12 22:54:58.290945148 +0200 +@@ -240,6 +240,24 @@ + </modules> - <build> - <finalName>sikulix</finalName> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> -+ <version>2.3.1</version> ++ <version>2.4</version> + <configuration> + <archive> + <manifest> @@ -27,65 +27,6 @@ Index: sikuli/pom.xml + </plugin> + </plugins> + </pluginManagement> - </build> - </project> -Index: sikuli/api/pom.xml -=================================================================== ---- sikuli.orig/api/pom.xml 2013-11-03 22:14:07.000000000 +0100 -+++ sikuli/api/pom.xml 2013-11-03 22:14:07.000000000 +0100 -@@ -80,6 +80,10 @@ - - <plugins> - <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-jar-plugin</artifactId> -+ </plugin> -+ <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> -Index: sikuli/basics/pom.xml -=================================================================== ---- sikuli.orig/basics/pom.xml 2013-11-03 22:14:07.000000000 +0100 -+++ sikuli/basics/pom.xml 2013-11-03 22:14:07.000000000 +0100 -@@ -113,6 +113,10 @@ - - <plugins> - <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-jar-plugin</artifactId> -+ </plugin> -+ <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> -Index: sikuli/ide/pom.xml -=================================================================== ---- sikuli.orig/ide/pom.xml 2013-11-03 22:14:07.000000000 +0100 -+++ sikuli/ide/pom.xml 2013-11-03 22:14:07.000000000 +0100 -@@ -153,6 +153,10 @@ - - <plugins> - <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-jar-plugin</artifactId> -+ </plugin> -+ <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> -Index: sikuli/jython/pom.xml -=================================================================== ---- sikuli.orig/jython/pom.xml 2013-11-03 22:14:07.000000000 +0100 -+++ sikuli/jython/pom.xml 2013-11-03 22:14:07.000000000 +0100 -@@ -73,6 +73,10 @@ - - <plugins> - <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-jar-plugin</artifactId> -+ </plugin> -+ <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> diff --git a/debian/patches/series b/debian/patches/series index 4a20cee..0f69972 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,9 +4,9 @@ install-extension.patch setTextAndMnemonic.patch autotoolize-vision-proxy.patch -#add-classpath.patch basics-exclude-windows-mac.patch no-maven-repo-dependencies.patch #resources-out-of-jar.patch +add-classpath.patch pom-removed-modules.patch jruby-compat-1.9.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
