[uimaj] 04/06: Depend on libmaven3-core-java instead of libmaven2-core-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository uimaj.

commit ad093a613abed2df239cf46365dd25816963b5e5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 9 17:35:52 2015 +0100

    Depend on libmaven3-core-java instead of libmaven2-core-java
---
 debian/changelog                         |  1 +
 debian/control                           |  7 +++---
 debian/maven.rules                       |  2 ++
 debian/patches/maven2-compatibility.diff | 43 --------------------------------
 debian/patches/series                    |  1 -
 5 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 379adc7..0ea371b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ uimaj (2.8.0-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
   * Removed the build dependency on maven2
+  * Depend on libmaven3-core-java instead of libmaven2-core-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 30 Jul 2015 01:31:04 +0200
 
diff --git a/debian/control b/debian/control
index 32953c0..bde5ffe 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,8 @@ Uploaders: Fabien Poulard <fabien.poulard at univ-nantes.fr>,
 Build-Depends: cdbs,
                debhelper (>= 9),
                default-jdk,
-               libmaven2-core-java (>> 2.2.1-1),
-               maven-debian-helper (>= 1.1),
-               maven-repo-helper (>= 1.5.2)
+               libmaven3-core-java,
+               maven-debian-helper (>= 2.0~),
 Build-Depends-Indep: ant,
                      ant-contrib,
                      default-jdk-doc,
@@ -158,7 +157,7 @@ Description: Library for the UIMA document annotation
 Package: libuima-tools-java
 Architecture: all
 Depends: libuima-core-java (>= ${source:Version}), ${misc:Depends}
-Suggests: libmaven2-core-java
+Suggests: libmaven3-core-java
 Description: UIMA library for the UIMA tools
  Apache UIMA is an implementation of the OASIS-UIMA specifications.
  .
diff --git a/debian/maven.rules b/debian/maven.rules
index d2b7032..d306d1f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -19,3 +19,5 @@
 junit junit jar s/.*/3.x/ * *
 log4j log4j jar s/1\.2\..*/1.2.x/ * *
 org.apache.uima * jar s/.*/debian/ * *
+org.apache.maven s/maven-project/maven-compat/ * s/.*/3.x/ * *
+org.apache.maven maven* * s/.*/3.x/ * *
diff --git a/debian/patches/maven2-compatibility.diff b/debian/patches/maven2-compatibility.diff
deleted file mode 100644
index 910c45e..0000000
--- a/debian/patches/maven2-compatibility.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Adjustments to allow Maven 2 to build jcasgen-maven-plugin
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/jcasgen-maven-plugin/pom.xml
-+++ b/jcasgen-maven-plugin/pom.xml
-@@ -25,7 +25,7 @@
- 	<name>Apache UIMA Maven: ${project.artifactId}</name>
- 	<description>A Maven Plugin for using JCasGen to generate Java classes from XML type system descriptions</description>
- 	<prerequisites>
--		<maven>3.0</maven>
-+		<maven>2.2.1</maven>
- 	</prerequisites>
- 	<parent>
- 		<groupId>org.apache.uima</groupId>
---- a/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
-+++ b/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
-@@ -111,7 +111,7 @@
-     StringBuilder classpathBuilder = new StringBuilder();
-     
-     // Source roots
--    for (String element : this.project.getCompileSourceRoots()) {
-+    for (String element : (List<String>) this.project.getCompileSourceRoots()) {
-       if (classpathBuilder.length() > 0) {
-         classpathBuilder.append(File.pathSeparatorChar);
-       }
-@@ -120,7 +120,7 @@
-     }
- 
-     // Resource roots
--    for (Resource element : this.project.getResources()) {
-+    for (Resource element : (List<Resource>) this.project.getResources()) {
-       if (classpathBuilder.length() > 0) {
-         classpathBuilder.append(File.pathSeparatorChar);
-       }
-@@ -294,7 +294,7 @@
- 
-     // map each resource from its target location to its source location
-     Map<File, File> targetToSource = new HashMap<File, File>();
--    for (Resource resource : this.project.getResources()) {
-+    for (Resource resource : (List<Resource>) this.project.getResources()) {
-       File resourceDir = new File(resource.getDirectory());
-       if (resourceDir.exists()) {
- 
diff --git a/debian/patches/series b/debian/patches/series
index 145e2f6..0902609 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@ disable_ecore.diff
 #docbook_tool.diff
 build-helper-version.diff
 disable_internal_javadoc.diff
-maven2-compatibility.diff
 maven-plugin-configuration.diff
 disable-integration-tests.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uimaj.git