This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc.
commit 799b78bd0ef9d7735500f518c15864f4400a1310 Author: Emmanuel Bourg <[email protected]> Date: Thu Dec 17 12:18:49 2015 +0100 Fixed the compilation errors with the tests --- debian/changelog | 1 + debian/control | 1 + debian/maven.ignoreRules | 1 - debian/patches/felix-compatibility.patch | 69 +++++++++++++++++++++++++ debian/patches/plexus-utils-compatibility.patch | 11 ++++ debian/patches/series | 1 + 6 files changed, 83 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4b4b3ae..fc4c25b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ sisu-ioc (2.3.0-8) UNRELEASED; urgency=medium * Team upload. * Replaced guice_classifier.diff with a Maven rule * Ignore the project-info-reports plugin to remove a warning with Maven 3 + * Fixed the compilation errors with the tests -- Emmanuel Bourg <[email protected]> Thu, 17 Dec 2015 12:12:38 +0100 diff --git a/debian/control b/debian/control index 5b91605..d52987e 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends-Indep: junit4, libaopalliance-java, libatinject-jsr330-api-java, libcdi-api-java, + libfelix-framework-java, liblogback-java, libmaven-bundle-plugin-java, libmaven-dependency-plugin-java, diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 75c176c..81086d6 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -22,4 +22,3 @@ org.codehaus.mojo cobertura-maven-plugin * * * * org.codehaus.mojo findbugs-maven-plugin * * * * org.eclipse.equinox org.eclipse.equinox.registry * * * * -org.apache.felix org.apache.felix.framework * * * * diff --git a/debian/patches/felix-compatibility.patch b/debian/patches/felix-compatibility.patch new file mode 100644 index 0000000..b64b82c --- /dev/null +++ b/debian/patches/felix-compatibility.patch @@ -0,0 +1,69 @@ +--- a/sisu-inject/containers/guice-bean/guice-bean-reflect/src/test/java/org/sonatype/guice/bean/reflect/BundleClassSpaceTest.java ++++ b/sisu-inject/containers/guice-bean/guice-bean-reflect/src/test/java/org/sonatype/guice/bean/reflect/BundleClassSpaceTest.java +@@ -202,7 +202,7 @@ + { + final ClassSpace space = new BundleClassSpace( new Bundle() + { +- public Enumeration<?> getResources( final String name ) ++ public Enumeration<URL> getResources( final String name ) + throws IOException + { + throw new IOException(); // the rest of the methods aren't used... +@@ -269,7 +269,7 @@ + return 0; + } + +- public Map<?, ?> getSignerCertificates( final int signersType ) ++ public Map<java.security.cert.X509Certificate,java.util.List<java.security.cert.X509Certificate>> getSignerCertificates( final int signersType ) + { + return null; + } +@@ -299,17 +299,17 @@ + return 0; + } + +- public Dictionary<?, ?> getHeaders( final String locale ) ++ public Dictionary<String, String> getHeaders( final String locale ) + { + return null; + } + +- public Dictionary<?, ?> getHeaders() ++ public Dictionary<String, String> getHeaders() + { + return null; + } + +- public Enumeration<?> getEntryPaths( final String path ) ++ public Enumeration<String> getEntryPaths( final String path ) + { + return null; + } +@@ -329,10 +329,26 @@ + return null; + } + +- public Enumeration<?> findEntries( final String path, final String filePattern, final boolean recurse ) ++ public Enumeration<URL> findEntries( final String path, final String filePattern, final boolean recurse ) + { + return null; + } ++ ++ public java.io.File getDataFile(String s) ++ { ++ return null; ++ } ++ ++ public <A> A adapt(Class<A> cls) ++ { ++ return null; ++ } ++ ++ public int compareTo(Bundle bundle) ++ { ++ return 0; ++ } ++ + } ); + + assertFalse( space.getResources( "error" ).hasMoreElements() ); diff --git a/debian/patches/plexus-utils-compatibility.patch b/debian/patches/plexus-utils-compatibility.patch index d9db6ec..8e557e8 100644 --- a/debian/patches/plexus-utils-compatibility.patch +++ b/debian/patches/plexus-utils-compatibility.patch @@ -12,3 +12,14 @@ Forwarded: no } return reader; } +--- a/sisu-inject/containers/guice-plexus/guice-plexus-shim/src/test/java/org/codehaus/plexus/context/ContextMapAdapterTest.java ++++ b/sisu-inject/containers/guice-plexus/guice-plexus-shim/src/test/java/org/codehaus/plexus/context/ContextMapAdapterTest.java +@@ -64,7 +64,7 @@ + final String foo = "${name} is an ${noun}. ${not.interpolated}"; + + final InterpolationFilterReader reader = +- new InterpolationFilterReader( new StringReader( foo ), new ContextMapAdapter( context ) ); ++ new InterpolationFilterReader( new StringReader( foo ), (java.util.Map) new ContextMapAdapter( context ) ); + + final StringWriter writer = new StringWriter(); + IOUtil.copy( reader, writer ); diff --git a/debian/patches/series b/debian/patches/series index ed63005..7881fe6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ version_plexus.diff javac_apt_scanner.diff plexus-utils-compatibility.patch bnd-compatibility.patch +felix-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
