This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libspring-java.
commit 022334a4805500e51065a7f86919ca115afd1512 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 22 17:11:33 2016 +0200 Relocated the 3.x Maven artifacts to the generic 'debian' version --- debian/changelog | 1 + debian/control | 2 +- debian/maven.rules | 2 -- debian/rules | 8 ++++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 240af98..450885f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libspring-java (4.1.9-2) UNRELEASED; urgency=medium * Team upload. * Transition to the Servlet API 3.1 (Closes: #830496) + * Relocated the 3.x Maven artifacts to the generic 'debian' version * Refreshed the pom of spring-aspects, spring-framework-bom and spring-instrument-tomcat diff --git a/debian/control b/debian/control index bb81113..90432eb 100644 --- a/debian/control +++ b/debian/control @@ -79,7 +79,7 @@ Build-Depends-Indep: bsh, libxmlunit-java, libxstream-java, libyaml-snake-java, - maven-repo-helper (>= 1.1), + maven-repo-helper (>= 1.9~), testng, velocity Standards-Version: 3.9.8 diff --git a/debian/maven.rules b/debian/maven.rules index 3da5e1f..b0a5a6e 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,5 +1,3 @@ -org.springframework * * s/.*/3.x/ - com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * * com.fasterxml.jackson.dataformat jackson-dataformat-xml * s/.*/2.x/ * * s/com.mchange/c3p0/ c3p0 * s/.*/debian/ * * diff --git a/debian/rules b/debian/rules index 5b57f15..31054af 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ override_dh_auto_clean: override_dh_auto_install: # Install the Bill Of Materials in the core package - mh_installpom -plibspring-core-java debian/poms/spring-framework-bom.pom.xml + mh_installpom -plibspring-core-java --relocate=org.springframework:spring-framework-bom:3.x debian/poms/spring-framework-bom.pom.xml # Install the artifacts in their respective packages for MYMOD in $(MODULES); do \ @@ -29,16 +29,16 @@ override_dh_auto_install: JAR=`echo spring-$$MYMOD/build/libs/spring-$$MYMOD*.jar`; \ POM=`echo debian/poms/spring-$$MYMOD.pom.xml`; \ PACKAGE=`echo libspring-$$BASENAME-java`; \ - mh_installpom -p$$PACKAGE $$POM ; \ + mh_installpom -p$$PACKAGE --relocate=org.springframework:spring-$$MYMOD:3.x $$POM; \ mh_installjar -p$$PACKAGE -nspring3-$$USJNAME --usj-version=3.x --java-lib $$POM $$JAR ; \ done # Install the spring-aspects artifact in the aop package - mh_installpom -plibspring-aop-java debian/poms/spring-aspects.pom.xml + mh_installpom -plibspring-aop-java --relocate=org.springframework:spring-aspects:3.x debian/poms/spring-aspects.pom.xml mh_installjar -plibspring-aop-java -nspring3-aspects --usj-version=3.x --java-lib debian/poms/spring-aspects.pom.xml spring-aspects/build/libs/spring-aspects*.jar # Install the spring-instrument-tomcat artifact in the instrument package - mh_installpom -plibspring-instrument-java debian/poms/spring-instrument-tomcat.pom.xml + mh_installpom -plibspring-instrument-java --relocate=org.springframework:spring-instrument-tomcat:3.x debian/poms/spring-instrument-tomcat.pom.xml mh_installjar -plibspring-instrument-java -nspring3-instrument-tomcat --usj-version=3.x --java-lib debian/poms/spring-aspects.pom.xml spring-instrument-tomcat/build/libs/spring-instrument-tomcat*.jar get-orig-source: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
