This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-containers1.5.
commit 776a736f4e32993d5a4a674ce068d1caf8642e4c Author: Emmanuel Bourg <[email protected]> Date: Thu Nov 19 12:49:16 2015 +0100 Reverted the update to qdox 2 --- debian/changelog | 1 + debian/patches/02-qdox-compatibility.patch | 189 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 191 insertions(+) diff --git a/debian/changelog b/debian/changelog index aad3b22..7fbe711 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ plexus-containers1.5 (1.6-1) UNRELEASED; urgency=medium - Removed 01-classworlds-compatibility.patch (fixed upstream) - Depend on asm4 instead of asm3 (Closes: #800862) - Build depend on junit4 instead of junit + - Reverted the update to qdox 2 (not yet in Debian) * debian/watch: Track the release tags on GitHub * Updated Standards-Version to 3.9.6 (no changes) diff --git a/debian/patches/02-qdox-compatibility.patch b/debian/patches/02-qdox-compatibility.patch new file mode 100644 index 0000000..8fd51fd --- /dev/null +++ b/debian/patches/02-qdox-compatibility.patch @@ -0,0 +1,189 @@ +Description: Revert the update to qdox 2 (not yet in Debian) +Origin: backport, https://github.com/sonatype/plexus-containers/commit/dfdbf95.patch +--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/SourceComponentDescriptorExtractor.java ++++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/SourceComponentDescriptorExtractor.java +@@ -16,7 +16,6 @@ + + import java.io.File; + import java.util.ArrayList; +-import java.util.Collection; + import java.util.List; + import java.util.Map; + +@@ -25,7 +24,7 @@ + import org.codehaus.plexus.metadata.gleaner.SourceComponentGleaner; + import org.codehaus.plexus.util.StringUtils; + +-import com.thoughtworks.qdox.JavaProjectBuilder; ++import com.thoughtworks.qdox.JavaDocBuilder; + import com.thoughtworks.qdox.model.JavaClass; + + /** +@@ -67,7 +66,7 @@ + List<ComponentDescriptor<?>> descriptors = new ArrayList<ComponentDescriptor<?>>(); + + // Scan the sources +- JavaProjectBuilder builder = new JavaProjectBuilder(); ++ JavaDocBuilder builder = new JavaDocBuilder(); + + if ( StringUtils.isNotEmpty( sourceEncoding ) ) + { +@@ -81,7 +80,7 @@ + builder.addSourceTree( dir ); + } + +- Collection<JavaClass> classes = builder.getClasses(); ++ JavaClass[] classes = builder.getClasses(); + + // For each class we find, try to glean off a descriptor + for (JavaClass aClass : classes) { +--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java ++++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java +@@ -24,17 +24,28 @@ + * SOFTWARE. + */ + +-import java.util.*; ++import java.util.ArrayList; ++import java.util.Arrays; ++import java.util.Collection; ++import java.util.Collections; ++import java.util.HashMap; ++import java.util.Iterator; ++import java.util.List; ++import java.util.Map; + + import org.codehaus.plexus.component.repository.ComponentDescriptor; + import org.codehaus.plexus.component.repository.ComponentRequirement; + import org.codehaus.plexus.component.repository.ComponentRequirementList; + import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; + import org.codehaus.plexus.logging.LogEnabled; +-import org.codehaus.plexus.personality.plexus.lifecycle.phase.*; ++import org.codehaus.plexus.personality.plexus.lifecycle.phase.Configurable; ++import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; ++import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable; ++import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; ++import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; + import org.codehaus.plexus.util.StringUtils; + +-import com.thoughtworks.qdox.JavaProjectBuilder; ++import com.thoughtworks.qdox.JavaDocBuilder; + import com.thoughtworks.qdox.model.DocletTag; + import com.thoughtworks.qdox.model.JavaClass; + import com.thoughtworks.qdox.model.JavaField; +@@ -79,7 +90,7 @@ + // ComponentGleaner Implementation + // ---------------------------------------------------------------------- + +- public ComponentDescriptor<?> glean( JavaProjectBuilder classCache, JavaClass javaClass ) ++ public ComponentDescriptor<?> glean( JavaDocBuilder classCache, JavaClass javaClass ) + throws ComponentGleanerException + { + DocletTag tag = javaClass.getTagByName( PLEXUS_COMPONENT_TAG ); +@@ -244,7 +255,7 @@ + // Remove any Plexus specific interfaces from the calculation + // ---------------------------------------------------------------------- + +- List<JavaClass> interfaces = new ArrayList<JavaClass>( javaClass.getImplementedInterfaces() ); ++ List<JavaClass> interfaces = new ArrayList<JavaClass>( Arrays.asList( javaClass.getImplementedInterfaces() ) ); + + for ( Iterator<JavaClass> it = interfaces.iterator(); it.hasNext(); ) + { +@@ -323,10 +334,10 @@ + return role; + } + +- private void findRequirements( JavaProjectBuilder classCache, ComponentDescriptor<?> componentDescriptor, ++ private void findRequirements( JavaDocBuilder classCache, ComponentDescriptor<?> componentDescriptor, + JavaClass javaClass ) + { +- List<JavaField> fields = javaClass.getFields(); ++ JavaField[] fields = javaClass.getFields(); + + // ---------------------------------------------------------------------- + // Search the super class for requirements +@@ -354,7 +365,7 @@ + // Role + // ---------------------------------------------------------------------- + +- String requirementClass = field.getType().getFullyQualifiedName(); ++ String requirementClass = field.getType().getJavaClass().getFullyQualifiedName(); + + boolean isMap = requirementClass.equals(Map.class.getName()) || + requirementClass.equals(Collection.class.getName()); +@@ -444,7 +455,7 @@ + private void findConfiguration( XmlPlexusConfiguration configuration, JavaClass javaClass ) + throws ComponentGleanerException + { +- List<JavaField> fields = javaClass.getFields(); ++ JavaField[] fields = javaClass.getFields(); + + // ---------------------------------------------------------------------- + // Search the super class for configurable fields. +--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/SourceComponentGleaner.java ++++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/SourceComponentGleaner.java +@@ -18,7 +18,7 @@ + + import org.codehaus.plexus.component.repository.ComponentDescriptor; + +-import com.thoughtworks.qdox.JavaProjectBuilder; ++import com.thoughtworks.qdox.JavaDocBuilder; + import com.thoughtworks.qdox.model.JavaClass; + + /** +@@ -30,6 +30,6 @@ + { + String ROLE = SourceComponentGleaner.class.getName(); + +- ComponentDescriptor<?> glean( JavaProjectBuilder classCache, JavaClass javaClass ) ++ ComponentDescriptor<?> glean( JavaDocBuilder classCache, JavaClass javaClass ) + throws ComponentGleanerException; + } +\ No newline at end of file +--- a/plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleanerTest.java ++++ b/plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleanerTest.java +@@ -23,7 +23,7 @@ + import org.codehaus.plexus.component.repository.ComponentRequirement; + import org.codehaus.plexus.configuration.PlexusConfiguration; + +-import com.thoughtworks.qdox.JavaProjectBuilder; ++import com.thoughtworks.qdox.JavaDocBuilder; + import com.thoughtworks.qdox.model.JavaClass; + import com.thoughtworks.qdox.model.JavaSource; + +@@ -37,7 +37,7 @@ + { + private QDoxComponentGleaner gleaner; + +- private JavaProjectBuilder builder; ++ private JavaDocBuilder builder; + + // @Override + protected void setUp() +@@ -46,7 +46,7 @@ + super.setUp(); + + gleaner = new QDoxComponentGleaner(); +- builder = new JavaProjectBuilder(); ++ builder = new JavaDocBuilder(); + } + + // @Override +@@ -74,13 +74,13 @@ + JavaSource source = addSource( name ); + assertNotNull( source ); + +- List<JavaClass> classes = source.getClasses(); ++ JavaClass[] classes = source.getClasses(); + assertNotNull( classes ); +- assertEquals( 1, classes.size() ); ++ assertEquals( 1, classes.length ); + +- assertNotNull( classes.get(0) ); ++ assertNotNull( classes[0] ); + +- return classes.get(0); ++ return classes[0]; + } + + private ComponentDescriptor<?> glean( final String name, final String[] supporting ) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..41d3eb3 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +02-qdox-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers1.5.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
