[plexus-containers1.5] 12/14: Depend on libqdox2-java instead of libqdox-java
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Feb 12 17:47:59 GMT 2016
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 d57e10f115d048da6390af1895c1ce7d541f0214
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Feb 12 14:52:14 2016 +0100
Depend on libqdox2-java instead of libqdox-java
---
debian/changelog | 1 +
debian/control | 4 +-
debian/maven.rules | 2 +-
debian/patches/02-qdox-compatibility.patch | 189 -----------------------------
debian/patches/series | 1 -
5 files changed, 4 insertions(+), 193 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 71ddf52..f311cca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ plexus-containers1.5 (1.6-2) UNRELEASED; urgency=medium
* Moved the artifact to distinct packages to optimize the dependencies
* No longer build plexus-component-javadoc (never used)
* Removed the unused -doc package
+ * Depend on libqdox2-java instead of libqdox-java
* Updated Standards-Version to 3.9.7 (no changes)
* Updated the URL of the project homepage
diff --git a/debian/control b/debian/control
index 06863d4..95c059d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends-Indep: junit4,
libplexus-classworlds2-java,
libplexus-cli-java,
libplexus-utils2-java,
- libqdox-java,
+ libqdox2-java,
libxbean-java,
maven-debian-helper
Standards-Version: 3.9.7
@@ -71,7 +71,7 @@ Depends: libasm4-java,
libplexus-cli-java,
libplexus-component-annotations-java,
libplexus-container-default1.5-java,
- libqdox-java,
+ libqdox2-java,
${misc:Depends}
Breaks: libplexus-containers1.5-java (<< 1.6-2~)
Replaces: libplexus-containers1.5-java (<< 1.6-2~)
diff --git a/debian/maven.rules b/debian/maven.rules
index dba3afb..c8b7c9d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -19,7 +19,7 @@
org.ow2.asm asm* jar s/.*/4.x/ * *
s/jdom/org.jdom/ jdom jar s/.*/debian/ * *
junit junit jar s/.*/4.x/ * *
-s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * *
+com.thoughtworks.qdox qdox * s/.*/2.x/ * *
s/com.google.collections/com.google.guava/ s/google-collections/guava/ * s/.*/debian/ * *
org.codehaus.plexus plexus-classworlds jar s/.*/2.x/ * *
diff --git a/debian/patches/02-qdox-compatibility.patch b/debian/patches/02-qdox-compatibility.patch
deleted file mode 100644
index 8fd51fd..0000000
--- a/debian/patches/02-qdox-compatibility.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-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
index ce7f954..912583e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-02-qdox-compatibility.patch
03-reproducible-metadata.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers1.5.git
More information about the pkg-java-commits
mailing list