[maven-site-plugin] 22/31: Depend on libmaven3-core-java instead of libmaven2-core-java

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Aug 29 00:03:06 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository maven-site-plugin.

commit 07ce52e217757a84a70ef20d32bbad951946d118
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 29 01:40:09 2017 +0200

    Depend on libmaven3-core-java instead of libmaven2-core-java
---
 debian/changelog   | 1 +
 debian/control     | 4 +++-
 debian/maven.rules | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4532841..5b99166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ maven-site-plugin (3.6-1) UNRELEASED; urgency=medium
     - Refreshed the patch
     - Depend on libdoxia-java (>= 1.7)
     - Depend on libdoxia-sitetools-java (>= 1.7.4)
+    - Depend on libmaven3-core-java instead of libmaven2-core-java
     - Removed the dependency on libplexus-container-default-java
     - Depend on libplexus-utils2-java instead of libplexus-utils-java
 
diff --git a/debian/control b/debian/control
index 68275d9..862d855 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,9 @@ Build-Depends: debhelper (>= 10),
                libmaven-doxia-tools-java,
                libmaven-plugin-testing-java,
                libmaven-plugin-tools-java,
-               libmaven2-core-java,
+               libmaven-reporting-api-java,
+               libmaven-reporting-exec-java,
+               libmaven3-core-java,
                libplexus-archiver-java,
                libplexus-i18n-java,
                libplexus-utils2-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index e02458e..ead789e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,6 +16,14 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
 
+org.apache.maven maven-artifact         * s/.*/3.x/ * *
+org.apache.maven maven-compat           * s/.*/3.x/ * *
+org.apache.maven maven-core             * s/.*/3.x/ * *
+org.apache.maven maven-model            * s/.*/3.x/ * *
+org.apache.maven maven-plugin-api       * s/.*/3.x/ * *
+org.apache.maven maven-settings         * s/.*/3.x/ * *
+org.apache.maven maven-settings-builder * s/.*/3.x/ * *
+org.apache.maven.reporting maven-reporting-api * s/.*/3.x/ * *
 org.apache.maven.doxia doxia-decoration-model jar s/.*/debian/ * *
 org.apache.maven.doxia doxia-logging-api jar s/.*/debian/ * *
 org.apache.maven.doxia doxia-module-apt jar s/.*/debian/ * *
@@ -25,6 +33,7 @@ org.apache.maven.doxia doxia-module-xhtml jar s/.*/debian/ * *
 org.apache.maven.doxia doxia-sink-api jar s/.*/debian/ * *
 org.apache.maven.doxia doxia-site-renderer jar s/.*/debian/ * *
 org.apache.maven.shared maven-doxia-tools jar s/.*/debian/ * *
+org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
 s/velocity/org.apache.velocity/ * * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *

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



More information about the pkg-java-commits mailing list