[tiles-autotag] 03/04: Depend on libmaven3-core-java instead of libmaven2-core-java
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jul 31 13:05:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tiles-autotag.
commit ca5ab872859c6ec696e706e4d8d0a6a16e6030d4
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Jul 31 15:04:09 2017 +0200
Depend on libmaven3-core-java instead of libmaven2-core-java
---
debian/changelog | 1 +
debian/control | 2 +-
debian/maven.ignoreRules | 1 +
debian/maven.rules | 1 +
debian/patches/04-maven-compatibility.patch | 28 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
6 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f70dad0..f6d6a91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
tiles-autotag (1.2-2) UNRELEASED; urgency=medium
+ * Depend on libmaven3-core-java instead of libmaven2-core-java
* Standards-Version updated to 4.0.0
* Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 5765c24..94860ac 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: junit4,
libeasymock-java,
libfreemarker-java,
libmaven-bundle-plugin-java,
- libmaven2-core-java,
+ libmaven3-core-java,
libplexus-compiler-java,
libqdox-java,
libxstream-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 351bd4e..2ab9772 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,3 +1,4 @@
org.apache.maven.plugins maven-release-plugin * * * *
org.apache.maven.plugins maven-scm-publish-plugin * * * *
+org.apache.maven maven-project * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 3fa7d48..64ae7f4 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,4 @@
junit junit * s/.*/4.x/ * *
org.codehaus.plexus plexus-compiler* * s/.*/2.x/ * *
+org.apache.maven maven-* * s/.*/3.x/ * *
diff --git a/debian/patches/04-maven-compatibility.patch b/debian/patches/04-maven-compatibility.patch
new file mode 100644
index 0000000..98f0ae5
--- /dev/null
+++ b/debian/patches/04-maven-compatibility.patch
@@ -0,0 +1,28 @@
+Description: Fixes the compatibility with the version of Maven in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojoTest.java
++++ b/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojoTest.java
+@@ -88,9 +88,9 @@
+ generator.generate(eq("my.package"), isA(TemplateSuite.class), eq(params), eq("my.package.Runtime"), eq("my.package.Request"));
+ expect(generator.isGeneratingClasses()).andReturn(true);
+ expect(generator.isGeneratingResources()).andReturn(true);
+- expect(mavenProject.getResources()).andReturn(Collections.emptyList());
++ expect(mavenProject.getResources()).andReturn(Collections.<Resource>emptyList());
+ mavenProject.addResource(isA(Resource.class));
+- expect(mavenProject.getCompileSourceRoots()).andReturn(Collections.emptyList());
++ expect(mavenProject.getCompileSourceRoots()).andReturn(Collections.<String>emptyList());
+ mavenProject.addCompileSourceRoot(classesOutputDirectory.getAbsolutePath());
+
+ replay(mavenProject, buildContext, mojo, factory, generator, params);
+--- a/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java
++++ b/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java
+@@ -92,7 +92,7 @@
+ mojo.requestClass = ExampleRequest.class.getName();
+ mojo.buildContext = buildContext;
+
+- expect(mavenProject.getResources()).andReturn(Collections.emptyList());
++ expect(mavenProject.getResources()).andReturn(Collections.<Resource>emptyList());
+ mavenProject.addResource(isA(Resource.class));
+ expect(buildContext.newScanner(isA(File.class))).andReturn(scanner);
+ scanner.setIncludes(isA(String[].class));
diff --git a/debian/patches/series b/debian/patches/series
index 4e98074..e2a82dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01-xmlpull-dependency.patch
02-velocity-compatibility.patch
03-reproducibility.patch
+04-maven-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tiles-autotag.git
More information about the pkg-java-commits
mailing list