[Bug 1158062] New: maven-plugin-tools: Port to QDox 2.0
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1158062
Bug ID: 1158062
Summary: maven-plugin-tools: Port to QDox 2.0
Product: Fedora
Version: rawhide
Component: maven-plugin-tools
Assignee: jcapik(a)redhat.com
Reporter: mizdebsk(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com, mizdebsk(a)redhat.com,
msrb(a)redhat.com, yyang(a)redhat.com
Description of problem:
QDox is being updated to new major version (2.0) and maven-plugin-tools needs
to be ported to work with this version.
Version-Release number of selected component (if applicable):
3.3-3
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=XWaP2j0B4u&a=cc_unsubscribe
9 years, 7 months
[plexus-cdc] Port to QDox 2.0
by Mikolaj Izdebski
commit 511b07e7ef63af65fb78a12c989d44056db2c1f6
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Nov 12 13:23:19 2014 +0100
Port to QDox 2.0
0001-Port-to-QDox-2.0.patch | 462 +++++++++++++++++++++++++++++++++++++++++++
plexus-cdc-qdox-1.9.patch | 170 ----------------
plexus-cdc.spec | 9 +-
3 files changed, 468 insertions(+), 173 deletions(-)
---
diff --git a/0001-Port-to-QDox-2.0.patch b/0001-Port-to-QDox-2.0.patch
new file mode 100644
index 0000000..90596fc
--- /dev/null
+++ b/0001-Port-to-QDox-2.0.patch
@@ -0,0 +1,462 @@
+From 18d23b870382857b3a5868cfca378c733f650aec Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Wed, 12 Nov 2014 13:21:47 +0100
+Subject: [PATCH] Port to QDox 2.0
+
+---
+ pom.xml | 24 ++++++++++---------
+ .../org/codehaus/plexus/cdc/ComponentGleaner.java | 5 ++--
+ .../cdc/DefaultComponentDescriptorCreator.java | 18 ++++++++-------
+ .../plexus/cdc/PlexusDefaultComponentGleaner.java | 27 ++++++++++------------
+ .../plexus/cdc/gleaner/QDoxComponentGleaner.java | 27 ++++++++++------------
+ .../plexus/cdc/gleaner/SourceComponentGleaner.java | 5 ++--
+ .../cdc/gleaner/QDoxComponentGleanerTest.java | 20 ++++++++--------
+ 7 files changed, 64 insertions(+), 62 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 4cc2966..cbbf9ff 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -22,20 +22,10 @@
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+- <!--
+- NOTE: When QDox 1.7 is fuly cooked should update this and consider using it to provide source-level
+- annotation processing (plexus-cdc-anno). But right now its way to buggy.
+-
+ <dependency>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+- <version>1.7-SNAPSHOT</version>
+- </dependency>
+- -->
+- <dependency>
+- <groupId>com.thoughtworks.qdox</groupId>
+- <artifactId>qdox</artifactId>
+- <version>1.6.3</version>
++ <version>2.0-M2</version>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+@@ -55,4 +45,16 @@
+ <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-tools/tags/plexus-tools-1....</developerConnection>
+ <url>http://fisheye.codehaus.org/browse/plexus/plexus-tools/tags/plexus-tools-...</url>
+ </scm>
++
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <configuration>
++ <source>1.5</source>
++ <target>1.5</target>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
+ </project>
+diff --git a/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java b/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
+index b5e8d06..4dc9970 100644
+--- a/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
+@@ -24,8 +24,9 @@ package org.codehaus.plexus.cdc;
+ * SOFTWARE.
+ */
+
++import com.thoughtworks.qdox.JavaProjectBuilder;
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
++
+ import org.codehaus.plexus.cdc.gleaner.SourceComponentGleaner;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+
+@@ -39,6 +40,6 @@ public interface ComponentGleaner
+ {
+ String ROLE = ComponentGleaner.class.getName();
+
+- ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
++ ComponentDescriptor glean( JavaProjectBuilder classCache, JavaClass javaClass )
+ throws ComponentDescriptorCreatorException;
+ }
+diff --git a/src/main/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorCreator.java b/src/main/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorCreator.java
+index 5336fa8..9a29a1b 100644
+--- a/src/main/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorCreator.java
++++ b/src/main/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorCreator.java
+@@ -24,9 +24,10 @@ package org.codehaus.plexus.cdc;
+ * SOFTWARE.
+ */
+
+-import com.thoughtworks.qdox.JavaDocBuilder;
++import com.thoughtworks.qdox.JavaProjectBuilder;
+ import com.thoughtworks.qdox.model.JavaClass;
+ import com.thoughtworks.qdox.model.JavaSource;
++
+ import org.codehaus.plexus.cdc.merge.MergeException;
+ import org.codehaus.plexus.cdc.merge.Merger;
+ import org.codehaus.plexus.component.repository.ComponentDependency;
+@@ -44,6 +45,7 @@ import java.io.File;
+ import java.io.FileWriter;
+ import java.io.IOException;
+ import java.util.ArrayList;
++import java.util.Collection;
+ import java.util.Collections;
+ import java.util.HashMap;
+ import java.util.Iterator;
+@@ -97,9 +99,9 @@ public class DefaultComponentDescriptorCreator
+ // Check and register all directories to scan
+ // ----------------------------------------------------------------------
+
+- JavaSource[] javaSources;
++ Collection<JavaSource> javaSources;
+
+- JavaDocBuilder builder = new JavaDocBuilder();
++ JavaProjectBuilder builder = new JavaProjectBuilder();
+
+ getLogger().debug( "Source directories: " );
+
+@@ -138,14 +140,14 @@ public class DefaultComponentDescriptorCreator
+
+ Map abstractComponentMap = new HashMap();
+
+- for ( int i = 0; i < javaSources.length; i++ )
++ for ( JavaSource javaSource : javaSources )
+ {
+- if ("package-info.java".equalsIgnoreCase(javaSources[i].getFile().getName())) {
++ if ("package-info.java".equalsIgnoreCase(new File(javaSource.getURL().getFile()).getName())) {
+ // Skip Java5-style package documentation files
+ continue;
+ }
+
+- JavaClass javaClass = getJavaClass( javaSources[i] );
++ JavaClass javaClass = getJavaClass( javaSource );
+ if (javaClass == null)
+ {
+ continue;
+@@ -375,10 +377,10 @@ public class DefaultComponentDescriptorCreator
+
+ private JavaClass getJavaClass( JavaSource javaSource )
+ {
+- if (javaSource.getClasses().length == 0)
++ if (javaSource.getClasses().isEmpty())
+ {
+ return null;
+ }
+- return javaSource.getClasses()[0];
++ return javaSource.getClasses().iterator().next();
+ }
+ }
+diff --git a/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java b/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
+index 80d6941..3aff7ca 100644
+--- a/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
+@@ -33,10 +33,11 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+
++import com.thoughtworks.qdox.JavaProjectBuilder;
+ import com.thoughtworks.qdox.model.DocletTag;
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
+ import com.thoughtworks.qdox.model.JavaField;
++
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirement;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirementList;
+@@ -92,7 +93,7 @@ public class PlexusDefaultComponentGleaner
+ // ComponentGleaner Implementation
+ // ----------------------------------------------------------------------
+
+- public ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
++ public ComponentDescriptor glean( JavaProjectBuilder classCache, JavaClass javaClass )
+ throws ComponentDescriptorCreatorException
+ {
+ DocletTag tag = javaClass.getTagByName( PLEXUS_COMPONENT_TAG );
+@@ -274,7 +275,7 @@ public class PlexusDefaultComponentGleaner
+
+ String fqn = ifc.getFullyQualifiedName();
+
+- String pkg = ifc.getPackage();
++ String pkg = ifc.getPackageName();
+
+ if ( pkg == null )
+ {
+@@ -292,7 +293,7 @@ public class PlexusDefaultComponentGleaner
+ // prepend the gleaned class' package
+ // -----------------------------------------------------------------------
+
+- pkg = javaClass.getPackage();
++ pkg = javaClass.getPackageName();
+
+ fqn = pkg + "." + fqn;
+ }
+@@ -335,10 +336,10 @@ public class PlexusDefaultComponentGleaner
+ return role;
+ }
+
+- private void findRequirements( JavaClassCache classCache, ComponentDescriptor componentDescriptor,
++ private void findRequirements( JavaProjectBuilder classCache, ComponentDescriptor componentDescriptor,
+ JavaClass javaClass )
+ {
+- JavaField[] fields = javaClass.getFields();
++ Collection<JavaField> fields = javaClass.getFields();
+
+ // ----------------------------------------------------------------------
+ // Search the super class for requirements
+@@ -353,10 +354,8 @@ public class PlexusDefaultComponentGleaner
+ // Search the current class for requirements
+ // ----------------------------------------------------------------------
+
+- for ( int i = 0; i < fields.length; i++ )
++ for ( JavaField field : fields )
+ {
+- JavaField field = fields[i];
+-
+ DocletTag tag = field.getTagByName( PLEXUS_REQUIREMENT_TAG );
+
+ if ( tag == null )
+@@ -370,7 +369,7 @@ public class PlexusDefaultComponentGleaner
+ // Role
+ // ----------------------------------------------------------------------
+
+- String requirementClass = field.getType().getJavaClass().getFullyQualifiedName();
++ String requirementClass = field.getType().getFullyQualifiedName();
+
+ boolean isMap = requirementClass.equals( Map.class.getName() ) ||
+ requirementClass.equals( Collection.class.getName() );
+@@ -445,7 +444,7 @@ public class PlexusDefaultComponentGleaner
+
+ JavaClass roleClass = classCache.getClassByName( role );
+
+- if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage() ) )
++ if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackageName() ) )
+ {
+ role = javaClass.getPackage() + "." + roleClass.getName();
+ }
+@@ -466,7 +465,7 @@ public class PlexusDefaultComponentGleaner
+ private void findConfiguration( XmlPlexusConfiguration configuration, JavaClass javaClass )
+ throws ComponentDescriptorCreatorException
+ {
+- JavaField[] fields = javaClass.getFields();
++ Collection<JavaField> fields = javaClass.getFields();
+
+ // ----------------------------------------------------------------------
+ // Search the super class for configurable fields.
+@@ -481,10 +480,8 @@ public class PlexusDefaultComponentGleaner
+ // Search the current class for configurable fields.
+ // ----------------------------------------------------------------------
+
+- for ( int i = 0; i < fields.length; i++ )
++ for ( JavaField field : fields )
+ {
+- JavaField field = fields[i];
+-
+ DocletTag tag = field.getTagByName( PLEXUS_CONFIGURATION_TAG );
+
+ if ( tag == null )
+diff --git a/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java b/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
+index e3e35bb..51fb62d 100644
+--- a/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
+@@ -33,10 +33,11 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+
++import com.thoughtworks.qdox.JavaProjectBuilder;
+ import com.thoughtworks.qdox.model.DocletTag;
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
+ import com.thoughtworks.qdox.model.JavaField;
++
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirement;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirementList;
+@@ -91,7 +92,7 @@ public class QDoxComponentGleaner
+ // ComponentGleaner Implementation
+ // ----------------------------------------------------------------------
+
+- public ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
++ public ComponentDescriptor glean( JavaProjectBuilder classCache, JavaClass javaClass )
+ throws ComponentGleanerException
+ {
+ DocletTag tag = javaClass.getTagByName( PLEXUS_COMPONENT_TAG );
+@@ -271,7 +272,7 @@ public class QDoxComponentGleaner
+
+ String fqn = ifc.getFullyQualifiedName();
+
+- String pkg = ifc.getPackage();
++ String pkg = ifc.getPackageName();
+
+ if ( pkg == null )
+ {
+@@ -289,7 +290,7 @@ public class QDoxComponentGleaner
+ // prepend the gleaned class' package
+ // -----------------------------------------------------------------------
+
+- pkg = javaClass.getPackage();
++ pkg = javaClass.getPackageName();
+
+ fqn = pkg + "." + fqn;
+ }
+@@ -331,10 +332,10 @@ public class QDoxComponentGleaner
+ return role;
+ }
+
+- private void findRequirements( JavaClassCache classCache, ComponentDescriptor componentDescriptor,
++ private void findRequirements( JavaProjectBuilder classCache, ComponentDescriptor componentDescriptor,
+ JavaClass javaClass )
+ {
+- JavaField[] fields = javaClass.getFields();
++ Collection<JavaField> fields = javaClass.getFields();
+
+ // ----------------------------------------------------------------------
+ // Search the super class for requirements
+@@ -349,10 +350,8 @@ public class QDoxComponentGleaner
+ // Search the current class for requirements
+ // ----------------------------------------------------------------------
+
+- for ( int i = 0; i < fields.length; i++ )
++ for ( JavaField field : fields )
+ {
+- JavaField field = fields[i];
+-
+ DocletTag tag = field.getTagByName( PLEXUS_REQUIREMENT_TAG );
+
+ if ( tag == null )
+@@ -366,7 +365,7 @@ public class QDoxComponentGleaner
+ // Role
+ // ----------------------------------------------------------------------
+
+- String requirementClass = field.getType().getJavaClass().getFullyQualifiedName();
++ String requirementClass = field.getType().getFullyQualifiedName();
+
+ boolean isMap = requirementClass.equals( Map.class.getName() ) ||
+ requirementClass.equals( Collection.class.getName() );
+@@ -441,7 +440,7 @@ public class QDoxComponentGleaner
+
+ JavaClass roleClass = classCache.getClassByName( role );
+
+- if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage() ) )
++ if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackageName() ) )
+ {
+ role = javaClass.getPackage() + "." + roleClass.getName();
+ }
+@@ -462,7 +461,7 @@ public class QDoxComponentGleaner
+ private void findConfiguration( XmlPlexusConfiguration configuration, JavaClass javaClass )
+ throws ComponentGleanerException
+ {
+- JavaField[] fields = javaClass.getFields();
++ Collection<JavaField> fields = javaClass.getFields();
+
+ // ----------------------------------------------------------------------
+ // Search the super class for configurable fields.
+@@ -477,10 +476,8 @@ public class QDoxComponentGleaner
+ // Search the current class for configurable fields.
+ // ----------------------------------------------------------------------
+
+- for ( int i = 0; i < fields.length; i++ )
++ for ( JavaField field : fields )
+ {
+- JavaField field = fields[i];
+-
+ DocletTag tag = field.getTagByName( PLEXUS_CONFIGURATION_TAG );
+
+ if ( tag == null )
+diff --git a/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java b/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java
+index e7ee5ba..4583fc3 100644
+--- a/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java
+@@ -16,8 +16,9 @@
+
+ package org.codehaus.plexus.cdc.gleaner;
+
++import com.thoughtworks.qdox.JavaProjectBuilder;
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
++
+ import org.codehaus.plexus.cdc.gleaner.ComponentGleanerException;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+
+@@ -30,5 +31,5 @@ public interface SourceComponentGleaner
+ {
+ String ROLE = SourceComponentGleaner.class.getName();
+
+- ComponentDescriptor glean(JavaClassCache classCache, JavaClass javaClass) throws ComponentGleanerException;
++ ComponentDescriptor glean(JavaProjectBuilder classCache, JavaClass javaClass) throws ComponentGleanerException;
+ }
+\ No newline at end of file
+diff --git a/src/test/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleanerTest.java b/src/test/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleanerTest.java
+index ab6b6e2..df70c51 100644
+--- a/src/test/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleanerTest.java
++++ b/src/test/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleanerTest.java
+@@ -18,11 +18,13 @@ package org.codehaus.plexus.cdc.gleaner;
+
+ import java.io.IOException;
+ import java.net.URL;
++import java.util.Collection;
+ import java.util.List;
+
+-import com.thoughtworks.qdox.JavaDocBuilder;
++import com.thoughtworks.qdox.JavaProjectBuilder;
+ import com.thoughtworks.qdox.model.JavaClass;
+ import com.thoughtworks.qdox.model.JavaSource;
++
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirement;
+@@ -38,14 +40,14 @@ public class QDoxComponentGleanerTest
+ {
+ private QDoxComponentGleaner gleaner;
+
+- private JavaDocBuilder builder;
++ private JavaProjectBuilder builder;
+
+ // @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ gleaner = new QDoxComponentGleaner();
+- builder = new JavaDocBuilder();
++ builder = new JavaProjectBuilder();
+ }
+
+ // @Override
+@@ -66,13 +68,13 @@ public class QDoxComponentGleanerTest
+ JavaSource source = addSource(name);
+ assertNotNull(source);
+
+- JavaClass[] classes = source.getClasses();
++ Collection<JavaClass> classes = source.getClasses();
+ assertNotNull(classes);
+- assertEquals(1, classes.length);
++ assertEquals(1, classes.size());
+
+- assertNotNull(classes[0]);
++ assertNotNull(classes.iterator().next());
+
+- return classes[0];
++ return classes.iterator().next();
+ }
+
+ private ComponentDescriptor glean(final String name, final String[] supporting) throws Exception {
+@@ -116,7 +118,7 @@ public class QDoxComponentGleanerTest
+ ComponentDescriptor component = glean("MyComponent.java");
+ assertNotNull(component);
+
+- assertEquals(MyComponent.class.getName(), component.getRole());
++ assertEquals("org.codehaus.plexus.cdc.gleaner.MyComponent", component.getRole());
+ assertEquals("foo", component.getRoleHint());
+
+ List requirements = component.getRequirements();
+@@ -125,7 +127,7 @@ public class QDoxComponentGleanerTest
+
+ ComponentRequirement requirement = (ComponentRequirement) requirements.get(0);
+ assertNotNull(requirement);
+- assertEquals(ChildComponent.class.getName(), requirement.getRole());
++ assertEquals("org.codehaus.plexus.cdc.gleaner.ChildComponent", requirement.getRole());
+
+ PlexusConfiguration config = component.getConfiguration();
+ assertNotNull(config);
+--
+1.9.3
+
diff --git a/plexus-cdc.spec b/plexus-cdc.spec
index ca2e4a3..d919e9e 100644
--- a/plexus-cdc.spec
+++ b/plexus-cdc.spec
@@ -1,6 +1,6 @@
Name: plexus-cdc
Version: 1.0
-Release: 0.22.a14%{?dist}
+Release: 0.23.a14%{?dist}
Epoch: 0
Summary: Plexus Component Descriptor Creator
# Almost whole gleaner subpackage is ASL 2.0
@@ -13,13 +13,13 @@ BuildArch: noarch
Source0: %{name}-1.0-alpha-14.tar.gz
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0: %{name}-qdox-1.9.patch
+Patch0: 0001-Port-to-QDox-2.0.patch
BuildRequires: maven-local
BuildRequires: jdom
BuildRequires: plexus-utils
BuildRequires: maven-doxia-sitetools
-BuildRequires: qdox
+BuildRequires: qdox >= 2
%description
@@ -57,6 +57,9 @@ cp -p %{SOURCE2} .
%doc LICENSE-2.0.txt
%changelog
+* Wed Nov 12 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-0.23.a14
+- Port to QDox 2.0
+
* Tue Oct 28 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-0.22.a14
- Update to current packaging guidelines
9 years, 7 months
[maven-javadoc-plugin] Remove dependency on qdox
by Mikolaj Izdebski
commit 5edbc82397bedbbb2449a72dacc92ed690b9ec3d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Nov 12 12:50:12 2014 +0100
Remove dependency on qdox
maven-javadoc-plugin.spec | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index 3c39c7f..28c7fa1 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-javadoc-plugin
Version: 2.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven Javadoc Plugin
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-javadoc-plugin
@@ -67,6 +67,11 @@ API documentation for %{name}.
sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.siterenderer|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
+# XXX remove javadoc:fix MOJO for now
+# TODO: port to QDox 2.0
+rm -f src/main/java/org/apache/maven/plugin/javadoc/*FixJavadocMojo.java
+%pom_remove_dep :qdox
+
%build
%mvn_build -f -- -DmavenVersion=3.1.1
@@ -81,6 +86,9 @@ sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.ma
%doc LICENSE NOTICE
%changelog
+* Wed Nov 12 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.10.1-3
+- Remove dependency on qdox
+
* Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.10.1-2
- Remove legacy Obsoletes/Provides for maven2 plugin
9 years, 7 months
[maven-wagon] Update to upstream version 2.8
by Mikolaj Izdebski
commit 1b5f5403abd6e262f82126d8e6d0aabb727a1fb2
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Nov 12 12:31:23 2014 +0100
Update to upstream version 2.8
.gitignore | 1 +
maven-wagon.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8e3164..356395f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ wagon-1.0-source-release.zip
/wagon-2.5-source-release.zip
/wagon-2.6-source-release.zip
/wagon-2.7-source-release.zip
+/wagon-2.8-source-release.zip
diff --git a/maven-wagon.spec b/maven-wagon.spec
index 2a40bc6..9ac0075 100644
--- a/maven-wagon.spec
+++ b/maven-wagon.spec
@@ -2,7 +2,7 @@
%global split_verrel 2.6-4
Name: maven-%{bname}
-Version: 2.7
+Version: 2.8
Release: 1%{?dist}
Epoch: 0
Summary: Tools to manage artifacts and deployment
@@ -209,6 +209,9 @@ Javadoc for %{name}.
%doc LICENSE NOTICE DEPENDENCIES
%changelog
+* Wed Nov 12 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.8-1
+- Update to upstream version 2.8
+
* Wed Sep 17 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.7-1
- Update to upstream version 2.7
diff --git a/sources b/sources
index d4e8bc8..b8247b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ed1917a3cce091f7f93489b800649b0 wagon-2.7-source-release.zip
+749c6e7be74c7f7fa6b3e54d64b8c311 wagon-2.8-source-release.zip
9 years, 7 months
Broken dependencies: scirenderer
by Fedora Koji Build System
scirenderer has broken dependencies in the rawhide tree:
On armhfp:
scirenderer-1.1.0-4.fc22.noarch requires jogl2
Please resolve this as soon as possible.
9 years, 7 months
[lucene] Update to upstream 4.10.2.
by Alexander Kurtakov
Summary of changes:
8346e2f... Update to upstream 4.10.2. (*)
(*) This commit already existed in another branch; no separate mail sent
9 years, 7 months
[lucene/f21] Update to upstream 4.10.2.
by Alexander Kurtakov
commit 8346e2f1d1a0ab3d0b0ec803ea9e86bcca2f64df
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Nov 12 12:08:12 2014 +0200
Update to upstream 4.10.2.
.gitignore | 2 +
lucene-4.10.1-analysis-OSGi-MANIFEST.MF | 63 --------------------
lucene-4.10.1-core-OSGi-MANIFEST.MF | 23 -------
lucene-4.10.2-analysis-OSGi-MANIFEST.MF | 63 ++++++++++++++++++++
lucene-4.10.2-core-OSGi-MANIFEST.MF | 23 +++++++
...F => lucene-4.10.2-queryparser-OSGi-MANIFEST.MF | 38 ++++++------
lucene.spec | 9 ++-
sources | 2 +
8 files changed, 115 insertions(+), 108 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c6eb63..74511ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ dev-tools.tar.xz
/lucene-4.8.1-src.tgz
/dev-tools-4.10.1.tar.xz
/lucene-4.10.1-src.tgz
+/lucene-4.10.2-src.tgz
+/dev-tools-4.10.2.tar.xz
diff --git a/lucene-4.10.2-analysis-OSGi-MANIFEST.MF b/lucene-4.10.2-analysis-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..a706dd0
--- /dev/null
+++ b/lucene-4.10.2-analysis-OSGi-MANIFEST.MF
@@ -0,0 +1,63 @@
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-SymbolicName: org.apache.lucene.analysis
+Require-Bundle: org.apache.lucene.core;bundle-version="4.10.2"
+Export-Package: org.apache.lucene.analysis.ar;version="4.10.2",
+ org.apache.lucene.analysis.core;version="4.10.2",
+ org.apache.lucene.analysis.bg;version="4.10.2",
+ org.apache.lucene.analysis.br;version="4.10.2",
+ org.apache.lucene.analysis.ca;version="4.10.2",
+ org.apache.lucene.analysis.cjk;version="4.10.2",
+ org.apache.lucene.analysis.cn;version="4.10.2",
+ org.apache.lucene.analysis.compound;version="4.10.2",
+ org.apache.lucene.analysis.compound.hyphenation;version="4.10.2",
+ org.apache.lucene.analysis.cz;version="4.10.2",
+ org.apache.lucene.analysis.da;version="4.10.2",
+ org.apache.lucene.analysis.de;version="4.10.2",
+ org.apache.lucene.analysis.el;version="4.10.2",
+ org.apache.lucene.analysis.en;version="4.10.2",
+ org.apache.lucene.analysis.es;version="4.10.2",
+ org.apache.lucene.analysis.eu;version="4.10.2",
+ org.apache.lucene.analysis.fa;version="4.10.2",
+ org.apache.lucene.analysis.fi;version="4.10.2",
+ org.apache.lucene.analysis.fr;version="4.10.2",
+ org.apache.lucene.analysis.gl;version="4.10.2",
+ org.apache.lucene.analysis.hi;version="4.10.2",
+ org.apache.lucene.analysis.hu;version="4.10.2",
+ org.apache.lucene.analysis.hunspell;version="4.10.2",
+ org.apache.lucene.analysis.hy;version="4.10.2",
+ org.apache.lucene.analysis.id;version="4.10.2",
+ org.apache.lucene.analysis.in;version="4.10.2",
+ org.apache.lucene.analysis.it;version="4.10.2",
+ org.apache.lucene.analysis.lv;version="4.10.2",
+ org.apache.lucene.analysis.miscellaneous;version="4.10.2",
+ org.apache.lucene.analysis.ngram;version="4.10.2",
+ org.apache.lucene.analysis.nl;version="4.10.2",
+ org.apache.lucene.analysis.no;version="4.10.2",
+ org.apache.lucene.analysis.path;version="4.10.2",
+ org.apache.lucene.analysis.payloads;version="4.10.2",
+ org.apache.lucene.analysis.position;version="4.10.2",
+ org.apache.lucene.analysis.pt;version="4.10.2",
+ org.apache.lucene.analysis.query;version="4.10.2",
+ org.apache.lucene.analysis.reverse;version="4.10.2",
+ org.apache.lucene.analysis.ro;version="4.10.2",
+ org.apache.lucene.analysis.ru;version="4.10.2",
+ org.apache.lucene.analysis.shingle;version="4.10.2",
+ org.apache.lucene.analysis.sinks;version="4.10.2",
+ org.apache.lucene.analysis.snowball;version="4.10.2",
+ org.apache.lucene.analysis.standard;version="4.10.2",
+ org.apache.lucene.analysis.sv;version="4.10.2",
+ org.apache.lucene.analysis.synonym;version="4.10.2",
+ org.apache.lucene.analysis.th;version="4.10.2",
+ org.apache.lucene.analysis.tr;version="4.10.2",
+ org.apache.lucene.analysis.util;version="4.10.2",
+ org.apache.lucene.analysis.wikipedia;version="4.10.2",
+ org.apache.lucene.collation;version="4.10.2"
+Bundle-Version: 4.10.2
+Bundle-Vendor: fedoraproject.org
+Bundle-Name: Lucene contributed extensions
+Import-Package: org.xml.sax;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
+ org.xml.sax.helpers;resolution:=optional
+Bundle-ManifestVersion: 2
+
diff --git a/lucene-4.10.2-core-OSGi-MANIFEST.MF b/lucene-4.10.2-core-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..b4c9294
--- /dev/null
+++ b/lucene-4.10.2-core-OSGi-MANIFEST.MF
@@ -0,0 +1,23 @@
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-SymbolicName: org.apache.lucene.core
+Import-Package: javax.management
+Export-Package: org.apache.lucene;version="4.10.2",
+ org.apache.lucene.analysis;version="4.10.2",
+ org.apache.lucene.analysis.tokenattributes;version="4.10.2",
+ org.apache.lucene.document;version="4.10.2",
+ org.apache.lucene.index;version="4.10.2",
+ org.apache.lucene.search;version="4.10.2",
+ org.apache.lucene.search.payloads;version="4.10.2",
+ org.apache.lucene.search.spans;version="4.10.2",
+ org.apache.lucene.search.similarities;version="4.10.2",
+ org.apache.lucene.store;version="4.10.2",
+ org.apache.lucene.util;version="4.10.2",
+ org.apache.lucene.util.fst;version="4.10.2",
+ org.apache.lucene.util.packed;version="4.10.2",
+ org.apache.lucene.util.mutable;version="4.10.2",
+ org.apache.lucene.util.automaton;version="4.10.2"
+Bundle-Version: 4.10.2
+Bundle-Vendor: fedoraproject.org
+Bundle-Name: High-performance, full-featured text search engine
+Bundle-ManifestVersion: 2
diff --git a/lucene-4.10.1-queryparser-OSGi-MANIFEST.MF b/lucene-4.10.2-queryparser-OSGi-MANIFEST.MF
similarity index 56%
rename from lucene-4.10.1-queryparser-OSGi-MANIFEST.MF
rename to lucene-4.10.2-queryparser-OSGi-MANIFEST.MF
index 93331df..7384fd0 100644
--- a/lucene-4.10.1-queryparser-OSGi-MANIFEST.MF
+++ b/lucene-4.10.2-queryparser-OSGi-MANIFEST.MF
@@ -1,25 +1,25 @@
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-SymbolicName: org.apache.lucene.queryparser
-Require-Bundle: org.apache.lucene.core;bundle-version="4.10.1"
-Export-Package: org.apache.lucene.queryparser.analyzing;version="4.10.1",
- org.apache.lucene.queryparser.classic;version="4.10.1",
- org.apache.lucene.queryparser.complexPhrase;version="4.10.1",
- org.apache.lucene.queryparser.ext;version="4.10.1",
- org.apache.lucene.queryparser.flexible.core;version="4.10.1",
- org.apache.lucene.queryparser.flexible.core.builders;version="4.10.1",
- org.apache.lucene.queryparser.flexible.core.config;version="4.10.1",
- org.apache.lucene.queryparser.flexible.core.messages;version="4.10.1",
- org.apache.lucene.queryparser.flexible.core.nodes;version="4.10.1",
- org.apache.lucene.queryparser.flexible.core.parser;version="4.10.1",
- org.apache.lucene.queryparser.flexible.core.processors;version="4.10.1",
- org.apache.lucene.queryparser.flexible.core.util;version="4.10.1",
- org.apache.lucene.queryparser.simple;version="4.10.1",
- org.apache.lucene.queryparser.surround.parser;version="4.10.1",
- org.apache.lucene.queryparser.surround.query;version="4.10.1",
- org.apache.lucene.queryparser.xml;version="4.10.1",
- org.apache.lucene.queryparser.xml.builders;version="4.10.1"
-Bundle-Version: 4.10.1
+Require-Bundle: org.apache.lucene.core;bundle-version="4.10.2"
+Export-Package: org.apache.lucene.queryparser.analyzing;version="4.10.2",
+ org.apache.lucene.queryparser.classic;version="4.10.2",
+ org.apache.lucene.queryparser.complexPhrase;version="4.10.2",
+ org.apache.lucene.queryparser.ext;version="4.10.2",
+ org.apache.lucene.queryparser.flexible.core;version="4.10.2",
+ org.apache.lucene.queryparser.flexible.core.builders;version="4.10.2",
+ org.apache.lucene.queryparser.flexible.core.config;version="4.10.2",
+ org.apache.lucene.queryparser.flexible.core.messages;version="4.10.2",
+ org.apache.lucene.queryparser.flexible.core.nodes;version="4.10.2",
+ org.apache.lucene.queryparser.flexible.core.parser;version="4.10.2",
+ org.apache.lucene.queryparser.flexible.core.processors;version="4.10.2",
+ org.apache.lucene.queryparser.flexible.core.util;version="4.10.2",
+ org.apache.lucene.queryparser.simple;version="4.10.2",
+ org.apache.lucene.queryparser.surround.parser;version="4.10.2",
+ org.apache.lucene.queryparser.surround.query;version="4.10.2",
+ org.apache.lucene.queryparser.xml;version="4.10.2",
+ org.apache.lucene.queryparser.xml.builders;version="4.10.2"
+Bundle-Version: 4.10.2
Bundle-Vendor: fedoraproject.org
Bundle-Name: Lucene Query parsers and parsing framework
Import-Package: org.xml.sax;resolution:=optional,
diff --git a/lucene.spec b/lucene.spec
index f9786d8..e2c1194 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -33,7 +33,7 @@
Summary: High-performance, full-featured text search engine
Name: %{?scl_prefix}lucene
-Version: 4.10.1
+Version: 4.10.2
Release: 1%{?dist}
Epoch: 0
License: ASL 2.0
@@ -42,8 +42,8 @@ Source0: http://www.apache.org/dist/lucene/java/%{version}/lucene-%{versi
Source1: lucene-%{version}-core-OSGi-MANIFEST.MF
Source2: lucene-%{version}-analysis-OSGi-MANIFEST.MF
Source3: lucene-%{version}-queryparser-OSGi-MANIFEST.MF
-#svn export http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_10_1/dev-to...
-#tar caf dev-tools-4.10.1.tar.xz dev-tools/
+#svn export http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_10_2/dev-to...
+#tar caf dev-tools-4.10.2.tar.xz dev-tools/
Source4: dev-tools-%{version}.tar.xz
Patch0: 0001-disable-ivy-settings.patch
@@ -412,6 +412,9 @@ popd
%doc LICENSE.txt
%changelog
+* Wed Nov 12 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0:4.10.2-1
+- Update to upstream 4.10.2.
+
* Fri Oct 24 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0:4.10.1-1
- Update to upstream 4.10.1.
diff --git a/sources b/sources
index 3d9618e..1fe01f7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,4 @@
fa6a846b8e5e62a1bac13371d868faf7 dev-tools-4.10.1.tar.xz
df3d0350560766276d3af51262c1584b lucene-4.10.1-src.tgz
+15cf08603bfdec52fbb161753ac0b126 lucene-4.10.2-src.tgz
+e03773a1020508d2490865df5dd8fc40 dev-tools-4.10.2.tar.xz
9 years, 7 months