[guice] 10/12: Build the spring extension

[Emmanuel Bourg]

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

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

commit 444114cdbca5c675f512c5832c43f113012b26fe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 9 15:50:25 2014 +0200

    Build the spring extension
---
 debian/changelog          | 2 +-
 debian/control            | 1 +
 debian/libguice-java.poms | 1 +
 debian/maven.rules        | 1 +
 debian/rules              | 4 +++-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7da3d8..5da926c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 guice (3.0-6) UNRELEASED; urgency=medium
 
-  * Build and install the grapher, jmx, jndi, servlet, multibindings
+  * Build and install the grapher, jmx, jndi, servlet, multibindings, spring
     and throwingproviders extensions
   * Fixed a build failure caused by the cglib/asm transition
   * Use links to the system jars instead of patching the build script
diff --git a/debian/control b/debian/control
index ba7ac48..9c4f45b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: ant,
                libcglib3-java,
                libjarjar-java,
                libservlet3.1-java,
+               libspring-beans-java,
                maven-debian-helper
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/guice.git
diff --git a/debian/libguice-java.poms b/debian/libguice-java.poms
index 9981080..aef2136 100644
--- a/debian/libguice-java.poms
+++ b/debian/libguice-java.poms
@@ -34,4 +34,5 @@ extensions/multibindings/pom.xml  --has-package-version --java-lib --artifact=ex
 extensions/grapher/pom.xml        --has-package-version --java-lib --artifact=extensions/grapher/build/guice-grapher-3.0.jar
 extensions/jmx/pom.xml            --has-package-version --java-lib --artifact=extensions/jmx/build/guice-jmx-3.0.jar
 extensions/jndi/pom.xml           --has-package-version --java-lib --artifact=extensions/jndi/build/guice-jndi-3.0.jar
+extensions/spring/pom.xml         --has-package-version --java-lib --artifact=extensions/spring/build/guice-spring-3.0.jar
 extensions/throwingproviders/pom.xml --has-package-version --java-lib --artifact=extensions/throwingproviders/build/guice-throwingproviders-3.0.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index bb9cb0b..299b373 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,3 @@
 s/org.sonatype.sisu.inject/cglib/ cglib * s/.*/3.x/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
+org.springframework spring-beans * s/.*/3.x/ * *
diff --git a/debian/rules b/debian/rules
index 07f2184..02c3f52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 VERSION := \$(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^.*:\ (.*)-.*$$/\1/')
 
-EXTENSIONS = assistedinject servlet multibindings grapher jmx jndi throwingproviders
+EXTENSIONS = assistedinject servlet multibindings grapher jmx jndi spring throwingproviders
 
 %:
 	dh $@ --with javahelper
@@ -18,6 +18,8 @@ override_dh_auto_build:
 	ln -s /usr/share/java/cglib3.jar              lib/build/cglib-2.2.1-snapshot.jar
 	ln -s /usr/share/java/jarjar.jar              lib/build/jarjar-snapshot.jar
 	ln -s /usr/share/java/servlet-api-3.1.jar     lib/build/servlet.jar
+	ln -s /usr/share/java/spring3-beans.jar       lib/build/spring-beans.jar
+	ln -s /usr/share/java/spring3-core.jar        lib/build/spring-core.jar
 
 	dh_auto_build
 

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