This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-compiler.
commit 7a6e58744348be5213d519e5e6ef8ed0f4e4fd82 Author: Emmanuel Bourg <ebo...@apache.org> Date: Fri Mar 2 17:09:48 2018 +0100 Refreshed the patches --- debian/changelog | 4 +++- debian/patches/fix_test_classpath.patch | 4 ++-- debian/patches/maven-compatibility.patch | 8 ++++---- debian/patches/missing-dependency-management-entries.patch | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a34d94..be76530 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -plexus-compiler (2.8.2-6) UNRELEASED; urgency=medium +plexus-compiler (2.8.3-1) UNRELEASED; urgency=medium + * New upstream release + - Refreshed the patches * Standards-Version updated to 4.1.3 * Switch to debhelper level 11 * Depend on libplexus-container-default-java diff --git a/debian/patches/fix_test_classpath.patch b/debian/patches/fix_test_classpath.patch index 2d1f125..0db3777 100644 --- a/debian/patches/fix_test_classpath.patch +++ b/debian/patches/fix_test_classpath.patch @@ -1,8 +1,8 @@ --- a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java +++ b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java -@@ -74,7 +74,7 @@ public abstract class AbstractCompilerTest +@@ -76,7 +76,7 @@ { - List<String> cp = new ArrayList<String>(); + List<String> cp = new ArrayList<>(); - File file = getLocalArtifactPath( "commons-lang", "commons-lang", "2.0", "jar" ); + File file = getLocalArtifactPath( "commons-lang", "commons-lang", "debian", "jar" ); diff --git a/debian/patches/maven-compatibility.patch b/debian/patches/maven-compatibility.patch index 4056e85..2e195a8 100644 --- a/debian/patches/maven-compatibility.patch +++ b/debian/patches/maven-compatibility.patch @@ -18,10 +18,10 @@ Forwarded: no +import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.ReaderFactory; + import org.codehaus.plexus.util.StringUtils; - import java.io.File; - import java.util.ArrayList; -@@ -44,7 +50,7 @@ + import javax.print.DocFlavor; +@@ -46,7 +52,7 @@ * */ public abstract class AbstractCompilerTest @@ -30,7 +30,7 @@ Forwarded: no { private boolean compilerDebug = false; -@@ -52,6 +58,40 @@ +@@ -54,6 +60,40 @@ private boolean forceJavacCompilerUse = false; diff --git a/debian/patches/missing-dependency-management-entries.patch b/debian/patches/missing-dependency-management-entries.patch index 41097b6..656611d 100644 --- a/debian/patches/missing-dependency-management-entries.patch +++ b/debian/patches/missing-dependency-management-entries.patch @@ -5,9 +5,9 @@ Author: Emmanuel Bourg <ebo...@apache.org> Forwarded: not-needed --- a/pom.xml +++ b/pom.xml -@@ -56,6 +56,16 @@ - <artifactId>plexus-compiler-test</artifactId> - <version>${project.version}</version> +@@ -64,6 +64,16 @@ + <scope>test</scope> + <version>4.12</version> </dependency> + <dependency> + <groupId>junit</groupId> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-compiler.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits