Author: drazzib
Date: 2011-11-01 14:42:44 +0000 (Tue, 01 Nov 2011)
New Revision: 15316
Added:
tags/libcommons-discovery-java/0.5-1/
tags/libcommons-discovery-java/0.5-1/debian/changelog
tags/libcommons-discovery-java/0.5-1/debian/maven.properties
tags/libcommons-discovery-java/0.5-1/debian/patches/java6_incompatible_types.diff
tags/libcommons-discovery-java/0.5-1/debian/patches/java6_incompatible_types_tests.diff
tags/libcommons-discovery-java/0.5-1/debian/patches/series
Removed:
tags/libcommons-discovery-java/0.5-1/debian/changelog
tags/libcommons-discovery-java/0.5-1/debian/maven.properties
tags/libcommons-discovery-java/0.5-1/debian/patches/0001-set-source-and-target-version-1.5.patch
tags/libcommons-discovery-java/0.5-1/debian/patches/series
Log:
[svn-buildpackage] Tagging libcommons-discovery-java 0.5-1
Deleted: tags/libcommons-discovery-java/0.5-1/debian/changelog
===================================================================
--- trunk/libcommons-discovery-java/debian/changelog 2011-11-01 04:14:51 UTC
(rev 15314)
+++ tags/libcommons-discovery-java/0.5-1/debian/changelog 2011-11-01
14:42:44 UTC (rev 15316)
@@ -1,160 +0,0 @@
-libcommons-discovery-java (0.5-1) UNRELEASED; urgency=low
-
- * Team upload BUT FTBFS SOURCE
-
- [ Damien Raude-Morvan ]
- * d/control: Drop Depends on any JRE as a Java library don't need to
- depends on a runtime (Java Policy)
-
- [ Torsten Werner ]
- * Update Standards-Version: 3.9.2.
- * New upstream version.
- * Update debian/copyright.
- * Use Maven to build the package.
- * Drop old patch which is not needed anymore.
- * Update debian/watch to create orig tarball from upstreams svn repository.
-
- -- Torsten Werner <twer...@debian.org> Mon, 19 Sep 2011 23:25:59 +0200
-
-libcommons-discovery-java (0.4-4) unstable; urgency=low
-
- [ Emmanuel Bourg ]
- * Update of the URLs
- * Rename Jakarta Commons to Apache Commons
-
- [ Damien Raude-Morvan ]
- * Add myself to Uploaders
- * Remove Arnaud from Uploaders (retired from Debian)
- * Add Maven support:
- - debian/control: Build-Depends-Indep on maven-repo-helper
- - debian/rules: mh_installpoms and mh_installjar
- - debian/pom.xml: POM for commons-dicovery
- * Use 3.0 (quilt) source format:
- - debian/rules: Remove simple-patchsys.mk
- - Refresh all debian/patches
- * Updated Standards-Version 3.8.4 (no changes needed)
- * debian/ant.properties: Compile for Java 1.3
- * Install Javadoc HTML to /usr/share/doc/libcommons-discovery-java/api/
-
- -- Damien Raude-Morvan <draz...@debian.org> Thu, 25 Mar 2010 22:45:40 +0100
-
-libcommons-discovery-java (0.4-3) unstable; urgency=low
-
- * Update the license to Apache License 2.0 (Closes: #532890)
-
- -- Varun Hiremath <va...@debian.org> Tue, 16 Jun 2009 17:38:09 -0400
-
-libcommons-discovery-java (0.4-2) unstable; urgency=low
-
- [ Matthias Klose ]
- * (Build-)depend on default-jre/-jdk.
-
- [ Varun Hiremath ]
- * Split out api docs into a separate -doc package (Closes: #506359)
-
- -- Varun Hiremath <va...@debian.org> Sat, 06 Dec 2008 20:58:55 -0500
-
-libcommons-discovery-java (0.4-1) unstable; urgency=low
-
- [ Kumar Appaiah ]
- * debian/control:
- + Add XS-Vcs-{Svn,Browser} to debian/control
- + Add Homepage field.
- * Update watch file.
-
- [ Varun Hiremath ]
- * New upstream release
- * debian/control:
- + Add myself and Kumar Appaiah to Uploaders.
- + move cdbs and debhelper to Build-Depends.
- + modify Description.
- * debian/compat: switch to 5
- * remove links file from debian/
- * debian/rules:
- + Use DEB_UPSTREAM_VERSION to install jar
- + Create a versioned symbolic link to the jar.
- + implement get-orig-source
- * debian/patches:
- + remove 02_jikes_target_1_3.patch, builds without setting target to 1.3
- + remove 03_gjdoc_crash_fix.patch, gjdoc bug has been fixed and no longer
needed.
- * Add debian/orig-tar.sh to move tarball to deb-layout's tarballs dir.
- * Update debian/watch to call debian/orig-tar.sh
- * debian/docs: remove adc-guidelines.html and best-practices.html as
- upstream provides only Maven xdocs XMLs.
-
- -- Varun Hiremath <varunhirem...@gmail.com> Thu, 20 Sep 2007 23:27:45 +0530
-
-libcommons-discovery-java (0.2-10) unstable; urgency=low
-
- * Use java-gcj-compat instead of kaffe.
- * Moved Build-Depends-Indep to Build-Depends.
- * Updated Standards-Version.
- * Removed Wolfgang from Uploaders and added myself.
- * Fixed Homepage: tag in package description.
-
- -- Michael Koch <konque...@gmx.de> Sun, 17 Jun 2007 13:56:27 -0100
-
-libcommons-discovery-java (0.2-9) unstable; urgency=low
-
- * kaffe compiler transition
-
- -- Wolfgang Baer <wb...@gmx.de> Sun, 15 Jan 2006 17:00:07 +0100
-
-libcommons-discovery-java (0.2-8) unstable; urgency=low
-
- * Additional ant-optional dependency due to ant reorganization
- and enabled unit tests during build time
- * Added java1-runtime dependency to allow all free runtimes
- * Added patch to fix gjdoc crash on one source file (reported upstream)
- * Removed junit as dependency - only needed at build time
- * Register documenation with doc-base
- * Removed empty README.Debian
- * Standards-Version 3.6.2 (no changes)
-
- -- Wolfgang Baer <wb...@gmx.de> Wed, 5 Oct 2005 10:01:59 +0000
-
-libcommons-discovery-java (0.2-7) unstable; urgency=low
-
- * libant1.6-java to ant transition
-
- -- Arnaud Vandyck <av...@debian.org> Sat, 20 Aug 2005 19:37:55 +0200
-
-libcommons-discovery-java (0.2-6) unstable; urgency=low
-
- * building with kaffe because of a failure in sablevm
- * building javadoc
-
- -- Arnaud Vandyck <av...@debian.org> Wed, 2 Mar 2005 22:47:22 +0100
-
-libcommons-discovery-java (0.2-5) unstable; urgency=low
-
- * added kaffe to the build-dep, but finally built with SableVM. The
- javadoc is no more generated at the moment.
-
- -- Arnaud Vandyck <av...@debian.org> Sun, 15 Aug 2004 02:33:19 +0200
-
-libcommons-discovery-java (0.2-4) unstable; urgency=low
-
- * added libant1.6-java and jikes (closes: #265661).
-
- -- Arnaud Vandyck <av...@debian.org> Sat, 14 Aug 2004 16:22:02 +0200
-
-libcommons-discovery-java (0.2-3) unstable; urgency=low
-
- * added cdbs to the build-depends, thanks to Daniel Schepler (closes:
- #251908).
-
- -- Arnaud Vandyck <av...@debian.org> Mon, 31 May 2004 21:34:17 +0200
-
-libcommons-discovery-java (0.2-2) unstable; urgency=low
-
- * Move to main: libcommons-logging-java is now in main.
-
- -- Arnaud Vandyck <av...@debian.org> Thu, 13 May 2004 00:51:00 +0200
-
-libcommons-discovery-java (0.2-1) unstable; urgency=low
-
- * Initial Release (closes: #237507).
-
- -- Arnaud Vandyck <av...@debian.org> Fri, 12 Mar 2004 23:53:29 +0100
-
Copied: tags/libcommons-discovery-java/0.5-1/debian/changelog (from rev 15315,
trunk/libcommons-discovery-java/debian/changelog)
===================================================================
--- tags/libcommons-discovery-java/0.5-1/debian/changelog
(rev 0)
+++ tags/libcommons-discovery-java/0.5-1/debian/changelog 2011-11-01
14:42:44 UTC (rev 15316)
@@ -0,0 +1,163 @@
+libcommons-discovery-java (0.5-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Damien Raude-Morvan ]
+ * d/patches/java6_incompatible_types{,_tests}.diff: Fix FTBFS on openjdk-6.
+ * d/control: Drop Depends on any JRE as a Java library don't need to
+ depends on a runtime (Java Policy).
+ * d/patches/0001-set-source-and-target-version-1.5.patch: Dropped.
+ * d/maven.properties: Set source and target for javac to 1.5.
+
+ [ Torsten Werner ]
+ * Update Standards-Version: 3.9.2.
+ * New upstream version.
+ * Update debian/copyright.
+ * Use Maven to build the package.
+ * Drop old patch which is not needed anymore.
+ * Update debian/watch to create orig tarball from upstreams svn repository.
+
+ -- Damien Raude-Morvan <draz...@debian.org> Tue, 01 Nov 2011 15:14:06 +0100
+
+libcommons-discovery-java (0.4-4) unstable; urgency=low
+
+ [ Emmanuel Bourg ]
+ * Update of the URLs
+ * Rename Jakarta Commons to Apache Commons
+
+ [ Damien Raude-Morvan ]
+ * Add myself to Uploaders
+ * Remove Arnaud from Uploaders (retired from Debian)
+ * Add Maven support:
+ - debian/control: Build-Depends-Indep on maven-repo-helper
+ - debian/rules: mh_installpoms and mh_installjar
+ - debian/pom.xml: POM for commons-dicovery
+ * Use 3.0 (quilt) source format:
+ - debian/rules: Remove simple-patchsys.mk
+ - Refresh all debian/patches
+ * Updated Standards-Version 3.8.4 (no changes needed)
+ * debian/ant.properties: Compile for Java 1.3
+ * Install Javadoc HTML to /usr/share/doc/libcommons-discovery-java/api/
+
+ -- Damien Raude-Morvan <draz...@debian.org> Thu, 25 Mar 2010 22:45:40 +0100
+
+libcommons-discovery-java (0.4-3) unstable; urgency=low
+
+ * Update the license to Apache License 2.0 (Closes: #532890)
+
+ -- Varun Hiremath <va...@debian.org> Tue, 16 Jun 2009 17:38:09 -0400
+
+libcommons-discovery-java (0.4-2) unstable; urgency=low
+
+ [ Matthias Klose ]
+ * (Build-)depend on default-jre/-jdk.
+
+ [ Varun Hiremath ]
+ * Split out api docs into a separate -doc package (Closes: #506359)
+
+ -- Varun Hiremath <va...@debian.org> Sat, 06 Dec 2008 20:58:55 -0500
+
+libcommons-discovery-java (0.4-1) unstable; urgency=low
+
+ [ Kumar Appaiah ]
+ * debian/control:
+ + Add XS-Vcs-{Svn,Browser} to debian/control
+ + Add Homepage field.
+ * Update watch file.
+
+ [ Varun Hiremath ]
+ * New upstream release
+ * debian/control:
+ + Add myself and Kumar Appaiah to Uploaders.
+ + move cdbs and debhelper to Build-Depends.
+ + modify Description.
+ * debian/compat: switch to 5
+ * remove links file from debian/
+ * debian/rules:
+ + Use DEB_UPSTREAM_VERSION to install jar
+ + Create a versioned symbolic link to the jar.
+ + implement get-orig-source
+ * debian/patches:
+ + remove 02_jikes_target_1_3.patch, builds without setting target to 1.3
+ + remove 03_gjdoc_crash_fix.patch, gjdoc bug has been fixed and no longer
needed.
+ * Add debian/orig-tar.sh to move tarball to deb-layout's tarballs dir.
+ * Update debian/watch to call debian/orig-tar.sh
+ * debian/docs: remove adc-guidelines.html and best-practices.html as
+ upstream provides only Maven xdocs XMLs.
+
+ -- Varun Hiremath <varunhirem...@gmail.com> Thu, 20 Sep 2007 23:27:45 +0530
+
+libcommons-discovery-java (0.2-10) unstable; urgency=low
+
+ * Use java-gcj-compat instead of kaffe.
+ * Moved Build-Depends-Indep to Build-Depends.
+ * Updated Standards-Version.
+ * Removed Wolfgang from Uploaders and added myself.
+ * Fixed Homepage: tag in package description.
+
+ -- Michael Koch <konque...@gmx.de> Sun, 17 Jun 2007 13:56:27 -0100
+
+libcommons-discovery-java (0.2-9) unstable; urgency=low
+
+ * kaffe compiler transition
+
+ -- Wolfgang Baer <wb...@gmx.de> Sun, 15 Jan 2006 17:00:07 +0100
+
+libcommons-discovery-java (0.2-8) unstable; urgency=low
+
+ * Additional ant-optional dependency due to ant reorganization
+ and enabled unit tests during build time
+ * Added java1-runtime dependency to allow all free runtimes
+ * Added patch to fix gjdoc crash on one source file (reported upstream)
+ * Removed junit as dependency - only needed at build time
+ * Register documenation with doc-base
+ * Removed empty README.Debian
+ * Standards-Version 3.6.2 (no changes)
+
+ -- Wolfgang Baer <wb...@gmx.de> Wed, 5 Oct 2005 10:01:59 +0000
+
+libcommons-discovery-java (0.2-7) unstable; urgency=low
+
+ * libant1.6-java to ant transition
+
+ -- Arnaud Vandyck <av...@debian.org> Sat, 20 Aug 2005 19:37:55 +0200
+
+libcommons-discovery-java (0.2-6) unstable; urgency=low
+
+ * building with kaffe because of a failure in sablevm
+ * building javadoc
+
+ -- Arnaud Vandyck <av...@debian.org> Wed, 2 Mar 2005 22:47:22 +0100
+
+libcommons-discovery-java (0.2-5) unstable; urgency=low
+
+ * added kaffe to the build-dep, but finally built with SableVM. The
+ javadoc is no more generated at the moment.
+
+ -- Arnaud Vandyck <av...@debian.org> Sun, 15 Aug 2004 02:33:19 +0200
+
+libcommons-discovery-java (0.2-4) unstable; urgency=low
+
+ * added libant1.6-java and jikes (closes: #265661).
+
+ -- Arnaud Vandyck <av...@debian.org> Sat, 14 Aug 2004 16:22:02 +0200
+
+libcommons-discovery-java (0.2-3) unstable; urgency=low
+
+ * added cdbs to the build-depends, thanks to Daniel Schepler (closes:
+ #251908).
+
+ -- Arnaud Vandyck <av...@debian.org> Mon, 31 May 2004 21:34:17 +0200
+
+libcommons-discovery-java (0.2-2) unstable; urgency=low
+
+ * Move to main: libcommons-logging-java is now in main.
+
+ -- Arnaud Vandyck <av...@debian.org> Thu, 13 May 2004 00:51:00 +0200
+
+libcommons-discovery-java (0.2-1) unstable; urgency=low
+
+ * Initial Release (closes: #237507).
+
+ -- Arnaud Vandyck <av...@debian.org> Fri, 12 Mar 2004 23:53:29 +0100
+
Deleted: tags/libcommons-discovery-java/0.5-1/debian/maven.properties
===================================================================
--- trunk/libcommons-discovery-java/debian/maven.properties 2011-11-01
04:14:51 UTC (rev 15314)
+++ tags/libcommons-discovery-java/0.5-1/debian/maven.properties
2011-11-01 14:42:44 UTC (rev 15316)
@@ -1,4 +0,0 @@
-# Include here properties to pass to Maven during the build.
-# For example:
-# maven.test.skip=true
-
Copied: tags/libcommons-discovery-java/0.5-1/debian/maven.properties (from rev
15315, trunk/libcommons-discovery-java/debian/maven.properties)
===================================================================
--- tags/libcommons-discovery-java/0.5-1/debian/maven.properties
(rev 0)
+++ tags/libcommons-discovery-java/0.5-1/debian/maven.properties
2011-11-01 14:42:44 UTC (rev 15316)
@@ -0,0 +1,7 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.compiler.source=1.5
+maven.compiler.target=1.5
+
Deleted:
tags/libcommons-discovery-java/0.5-1/debian/patches/0001-set-source-and-target-version-1.5.patch
===================================================================
---
trunk/libcommons-discovery-java/debian/patches/0001-set-source-and-target-version-1.5.patch
2011-11-01 04:14:51 UTC (rev 15314)
+++
tags/libcommons-discovery-java/0.5-1/debian/patches/0001-set-source-and-target-version-1.5.patch
2011-11-01 14:42:44 UTC (rev 15316)
@@ -1,28 +0,0 @@
-From: Torsten Werner <twer...@debian.org>
-Date: Mon, 19 Sep 2011 23:32:02 +0200
-Subject: set source and target version 1.5
-
----
- pom.xml | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 0d105c7..d5a55a0 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -160,6 +160,14 @@
- </configuration>
- </plugin>
- <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-compiler-plugin</artifactId>
-+ <configuration>
-+ <source>1.5</source>
-+ <target>1.5</target>
-+ </configuration>
-+ </plugin>
-+ <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
---
Copied:
tags/libcommons-discovery-java/0.5-1/debian/patches/java6_incompatible_types.diff
(from rev 15315,
trunk/libcommons-discovery-java/debian/patches/java6_incompatible_types.diff)
===================================================================
---
tags/libcommons-discovery-java/0.5-1/debian/patches/java6_incompatible_types.diff
(rev 0)
+++
tags/libcommons-discovery-java/0.5-1/debian/patches/java6_incompatible_types.diff
2011-11-01 14:42:44 UTC (rev 15316)
@@ -0,0 +1,79 @@
+Description: OpenJDK fails to compile commons-discovery 0.5
+ This works around the compiler problem by adding the type
+ parameters to the calls instead of letting the compiler infer them.
+Author: Denis Lila <dlila at redhat dot com>
+Origin:
https://issues.apache.org/jira/secure/attachment/12481130/ojdk-javac-workaround.patch
+Bug: https://issues.apache.org/jira/browse/DISCOVERY-18
+Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=706066
+Applied-Upstream: 0.6
+Index: b/src/java/org/apache/commons/discovery/tools/DiscoverClass.java
+===================================================================
+--- a/src/java/org/apache/commons/discovery/tools/DiscoverClass.java
++++ b/src/java/org/apache/commons/discovery/tools/DiscoverClass.java
+@@ -185,7 +185,7 @@
+ * the resulting class does not implement (or extend) the SPI.
+ */
+ public <T, S extends T> Class<S> find(Class<T> spiClass) throws
DiscoveryException {
+- return find(getClassLoaders(spiClass),
++ return DiscoverClass.<T, S>find(getClassLoaders(spiClass),
+ new SPInterface<T>(spiClass),
+ nullProperties,
+ (DefaultClassHolder<T>) null);
+@@ -204,7 +204,7 @@
+ * the resulting class does not implement (or extend) the SPI.
+ */
+ public <T, S extends T> Class<S> find(Class<T> spiClass, Properties
properties) throws DiscoveryException {
+- return find(getClassLoaders(spiClass),
++ return DiscoverClass.<T, S>find(getClassLoaders(spiClass),
+ new SPInterface<T>(spiClass),
+ new PropertiesHolder(properties),
+ (DefaultClassHolder<T>) null);
+@@ -223,7 +223,7 @@
+ * the resulting class does not implement (or extend) the SPI.
+ */
+ public <T, S extends T> Class<S> find(Class<T> spiClass, String
defaultImpl) throws DiscoveryException {
+- return find(getClassLoaders(spiClass),
++ return DiscoverClass.<T, S>find(getClassLoaders(spiClass),
+ new SPInterface<T>(spiClass),
+ nullProperties,
+ new DefaultClassHolder<T>(defaultImpl));
+@@ -244,7 +244,7 @@
+ */
+ public <T, S extends T> Class<S> find(Class<T> spiClass, Properties
properties, String defaultImpl)
+ throws DiscoveryException {
+- return find(getClassLoaders(spiClass),
++ return DiscoverClass.<T, S>find(getClassLoaders(spiClass),
+ new SPInterface<T>(spiClass),
+ new PropertiesHolder(properties),
+ new DefaultClassHolder<T>(defaultImpl));
+@@ -265,7 +265,7 @@
+ */
+ public <T, S extends T> Class<S> find(Class<T> spiClass, String
propertiesFileName, String defaultImpl)
+ throws DiscoveryException {
+- return find(getClassLoaders(spiClass),
++ return DiscoverClass.<T, S>find(getClassLoaders(spiClass),
+ new SPInterface<T>(spiClass),
+ new PropertiesHolder(propertiesFileName),
+ new DefaultClassHolder<T>(defaultImpl));
+@@ -517,7 +517,7 @@
+ IllegalAccessException,
+ NoSuchMethodException,
+ InvocationTargetException {
+- return spi.newInstance(find(loaders, spi, properties, defaultImpl));
++ return spi.newInstance(DiscoverClass.<T, T>find(loaders, spi,
properties, defaultImpl));
+ }
+
+ /**
+Index: b/src/java/org/apache/commons/discovery/tools/Service.java
+===================================================================
+--- a/src/java/org/apache/commons/discovery/tools/Service.java
++++ b/src/java/org/apache/commons/discovery/tools/Service.java
+@@ -63,7 +63,7 @@
+ * @return Enumeration of class instances ({@code S})
+ */
+ public static <T, S extends T> Enumeration<S> providers(Class<T>
spiClass) {
+- return providers(new SPInterface<T>(spiClass), null);
++ return Service.<T, S>providers(new SPInterface<T>(spiClass), null);
+ }
+
+ /**
Copied:
tags/libcommons-discovery-java/0.5-1/debian/patches/java6_incompatible_types_tests.diff
(from rev 15315,
trunk/libcommons-discovery-java/debian/patches/java6_incompatible_types_tests.diff)
===================================================================
---
tags/libcommons-discovery-java/0.5-1/debian/patches/java6_incompatible_types_tests.diff
(rev 0)
+++
tags/libcommons-discovery-java/0.5-1/debian/patches/java6_incompatible_types_tests.diff
2011-11-01 14:42:44 UTC (rev 15316)
@@ -0,0 +1,39 @@
+Index: b/src/test/org/apache/commons/discovery/test/TestAll.java
+===================================================================
+--- a/src/test/org/apache/commons/discovery/test/TestAll.java
++++ b/src/test/org/apache/commons/discovery/test/TestAll.java
+@@ -41,6 +41,7 @@
+ import org.apache.commons.discovery.tools.ManagedProperties;
+ import org.apache.commons.discovery.tools.PropertiesHolder;
+ import org.apache.commons.discovery.tools.SPInterface;
++import org.apache.commons.discovery.tools.Service;
+ import org.apache.commons.logging.Log;
+ import org.junit.Test;
+
+@@ -263,7 +264,7 @@
+ ClassLoaders loaders =
ClassLoaders.getAppLoaders(TestInterface2.class, getClass(), false);
+
+ DiscoverClass discover = new DiscoverClass(loaders);
+- Class<? extends TestInterface2> implClass =
discover.find(TestInterface2.class);
++ Class<? extends TestInterface2> implClass =
discover.<TestInterface2,TestInterface2>find(TestInterface2.class);
+
+ assertTrue("Failed to find an implementation class", implClass !=
null);
+ assertEquals("org.apache.commons.discovery.test.TestImpl2_1",
implClass.getName());
+@@ -274,7 +275,7 @@
+ ClassLoaders loaders =
ClassLoaders.getAppLoaders(TestInterface3.class, getClass(), false);
+
+ DiscoverClass discover = new DiscoverClass(loaders);
+- Class<? extends TestInterface3> implClass =
discover.find(TestInterface3.class);
++ Class<? extends TestInterface3> implClass =
discover.<TestInterface3,TestInterface3>find(TestInterface3.class);
+
+ assertTrue("Failed to find an implementation class", implClass !=
null);
+
assertEquals("org.apache.commons.discovery.test.TestImpl3$InnerTestImpl",
implClass.getName());
+@@ -297,7 +298,7 @@
+ final int expectedLogImplementations = 2;
+ int actualLogImplementations = 0;
+
+- Enumeration<? extends Log> logImplementations =
providers(newSPInterface(Log.class,
++ Enumeration<? extends Log> logImplementations =
Service.<Log,Log>providers(newSPInterface(Log.class,
+ new Class<?>[]{ String.class },
+ new Object[]{ getClass().getName() }),
+ null);
Deleted: tags/libcommons-discovery-java/0.5-1/debian/patches/series
===================================================================
--- trunk/libcommons-discovery-java/debian/patches/series 2011-11-01
04:14:51 UTC (rev 15314)
+++ tags/libcommons-discovery-java/0.5-1/debian/patches/series 2011-11-01
14:42:44 UTC (rev 15316)
@@ -1 +0,0 @@
-0001-set-source-and-target-version-1.5.patch
Copied: tags/libcommons-discovery-java/0.5-1/debian/patches/series (from rev
15315, trunk/libcommons-discovery-java/debian/patches/series)
===================================================================
--- tags/libcommons-discovery-java/0.5-1/debian/patches/series
(rev 0)
+++ tags/libcommons-discovery-java/0.5-1/debian/patches/series 2011-11-01
14:42:44 UTC (rev 15316)
@@ -0,0 +1,2 @@
+java6_incompatible_types.diff
+java6_incompatible_types_tests.diff
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
