[freehep-graphicsio-tests] 01/01: Do not require a specific libexec-maven-plugin-java version.
Giovanni Mascellani
gio at moszumanska.debian.org
Mon Oct 30 14:33:46 UTC 2017
This is an automated email from the git hooks/post-receive script.
gio pushed a commit to branch master
in repository freehep-graphicsio-tests.
commit afc3366af6b9eff4c2a07d9d57a8a3f5d6ac4c91
Author: Giovanni Mascellani <gio at debian.org>
Date: Mon Oct 30 15:27:39 2017 +0100
Do not require a specific libexec-maven-plugin-java version.
---
debian/changelog | 5 +++++
debian/maven.rules | 1 -
debian/patches/TestCustomStrokes.diff | 25 +++++++++++++---------
debian/patches/classpath.diff | 14 +++++++-----
.../patches/libexec-maven-plugin-java_version.diff | 20 +++++++++++++++++
debian/patches/series | 1 +
6 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 89b689b..3331d19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
freehep-graphicsio-tests (2.1.1+dfsg1-5) UNRELEASED; urgency=medium
+ [ tony mancill ]
* Team upload.
* Remove Gabriele Giacone from Uploaders (Closes: #856751)
+ [ Giovanni Mascellani ]
+ * Do not request a specific libexec-maven-plugin-java version (closes:
+ #879256).
+
-- tony mancill <tmancill at debian.org> Sat, 22 Apr 2017 20:57:33 -0700
freehep-graphicsio-tests (2.1.1+dfsg1-4) unstable; urgency=low
diff --git a/debian/maven.rules b/debian/maven.rules
index fafa9e1..f60def6 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1 @@
junit junit jar s/.*/3.x/ *
-org.codehaus.mojo exec-maven-plugin maven-plugin s/.*/1.1.1/
diff --git a/debian/patches/TestCustomStrokes.diff b/debian/patches/TestCustomStrokes.diff
index 582b69e..1d003f8 100644
--- a/debian/patches/TestCustomStrokes.diff
+++ b/debian/patches/TestCustomStrokes.diff
@@ -1,11 +1,16 @@
From: Giovanni Mascellani <gio at debian.org>
+Date: Mon, 30 Oct 2017 15:28:20 +0100
Subject: Fixes after TestCustomStrokes.java removal
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestApplication.java
-===================================================================
---- freehep-graphicsio-tests.orig/src/main/java/org/freehep/graphicsio/test/TestApplication.java
-+++ freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestApplication.java
+ src/main/java/org/freehep/graphicsio/test/TestApplication.java | 1 -
+ src/main/java/org/freehep/graphicsio/test/TestSuite.java | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/main/java/org/freehep/graphicsio/test/TestApplication.java b/src/main/java/org/freehep/graphicsio/test/TestApplication.java
+index 3ce50b2..049209b 100644
+--- a/src/main/java/org/freehep/graphicsio/test/TestApplication.java
++++ b/src/main/java/org/freehep/graphicsio/test/TestApplication.java
@@ -18,7 +18,6 @@ public class TestApplication {
frame.addPanel("All", new TestAll(null));
frame.addPanel("Clip", new TestClip(null));
@@ -14,11 +19,11 @@ Index: freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestAp
frame.addPanel("FontDerivation", new TestFontDerivation(null));
frame.addPanel("Fonts", new TestFonts(null));
frame.addPanel("Histogram", new TestHistogram(null));
-Index: freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestSuite.java
-===================================================================
---- freehep-graphicsio-tests.orig/src/main/java/org/freehep/graphicsio/test/TestSuite.java
-+++ freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestSuite.java
-@@ -245,7 +245,6 @@ public class TestSuite extends junit.fra
+diff --git a/src/main/java/org/freehep/graphicsio/test/TestSuite.java b/src/main/java/org/freehep/graphicsio/test/TestSuite.java
+index f516196..ff3f0a7 100644
+--- a/src/main/java/org/freehep/graphicsio/test/TestSuite.java
++++ b/src/main/java/org/freehep/graphicsio/test/TestSuite.java
+@@ -245,7 +245,6 @@ public class TestSuite extends junit.framework.TestSuite {
tests.add(new Test("TestAll", on));
tests.add(new Test("TestClip", on));
tests.add(new Test("TestColors", on));
diff --git a/debian/patches/classpath.diff b/debian/patches/classpath.diff
index 6d33aed..9bc5da1 100644
--- a/debian/patches/classpath.diff
+++ b/debian/patches/classpath.diff
@@ -1,11 +1,15 @@
From: Giovanni Mascellani <gio at debian.org>
+Date: Mon, 30 Oct 2017 15:28:20 +0100
Subject: Add classpath to compiled JAR
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: freehep-graphicsio-tests/pom.xml
-===================================================================
---- freehep-graphicsio-tests.orig/pom.xml
-+++ freehep-graphicsio-tests/pom.xml
+ pom.xml | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index a7a6067..f2d3797 100644
+--- a/pom.xml
++++ b/pom.xml
@@ -40,6 +40,18 @@
<keepAlive>true</keepAlive>
</configuration>
diff --git a/debian/patches/libexec-maven-plugin-java_version.diff b/debian/patches/libexec-maven-plugin-java_version.diff
new file mode 100644
index 0000000..ba3e37a
--- /dev/null
+++ b/debian/patches/libexec-maven-plugin-java_version.diff
@@ -0,0 +1,20 @@
+From: Giovanni Mascellani <gio at debian.org>
+Date: Mon, 30 Oct 2017 15:29:36 +0100
+Subject: Remove version information for plugin libexec-maven-plugin-java.
+
+---
+ pom.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index f2d3797..2f84757 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -27,7 +27,6 @@
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+- <version>1.0.2</version>
+ <executions>
+ <execution>
+ <goals>
diff --git a/debian/patches/series b/debian/patches/series
index ff044ec..5c60df3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
TestCustomStrokes.diff
classpath.diff
+libexec-maven-plugin-java_version.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freehep/freehep-graphicsio-tests.git
More information about the pkg-java-commits
mailing list