[java-sig-commits] [maven-shared] Drop versioned jars.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Dec 17 15:57:40 UTC 2010
commit bcc8fda1fd05188d84c74935b309fbec0b1d6258
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Dec 17 17:56:10 2010 +0200
Drop versioned jars.
Drop tomcat5 deps.
maven-shared-jpp-depmap.xml | 136 +------------------------------------------
maven-shared.spec | 123 +++++++++++----------------------------
2 files changed, 35 insertions(+), 224 deletions(-)
---
diff --git a/maven-shared-jpp-depmap.xml b/maven-shared-jpp-depmap.xml
index 7e0a7f5..a94a89b 100644
--- a/maven-shared-jpp-depmap.xml
+++ b/maven-shared-jpp-depmap.xml
@@ -5,122 +5,14 @@
<artifactId>junit-addons</artifactId>
<version>1.4</version>
</maven>
- <jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>empty-dep</artifactId>
- <version>1.4</version>
- </jpp>
</dependency>
<dependency>
<maven>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>5.1.10</version>
- </maven>
- <jpp>
- <groupId>JPP/jetty5</groupId>
- <artifactId>jetty5</artifactId>
- <version>5.1.12</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.0</version>
- </maven>
- <jpp>
- <groupId>JPP/objectweb-asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.1</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>asm</groupId>
- <artifactId>asm-parent</artifactId>
- <version>3.0</version>
- </maven>
- <jpp>
- <groupId>JPP/objectweb-asm</groupId>
- <artifactId>asm-parent</artifactId>
- <version>3.1</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>reporting-impl</artifactId>
- <version>2.0.4</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-shared</groupId>
- <artifactId>reporting-impl</artifactId>
- <version>2.0.4</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-test-tools</artifactId>
- <version>1.0-alpha-2</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-plugin-testing</groupId>
- <artifactId>maven-test-tools</artifactId>
- <version>1.2</version>
- </jpp>
- </dependency>
- <!--
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-tools</artifactId>
- <version>1.0-alpha-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-plugin-testing</groupId>
- <artifactId>maven-plugin-testing-tools</artifactId>
- <version>1.2</version>
- </jpp>
- </dependency>
--->
-
- <dependency>
- <maven>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>tomcat5-servlet-2.4-api</artifactId>
- <version>2.4</version>
- </jpp>
- </dependency>
-
- <!-- Plexus component API has been folded into containers now, and is no longer needed -->
- <!--
- <dependency>
- <maven>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- <version>1.0-alpha-20</version>
- </maven>
- </dependency>
- -->
-
- <dependency>
- <maven>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>1.1.0</version>
</maven>
</dependency>
-
<dependency>
<maven>
<groupId>org.apache.maven</groupId>
@@ -133,32 +25,7 @@
<version>2.0.8</version>
</jpp>
</dependency>
-
- <dependency>
- <maven>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.2</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>easymock2</artifactId>
- <version>2.5.2</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.4</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.4</version>
- </jpp>
- </dependency>
- <dependency>
+ <dependency>
<maven>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
@@ -182,5 +49,4 @@
<version>1.8.1</version>
</jpp>
</dependency>
-
</dependencies>
diff --git a/maven-shared.spec b/maven-shared.spec
index 1575777..2f3e49f 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -67,13 +67,13 @@ Summary: Maven Shared Components
URL: http://maven.apache.org/shared/
Name: maven-shared
Version: 15
-Release: 12%{?dist}
+Release: 13%{?dist}
License: ASL 2.0
Group: Development/Libraries
# svn export \
-# http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-14/
-# tar czf maven-shared-components-14.tar.gz maven-shared-components-14
+# http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-15/
+# tar czf maven-shared-components-14.tar.gz maven-shared-components-15
Source0: maven-shared-components-%{version}.tar.gz
Source1: %{name}-jpp-depmap.xml
@@ -90,14 +90,14 @@ BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires: maven2 >= 0:2.0.4-9
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-source
-BuildRequires: maven2-plugin-surefire
-BuildRequires: maven2-plugin-surefire-report
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-report-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-doxia
@@ -114,9 +114,7 @@ BuildRequires: saxon
BuildRequires: saxon-scripts
BuildRequires: plexus-utils
BuildRequires: plexus-digest
-BuildRequires: modello-maven-plugin
-BuildRequires: tomcat5-servlet-2.4-api
-BuildRequires: tomcat5
+BuildRequires: modello
BuildRequires: easymock2
BuildRequires: objectweb-asm
BuildRequires: dom4j
@@ -430,154 +428,97 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-compone
install -pm 644 maven-downloader/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-downloader.pom
%add_to_maven_depmap org.apache.maven.shared maven-downloader %{downloader_version} JPP/maven-shared downloader
install -p -m 0644 maven-downloader/target/maven-downloader-%{downloader_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/downloader-%{downloader_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf downloader-%{downloader_version}.jar downloader.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/downloader.jar
install -pm 644 maven-dependency-analyzer/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-dependency-analyzer.pom
%add_to_maven_depmap org.apache.maven.shared maven-dependency-analyzer %{dependency_analyzer_version} JPP/maven-shared dependency-analyzer
install -p -m 0644 maven-dependency-analyzer/target/maven-dependency-analyzer-%{dependency_analyzer_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-analyzer-%{dependency_analyzer_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf dependency-analyzer-%{dependency_analyzer_version}.jar dependency-analyzer.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-analyzer.jar
install -pm 644 maven-dependency-tree/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom
%add_to_maven_depmap org.apache.maven.shared maven-dependency-tree %{dependency_tree_version} JPP/maven-shared dependency-tree
install -p -m 0644 maven-dependency-tree/target/maven-dependency-tree-%{dependency_tree_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-tree-%{dependency_tree_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf dependency-tree-%{dependency_tree_version}.jar dependency-tree.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-tree.jar
install -pm 644 maven-verifier/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-verifier.pom
%add_to_maven_depmap org.apache.maven.shared maven-verifier %{verifier_version} JPP/maven-shared verifier
install -p -m 0644 maven-verifier/target/maven-verifier-%{verifier_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/verifier-%{verifier_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf verifier-%{verifier_version}.jar verifier.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/verifier.jar
install -pm 644 maven-shared-monitor/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-monitor.pom
%add_to_maven_depmap org.apache.maven.shared maven-shared-monitor %{monitor_version} JPP/maven-shared monitor
install -p -m 0644 maven-shared-monitor/target/maven-shared-monitor-%{monitor_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/monitor-%{monitor_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf monitor-%{monitor_version}.jar monitor.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/monitor.jar
install -pm 644 maven-shared-io/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-io.pom
%add_to_maven_depmap org.apache.maven.shared maven-shared-io %{io_version} JPP/maven-shared io
install -p -m 0644 maven-shared-io/target/maven-shared-io-%{io_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/io-%{io_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf io-%{io_version}.jar io.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/io.jar
install -pm 644 maven-shared-jar/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-jar.pom
%add_to_maven_depmap org.apache.maven.shared maven-shared-jar %{jar_version} JPP/maven-shared jar
install -p -m 0644 maven-shared-jar/target/maven-shared-jar-%{jar_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/jar-%{jar_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf jar-%{jar_version}.jar jar.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/jar.jar
install -pm 644 maven-repository-builder/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-repository-builder.pom
%add_to_maven_depmap org.apache.maven.shared maven-repository-builder %{repository_builder_version} JPP/maven-shared repository-builder
install -p -m 0644 maven-repository-builder/target/maven-repository-builder-%{repository_builder_version}-alpha-3-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/repository-builder-%{repository_builder_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf repository-builder-%{repository_builder_version}.jar repository-builder.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/repository-builder.jar
install -pm 644 maven-reporting-impl/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-reporting-impl.pom
%add_to_maven_depmap org.apache.maven.reporting maven-reporting-impl %{reporting_impl_version} JPP/maven-shared reporting-impl
install -p -m 0644 maven-reporting-impl/target/maven-reporting-impl-%{reporting_impl_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-impl-%{reporting_impl_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf reporting-impl-%{reporting_impl_version}.jar reporting-impl.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-impl.jar
install -pm 644 maven-model-converter/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-model-converter.pom
%add_to_maven_depmap org.apache.maven.shared maven-model-converter %{model_converter_version} JPP/maven-shared model-converter
install -p -m 0644 maven-model-converter/target/maven-model-converter-%{model_converter_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/model-converter-%{model_converter_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf model-converter-%{model_converter_version}.jar model-converter.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/model-converter.jar
install -pm 644 maven-invoker/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-invoker.pom
%add_to_maven_depmap org.apache.maven.shared maven-invoker %{invoker_version} JPP/maven-shared invoker
install -p -m 0644 maven-invoker/target/maven-invoker-%{invoker_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker-%{invoker_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf invoker-%{invoker_version}.jar invoker.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker.jar
install -pm 644 maven-common-artifact-filters/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom
%add_to_maven_depmap org.apache.maven.shared maven-common-artifact-filters %{common_artifact_filters_version} JPP/maven-shared common-artifact-filters
install -p -m 0644 maven-common-artifact-filters/target/maven-common-artifact-filters-%{common_artifact_filters_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/common-artifact-filters-%{common_artifact_filters_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf common-artifact-filters-%{common_artifact_filters_version}.jar common-artifact-filters.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/common-artifact-filters.jar
install -pm 644 maven-ant/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-ant.pom
%add_to_maven_depmap org.apache.maven.shared maven-ant %{ant_version} JPP/maven-shared ant
install -p -m 0644 maven-ant/target/maven-ant-%{ant_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/ant-%{ant_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf ant-%{ant_version}.jar ant.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/ant.jar
install -pm 644 maven-osgi/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-osgi.pom
%add_to_maven_depmap org.apache.maven.shared maven-osgi %{osgi_version} JPP/maven-shared osgi
install -p -m 0644 maven-osgi/target/maven-osgi-%{osgi_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/osgi-%{osgi_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf osgi-%{osgi_version}.jar osgi.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/osgi.jar
install -pm 644 file-management/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-file-management.pom
%add_to_maven_depmap org.apache.maven.shared file-management %{file_management_version} JPP/maven-shared file-management
install -p -m 0644 file-management/target/file-management-%{file_management_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/file-management-%{file_management_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf file-management-%{file_management_version}.jar file-management.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/file-management.jar
install -pm 644 maven-artifact-resolver/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-artifact-resolver.pom
%add_to_maven_depmap org.apache.maven.shared maven-artifact-resolver %{artifact_resolver_version} JPP/maven-shared artifact-resolver
install -p -m 0644 maven-artifact-resolver/target/maven-artifact-resolver-%{artifact_resolver_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/artifact-resolver-%{artifact_resolver_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf artifact-resolver-%{artifact_resolver_version}.jar artifact-resolver.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/artifact-resolver.jar
install -pm 644 maven-filtering/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-filtering.pom
%add_to_maven_depmap org.apache.maven.shared maven-filtering %{filtering_version} JPP/maven-shared filtering
install -p -m 0644 maven-filtering/target/maven-filtering-%{filtering_version}-beta-4-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/filtering-%{filtering_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf filtering-%{filtering_version}.jar filtering.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/filtering.jar
install -pm 644 maven-reporting-api/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-reporting-api.pom
%add_to_maven_depmap org.apache.maven.shared maven-reporting-api %{reporting_api_version} JPP/maven-shared reporting-api
install -p -m 0644 maven-reporting-api/target/maven-reporting-api-%{reporting_api_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-api-%{reporting_api_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf reporting-api-%{reporting_api_version}.jar reporting-api.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-api.jar
install -pm 644 maven-runtime/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-runtime.pom
%add_to_maven_depmap org.apache.maven.shared maven-runtime %{runtime_version} JPP/maven-shared runtime
install -p -m 0644 maven-runtime/target/maven-runtime-%{runtime_version}-alpha-3-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/runtime-%{runtime_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf runtime-%{runtime_version}.jar runtime.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/runtime.jar
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}
@@ -704,6 +645,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
+* Fri Dec 17 2010 Alexander Kurtakov <akurtako at redhat.com> 15-13
+- Drop versioned jars.
+- Drop tomcat5 deps.
+
* Thu Sep 16 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 15-12
- Use %%global instead of %%define
- Use %%{_mavenpomdir}
More information about the java-sig-commits
mailing list