[plexus-bsh-factory] 03/04: Depend on libplexus-container-default1.5-java instead of libplexus-container-default-java
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Sep 8 08:02:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-bsh-factory.
commit 4be0e474f9cfac512062ebdb9bd7821272c44036
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Sep 8 09:42:11 2017 +0200
Depend on libplexus-container-default1.5-java instead of libplexus-container-default-java
---
debian/changelog | 2 +
debian/control | 6 +--
debian/maven.rules | 3 +-
debian/patches/01-add-missing-dependencies.patch | 3 ++
.../02-plexus-containers-compatibility.patch | 56 ++++++++++++++++++++++
debian/patches/03-junit-dependency.patch | 13 +++++
debian/patches/series | 2 +
7 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ac4f9cb..e2e5a80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
plexus-bsh-factory (1.0~alpha7-4) UNRELEASED; urgency=medium
* Team upload.
+ * Depend on libplexus-container-default1.5-java
+ instead of libplexus-container-default-java
* Standards-Version updated to 4.1.0
* Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 3518457..88bfac5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper
-Build-Depends-Indep: libplexus-container-default-java, libbsh-java
+Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper, junit4
+Build-Depends-Indep: libplexus-container-default1.5-java, libbsh-java
Standards-Version: 4.1.0
Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-bsh-factory.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-bsh-factory.git
@@ -12,7 +12,7 @@ Homepage: http://plexus.codehaus.org/
Package: libplexus-bsh-factory-java
Architecture: all
-Depends: ${misc:Depends}, libplexus-container-default-java, libbsh-java
+Depends: ${misc:Depends}, libplexus-container-default1.5-java, libbsh-java
Description: Plexus Beanshell Factory
The Plexus project provides a full software stack for creating and
executing software projects. Based on the Plexus container, the applications
diff --git a/debian/maven.rules b/debian/maven.rules
index 780a3e0..4033cad 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,3 @@
+junit junit * s/.*/4.x/ * *
s/bsh/org.beanshell/ bsh jar s/.*/debian/
-org.codehaus.plexus plexus-container-default * s/.*/1.0-alpha/
+org.codehaus.plexus plexus-container-default * s/.*/1.5.5/ * *
diff --git a/debian/patches/01-add-missing-dependencies.patch b/debian/patches/01-add-missing-dependencies.patch
index 2571c0f..7fe69af 100644
--- a/debian/patches/01-add-missing-dependencies.patch
+++ b/debian/patches/01-add-missing-dependencies.patch
@@ -1,3 +1,6 @@
+Description: Adds the missing dependency on junit
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
--- a/pom.xml
+++ b/pom.xml
@@ -14,5 +14,11 @@
diff --git a/debian/patches/02-plexus-containers-compatibility.patch b/debian/patches/02-plexus-containers-compatibility.patch
new file mode 100644
index 0000000..e512c74
--- /dev/null
+++ b/debian/patches/02-plexus-containers-compatibility.patch
@@ -0,0 +1,56 @@
+Description: Fixes the compatibility with the version of plexus-container-default in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java
++++ b/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java
+@@ -25,6 +25,11 @@
+ public class BshComponentFactory
+ extends AbstractComponentFactory
+ {
++ public String getId()
++ {
++ return "bsh";
++ }
++
+ public Object newInstance( ComponentDescriptor componentDescriptor, ClassRealm containerRealm,
+ PlexusContainer container )
+ throws ComponentInstantiationException
+@@ -69,23 +74,23 @@
+ {
+ containerRealm.display();
+
+- container.getLogger().info( "Error text: " + evalError.getErrorText() );
++ ((org.codehaus.plexus.DefaultPlexusContainer) container).getLogger().info( "Error text: " + evalError.getErrorText() );
+
+ throw new ComponentInstantiationException( "Cannot build component for: " +
+- componentDescriptor.getComponentKey() +
++ componentDescriptor.getHumanReadableKey() +
+ "; unable to read BeanShell script", evalError );
+ }
+ catch ( FileNotFoundException e )
+ {
+ containerRealm.display();
+ throw new ComponentInstantiationException( "Cannot build component for: " +
+- componentDescriptor.getComponentKey() +
++ componentDescriptor.getHumanReadableKey() +
+ "; unable to read BeanShell script", e );
+ }
+ catch ( IOException e )
+ {
+ throw new ComponentInstantiationException( "Cannot build component for: " +
+- componentDescriptor.getComponentKey() +
++ componentDescriptor.getHumanReadableKey() +
+ "; unable to read BeanShell script", e );
+ }
+ finally
+--- a/src/test/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactoryTest.java
++++ b/src/test/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactoryTest.java
+@@ -12,7 +12,7 @@
+ public void testComponent()
+ throws Exception
+ {
+- Hello hello = (Hello) lookup( Hello.ROLE );
++ Hello hello = (Hello) lookup( Hello.class );
+
+ assertNotNull( hello );
+
diff --git a/debian/patches/03-junit-dependency.patch b/debian/patches/03-junit-dependency.patch
new file mode 100644
index 0000000..c3a3b34
--- /dev/null
+++ b/debian/patches/03-junit-dependency.patch
@@ -0,0 +1,13 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -20,5 +20,10 @@
+ <version>1.0-alpha-9-stable-1</version>
+ <scope>provided</scope>
+ </dependency>
++ <dependency>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
++ <version>4.12</version>
++ </dependency>
+ </dependencies>
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
index e9c66b4..5a8d4bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
01-add-missing-dependencies.patch
+02-plexus-containers-compatibility.patch
+03-junit-dependency.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-bsh-factory.git
More information about the pkg-java-commits
mailing list