rpms/plexus-cdc/devel plexus-cdc-qdox-1.9.patch, 1.2, 1.3 plexus-cdc.spec, 1.15, 1.16 sources, 1.2, 1.3
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu Jun 24 11:31:26 UTC 2010
Author: sochotni
Update of /cvs/pkgs/rpms/plexus-cdc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24937
Modified Files:
plexus-cdc-qdox-1.9.patch plexus-cdc.spec sources
Log Message:
Update to latest version, update qdox patch
plexus-cdc-qdox-1.9.patch:
ComponentGleaner.java | 4 ++--
PlexusDefaultComponentGleaner.java | 16 ++++++++++------
gleaner/QDoxComponentGleaner.java | 8 ++++----
3 files changed, 16 insertions(+), 12 deletions(-)
Index: plexus-cdc-qdox-1.9.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/plexus-cdc-qdox-1.9.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- plexus-cdc-qdox-1.9.patch 26 Nov 2009 19:40:12 -0000 1.2
+++ plexus-cdc-qdox-1.9.patch 24 Jun 2010 11:31:26 -0000 1.3
@@ -1,16 +1,38 @@
+diff --git a/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java b/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
+index b5e8d06..f33c724 100644
+--- a/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
+@@ -25,7 +25,7 @@ package org.codehaus.plexus.cdc;
+ */
+
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
++import com.thoughtworks.qdox.JavaDocBuilder;
+ import org.codehaus.plexus.cdc.gleaner.SourceComponentGleaner;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+
+@@ -39,6 +39,6 @@ public interface ComponentGleaner
+ {
+ String ROLE = ComponentGleaner.class.getName();
+
+- ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
++ ComponentDescriptor glean( JavaDocBuilder classCache, JavaClass javaClass )
+ throws ComponentDescriptorCreatorException;
+ }
+diff --git a/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java b/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
+index 80d6941..0ddc3f4 100644
--- a/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
+++ b/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
-@@ -26,8 +26,8 @@
+@@ -35,7 +35,7 @@ import java.util.Map;
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 com.thoughtworks.qdox.JavaDocBuilder;
+ 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.configuration.xml.XmlPlexusConfiguration;
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ public class PlexusDefaultComponentGleaner
// ComponentGleaner Implementation
// ----------------------------------------------------------------------
@@ -19,7 +41,7 @@
throws ComponentDescriptorCreatorException
{
DocletTag tag = javaClass.getTagByName( PLEXUS_COMPONENT_TAG );
-@@ -268,7 +268,11 @@
+@@ -274,7 +274,11 @@ public class PlexusDefaultComponentGleaner
String fqn = ifc.getFullyQualifiedName();
@@ -32,7 +54,7 @@
if ( pkg == null )
{
-@@ -292,7 +292,7 @@
+@@ -292,7 +296,7 @@ public class PlexusDefaultComponentGleaner
// prepend the gleaned class' package
// -----------------------------------------------------------------------
@@ -41,7 +63,7 @@
fqn = pkg + "." + fqn;
}
-@@ -335,7 +335,7 @@
+@@ -335,7 +339,7 @@ public class PlexusDefaultComponentGleaner
return role;
}
@@ -50,7 +72,7 @@
JavaClass javaClass )
{
JavaField[] fields = javaClass.getFields();
-@@ -445,7 +445,7 @@
+@@ -445,7 +449,7 @@ public class PlexusDefaultComponentGleaner
JavaClass roleClass = classCache.getClassByName( role );
@@ -59,24 +81,41 @@
{
role = javaClass.getPackage() + "." + roleClass.getName();
}
-
---- a/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
-+++ b/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
-@@ -25,7 +25,7 @@
- */
+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..f09479d 100644
+--- a/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
+@@ -271,7 +271,7 @@ public class QDoxComponentGleaner
- import com.thoughtworks.qdox.model.JavaClass;
--import com.thoughtworks.qdox.model.JavaClassCache;
-+import com.thoughtworks.qdox.JavaDocBuilder;
- import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+ String fqn = ifc.getFullyQualifiedName();
- /**
-@@ -39,6 +39,6 @@
- {
- String ROLE = ComponentGleaner.class.getName();
+- String pkg = ifc.getPackage();
++ String pkg = ifc.getPackage().getName();
-- ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
-+ ComponentDescriptor glean( JavaDocBuilder classCache, JavaClass javaClass )
- throws ComponentDescriptorCreatorException;
- }
-
+ if ( pkg == null )
+ {
+@@ -289,7 +289,7 @@ public class QDoxComponentGleaner
+ // prepend the gleaned class' package
+ // -----------------------------------------------------------------------
+
+- pkg = javaClass.getPackage();
++ pkg = javaClass.getPackage().getName();
+
+ fqn = pkg + "." + fqn;
+ }
+@@ -441,7 +441,7 @@ public class QDoxComponentGleaner
+
+ JavaClass roleClass = classCache.getClassByName( role );
+
+- if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage() ) )
++ if ( role.indexOf( '.' ) == -1 && StringUtils.isEmpty( roleClass.getPackage().getName() ) )
+ {
+ role = javaClass.getPackage() + "." + roleClass.getName();
+ }
+@@ -543,4 +543,4 @@ public class QDoxComponentGleaner
+
+ return value;
+ }
+-}
+\ No newline at end of file
++}
Index: plexus-cdc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/plexus-cdc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- plexus-cdc.spec 26 Nov 2009 19:40:12 -0000 1.15
+++ plexus-cdc.spec 24 Jun 2010 11:31:26 -0000 1.16
@@ -28,25 +28,23 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define parent plexus
+%global parent plexus
-%define subname cdc
+%global subname cdc
-%define maven_settings_file %{_builddir}/%{name}/settings.xml
+%global maven_settings_file %{_builddir}/%{name}/settings.xml
Name: %{parent}-%{subname}
Version: 1.0
-Release: 0.6.a10.1.3%{?dist}
+Release: 0.7.a14%{?dist}
Epoch: 0
Summary: Plexus Component Descriptor Creator
License: MIT
Group: Development/Java
URL: http://plexus.codehaus.org/
-# svn export \
-# http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-cdc-1.0-alpha-10/ \
-# plexus-cdc/
-# tar czf plexus-cdc-1.0-alpha-10.tar.gz plexus-cdc/
-Source0: %{name}-1.0-alpha-10.tar.gz
+# svn export -r 7728 http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-tools-1.0.11/plexus-cdc plexus-cdc
+# tar czf plexus-cdc-1.0-alpha-14.tar.gz plexus-cdc/
+Source0: %{name}-1.0-alpha-14.tar.gz
Source1: %{name}-jpp-depmap.xml
Patch0: %{name}-qdox-1.9.patch
@@ -55,13 +53,13 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: maven2 >= 2.0.4-9
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire
+BuildRequires: maven2
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven2-common-poms >= 1.0
BuildRequires: jdom
BuildRequires: plexus-container-default
@@ -95,8 +93,8 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
+#mkdir external_repo
+#ln -s %{_javadir} external_repo/JPP
%patch0 -p1
@@ -107,7 +105,7 @@ mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp \
-e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=true \
install javadoc:javadoc
@@ -118,14 +116,13 @@ rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-4 JPP/%{parent} %{subname}
+%add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-14 JPP/%{parent} %{subname}
(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -147,8 +144,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_javadir}/plexus
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
%config(noreplace) /etc/maven/fragments/plexus-cdc
%files javadoc
@@ -156,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
+* Thu Jun 24 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.7.a14
+- Update to latest version, update qdox patch
+- Cleanup specfile a bit, fix release tag
+
* Thu Nov 26 2009 Lubomir Rintel <lkundrak at v3.sk> 0:1.0-0.6.a10.1.3
- Fix NULL dereference in the qdox patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 20 Aug 2009 19:39:17 -0000 1.2
+++ sources 24 Jun 2010 11:31:26 -0000 1.3
@@ -1 +1,2 @@
715e99df384a0037b2cd5bb107c7be21 plexus-cdc-1.0-alpha-10.tar.gz
+2bbf968e9fac3e26c61def0b60d40280 plexus-cdc-1.0-alpha-14.tar.gz
More information about the scm-commits
mailing list