[plexus-resources] - Update to alpha 7. - Apply patch to fix rhbz#621714. - Use global instead of define. - Drop ant bu
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Aug 25 18:27:34 UTC 2010
commit b634807962cd709f2313d139ad8fe54d301ca6f9
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Aug 25 21:26:41 2010 +0300
- Update to alpha 7.
- Apply patch to fix rhbz#621714.
- Use global instead of define.
- Drop ant build - broken after update.
.gitignore | 1 +
...fault-role-hint-to-DefaultResourceManager.patch | 25 ++++
plexus-resources-1.0-build.xml | 122 --------------------
plexus-resources-1.0-components.xml | 39 ------
plexus-resources-1.0-jpp-depmap.xml | 49 --------
plexus-resources.spec | 71 ++++--------
sources | 2 +-
7 files changed, 52 insertions(+), 257 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b2ae519..7c9c6df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
plexus-resources-1.0-alpha-4-src.tar.gz
+plexus-resources-1.0-alpha-7-src.tar.xz
diff --git a/0001-Add-default-role-hint-to-DefaultResourceManager.patch b/0001-Add-default-role-hint-to-DefaultResourceManager.patch
new file mode 100644
index 0000000..ec7708c
--- /dev/null
+++ b/0001-Add-default-role-hint-to-DefaultResourceManager.patch
@@ -0,0 +1,25 @@
+From af71610068c086c03272c63716745fae519af96a Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Fri, 6 Aug 2010 15:25:23 +0200
+Subject: [PATCH] Add default role-hint to DefaultResourceManager
+
+---
+ .../plexus/resource/DefaultResourceManager.java | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java b/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
+index 8d840f9..5a464f3 100644
+--- a/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
++++ b/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
+@@ -44,7 +44,7 @@ import java.util.Map;
+ * @author <a href="mailto:trygvis at inamo.no">Trygve Laugstøl</a>
+ * @author Jason van Zyl
+ * @version $Id: DefaultResourceManager.java 8647 2010-02-15 00:08:07Z olamy $
+- * @plexus.component instantiation-strategy="per-lookup"
++ * @plexus.component instantiation-strategy="per-lookup" role-hint="default"
+ */
+ public class DefaultResourceManager
+ extends AbstractLogEnabled
+--
+1.7.2.1
+
diff --git a/plexus-resources-1.0-jpp-depmap.xml b/plexus-resources-1.0-jpp-depmap.xml
index 2f73d92..7a8e1ca 100644
--- a/plexus-resources-1.0-jpp-depmap.xml
+++ b/plexus-resources-1.0-jpp-depmap.xml
@@ -2,18 +2,6 @@
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0.4</version>
- </maven>
- <jpp>
- <groupId>JPP/plexus</groupId>
- <artifactId>utils</artifactId>
- <version>1.2</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-8</version>
</maven>
@@ -23,41 +11,4 @@
<version>1.0-alpha-8</version>
</jpp>
</dependency>
- <dependency>
- <maven>
- <groupId>com.thoughtworks.qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.6.3</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>qdox</artifactId>
- <version>1.6.3</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-site-renderer</artifactId>
- <version>1.0-alpha-7</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-doxia</groupId>
- <artifactId>site-renderer</artifactId>
- <version>1.0-alpha-7</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-decoration-model</artifactId>
- <version>1.0-alpha-7</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-doxia</groupId>
- <artifactId>decoration-model</artifactId>
- <version>1.0-alpha-7</version>
- </jpp>
- </dependency>
-
</dependencies>
diff --git a/plexus-resources.spec b/plexus-resources.spec
index 90ac2f5..c9db463 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -28,26 +28,23 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define with_maven 0
-
-%define parent plexus
-%define subname resources
-%define namedversion 1.0-alpha-4
+%global parent plexus
+%global subname resources
+%global namedversion 1.0-alpha-7
Name: %{parent}-%{subname}
Version: 1.0
-Release: 0.2.a4%{?dist}
+Release: 0.3.a7%{?dist}
Summary: Plexus Resource Manager
License: MIT
Group: Development/Tools
URL: http://plexus.codehaus.org/
-# svn export http://svn.codehaus.org/plexus/tags/plexus-resources-1.0-alpha-4/
-# tar czf plexus-resources-1.0-alpha-4-src.tar.gz plexus-resources-1.0-alpha-4
-Source0: %{name}-%{version}-alpha-4-src.tar.gz
-Source1: plexus-resources-1.0-build.xml
-Source2: plexus-resources-1.0-components.xml
+# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-resources-1.0-alpha-7/
+# tar caf plexus-resources-1.0-alpha-7-src.tar.xz plexus-resources-1.0-alpha-7
+Source0: %{name}-%{version}-alpha-7-src.tar.xz
Source3: plexus-resources-settings.xml
Source4: plexus-resources-1.0-jpp-depmap.xml
+Patch0: 0001-Add-default-role-hint-to-DefaultResourceManager.patch
Requires: classworlds >= 0:1.1
Requires: plexus-container-default
Requires: plexus-utils
@@ -57,27 +54,18 @@ Requires(postun): jpackage-utils >= 0:1.7.3
BuildRequires: jpackage-utils >= 0:1.7.3
BuildRequires: java-devel >= 0:1.5.0
BuildRequires: ant >= 0:1.6
-%if %{with_maven}
BuildRequires: maven2
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-release
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire = 2.3
-BuildRequires: maven-surefire-provider-junit = 2.3
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-release-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-maven-plugin >= 1.3.5
-BuildRequires: qdox >= 1.5
-BuildRequires: tomcat5
-BuildRequires: tomcat5-servlet-2.4-api
-BuildRequires: avalon-logkit
-BuildRequires: avalon-framework
-%endif
-
-BuildRequires: classworlds >= 0:1.1
BuildRequires: plexus-container-default
BuildRequires: plexus-utils
@@ -100,14 +88,11 @@ Group: Documentation
API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{version}-alpha-4
-cp -p %{SOURCE1} build.xml
-mkdir -p target/classes/META-INF/plexus
-cp -p %{SOURCE2} target/classes/./META-INF/plexus/components.xml
+%setup -q -n %{name}-%{namedversion}
cp -p %{SOURCE3} settings.xml
+%patch0 -p1
%build
-%if %{with_maven}
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
@@ -128,18 +113,6 @@ mvn-jpp \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
-%else
-export CLASSPATH=
-export OPT_JAR_LIST=:
-mkdir -p target/lib
-build-jar-repository -s -p target/lib \
-classworlds \
-plexus/container-default \
-plexus/utils \
-
-ant -Dmaven.mode.offline=true jar javadoc
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
# jars
@@ -172,7 +145,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_javadir}/%{parent}/*
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
@@ -181,6 +154,12 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/%{name}
%changelog
+* Wed Aug 25 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.3.a7
+- Update to alpha 7.
+- Apply patch to fix rhbz#621714.
+- Use global instead of define.
+- Drop ant build - broken after update.
+
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.2.a4
- Fix release and defattr
- Make -javadoc description better
diff --git a/sources b/sources
index 81fae5f..1a6b1c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be22d0c00541a8333f80e7ec512929d4 plexus-resources-1.0-alpha-4-src.tar.gz
+f6ac346f9856c1517590c78cc98b737e plexus-resources-1.0-alpha-7-src.tar.xz
More information about the scm-commits
mailing list