[java-sig-commits] [maven-jxr] Update to upstream 2.2.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Dec 17 12:37:22 UTC 2010
commit 8b0c162cdf50f10acaa7f931a6847355bce9774f
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Dec 17 14:35:03 2010 +0200
Update to upstream 2.2.
Adapt to current guidelines.
.gitignore | 1 +
maven-jxr-2.1-build.xml | 23 ---
maven-jxr-2.1-mavenbuild.xml | 330 ------------------------------------------
maven-jxr-jpp-depmap.xml | 56 +-------
maven-jxr.spec | 102 ++++----------
sources | 2 +-
6 files changed, 31 insertions(+), 483 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65b39e1..4f467e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-jxr-2.1.tar.bz2
+jxr-2.2-source-release.zip
diff --git a/maven-jxr-jpp-depmap.xml b/maven-jxr-jpp-depmap.xml
index 37ccd75..518251d 100644
--- a/maven-jxr-jpp-depmap.xml
+++ b/maven-jxr-jpp-depmap.xml
@@ -1,60 +1,6 @@
<dependencies>
<dependency>
<maven>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- <scope>runtime</scope>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.7</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.7</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0.3</version>
- </maven>
- <jpp>
- <groupId>JPP/plexus</groupId>
- <artifactId>utils</artifactId>
- <version>1.0.3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
@@ -62,7 +8,7 @@
<jpp>
<groupId>JPP</groupId>
<artifactId>velocity</artifactId>
- <version>1.4</version>
+ <version>1.6.4</version>
</jpp>
</dependency>
</dependencies>
diff --git a/maven-jxr.spec b/maven-jxr.spec
index 900e0d2..3656094 100644
--- a/maven-jxr.spec
+++ b/maven-jxr.spec
@@ -28,61 +28,44 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define with_maven 1
-
Name: maven-jxr
-Version: 2.1
-Release: 7%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Epoch: 0
Summary: Source cross referencing tool
License: ASL 2.0
Group: Development/Tools
URL: http://maven.apache.org/doxia/
-# svn export http://svn.apache.org/repos/asf/maven/jxr/tags/jxr-2.1
-# maven-jxr-%{version}
-# tar cjf maven-jxr-%{version}.tar.gz maven-jxr-%{version}
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://repo2.maven.org/maven2/org/apache/maven/jxr/jxr/2.2/jxr-2.2-source-release.zip
Source1: %{name}-jpp-depmap.xml
-# Generated with mvn ant:ant and edited to match our JAR
-# names/locations
-Source2: %{name}-%{version}-build.xml
-Source3: %{name}-%{version}-mavenbuild.xml
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
-%if %{with_maven}
BuildRequires: maven2 >= 2.0.4
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-surefire
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-site
-BuildRequires: maven2-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-plugin-plugin
BuildRequires: maven-doxia-sitetools
-BuildRequires: tomcat5
-BuildRequires: tomcat5-servlet-2.4-api
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-shared-plugin-testing-harness
-%else
-BuildRequires: ant, ant-nodeps
-%endif
+BuildRequires: maven-plugin-testing-harness
BuildRequires: junit >= 3.8.2
-BuildRequires: jakarta-commons-collections >= 3.1
-BuildRequires: oro >= 2.0.8
+BuildRequires: apache-commons-collections >= 3.1
+BuildRequires: jakarta-oro >= 2.0.8
BuildRequires: plexus-utils >= 1.2
BuildRequires: velocity >= 1.4
Requires: junit >= 3.8.2
-Requires: jakarta-commons-collections >= 3.1
-Requires: oro >= 2.0.8
+Requires: apache-commons-collections >= 3.1
+Requires: jakarta-oro >= 2.0.8
Requires: plexus-utils >= 1.2
Requires: velocity >= 1.4
@@ -92,10 +75,10 @@ Requires(postun): jpackage-utils >= 0:1.7.2
%description
Maven JXR is a source cross referencing tool.
-%if %{with_maven}
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -106,14 +89,9 @@ Group: Development/Tools
%description -n maven-plugin-jxr
Maven plugin for JXR.
-%endif
%prep
-%setup -q
-%if ! %{with_maven}
-cp -p %{SOURCE2} maven-jxr/build.xml
-cp -p %{SOURCE3} maven-jxr/maven-build.xml
-%endif
+%setup -q -n jxr-%{version}
%build
@@ -125,28 +103,12 @@ mkdir -p $MAVEN_REPO_LOCAL
# We can investigate when we upgrade to 2.2.x to see if they still occur.
# Update: Seems that tests fail because they are trying to access
# plexus component descriptors which seem to be different?
-%if %{with_maven}
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2-jpp.depmap.file=%{SOURCE1} \
+ -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
install javadoc:aggregate
-%else
-
-# Only build maven-jxr and not the plugin so we can bootstrap maven
-# itself using maven-jxr
-cd maven-jxr
-mkdir lib
-build-jar-repository -s -p lib/ \
- commons-collections \
- junit \
- oro \
- plexus/utils \
- velocity
-
-ant -Dmaven.mode.offline=true
-%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -155,18 +117,17 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
install -pm 644 maven-jxr/target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.jxr jxr %{version} JPP %{name}-parent
%add_to_maven_depmap org.apache.maven maven-jxr %{version} JPP %{name}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
install -pm 644 maven-jxr/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
-%if %{with_maven}
# maven-jxr plugin
%add_to_maven_depmap org.apache.maven.plugins maven-jxr-plugin %{version} JPP maven-plugin-jxr
install -pm 644 maven-jxr-plugin/target/maven-jxr-plugin-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr.jar
install -pm 644 maven-jxr-plugin/pom.xml \
$RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-plugin-jxr.pom
@@ -178,13 +139,6 @@ cp -pr target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%endif
-
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
@@ -192,13 +146,11 @@ rm -rf $RPM_BUILD_ROOT
%postun
%update_maven_depmap
-%if %{with_maven}
%post -n maven-plugin-jxr
%update_maven_depmap
%postun -n maven-plugin-jxr
%update_maven_depmap
-%endif
%files
%defattr(-,root,root,-)
@@ -206,7 +158,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/maven2
%{_mavendepmapfragdir}/%{name}
-%if %{with_maven}
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*
@@ -214,9 +165,12 @@ rm -rf $RPM_BUILD_ROOT
%files -n maven-plugin-jxr
%defattr(-,root,root,-)
%{_javadir}/maven-plugin-jxr*.jar
-%endif
%changelog
+* Fri Dec 17 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.2-1
+- Update to upstream 2.2.
+- Adapt to current guidelines.
+
* Tue Sep 7 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:2.1-7
- Fix build bug (javadoc:aggregate)
@@ -229,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Sep 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-4
- Add BR for maven2-plugin.site.
- BR tomcat5-servlet-api.
-- BR tomcat5.
+- BR tomcat5.eclipse-subclipse - update to 1.6.16 in both rawhide and F-14
- BR maven-surefire-provider-junit.
- BR maven-plugin-plugin.
- BR maven-shared-plugin-testing-harness.
diff --git a/sources b/sources
index b81a241..427e44f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56f77df1a455724857f6b85e1d4283cb maven-jxr-2.1.tar.bz2
+991f20e0ce9e8d16df9bfaf14fd4f75e jxr-2.2-source-release.zip
More information about the java-sig-commits
mailing list