Version bump to 2.2.3 Fix small packaging guidelines violations
This commit is contained in:
Stanislav Ochotnicky
parent
a1de4711a9
commit
5cbb2a5d37
@ -1 +1 @@
|
||||
plexus-classworlds-1.2-alpha-9-src.tar.gz
|
||||
plexus-classworlds-2.2.3.tar.xz
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
--- pom.xml.sav 2007-08-14 16:29:45.000000000 +0200
|
||||
+++ pom.xml 2007-08-14 16:30:40.000000000 +0200
|
||||
@@ -31,6 +31,13 @@
|
||||
<inceptionYear>2002</inceptionYear>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
+ <groupId>org.codehaus.plexus</groupId>
|
||||
+ <artifactId>plexus-utils</artifactId>
|
||||
+ <version>1.0.4</version>
|
||||
+ <type>jar</type>
|
||||
+ <scope>test</scope>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>3.8.1</version>
|
||||
14
plexus-classworlds.depmap
Normal file
14
plexus-classworlds.depmap
Normal file
@ -0,0 +1,14 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
<version>3.0</version>
|
||||
</maven>
|
||||
<jpp>
|
||||
<groupId>JPP/objectweb-asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
<version>3.2</version>
|
||||
</jpp>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
@ -28,62 +28,62 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
%define with_maven 0
|
||||
%global with_maven 1
|
||||
|
||||
%define parent plexus
|
||||
%define subname classworlds
|
||||
%define namedversion 1.2-alpha-9
|
||||
%global parent plexus
|
||||
%global subname classworlds
|
||||
|
||||
Name: %{parent}-%{subname}
|
||||
Version: 1.2
|
||||
Release: 0.a9.8%{?dist}
|
||||
Epoch: 0
|
||||
Version: 2.2.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Plexus Classworlds Classloader Framework
|
||||
License: ASL 2.0 and Plexus
|
||||
Group: Development/Libraries
|
||||
URL: http://plexus.codehaus.org/
|
||||
# svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-9/ plexus-classworlds-1.2-alpha-9
|
||||
# tar czf plexus-classworlds-1.2-alpha-9.tar.gz plexus-classworlds-1.2-alpha-9
|
||||
Source0: %{name}-%{namedversion}-src.tar.gz
|
||||
# svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-2.2.3 plexus-classworlds-2.2.3
|
||||
# tar caf plexus-classworlds-2.2.3.tar.xz plexus-classworlds-2.2.3
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
|
||||
# Generated with mvn ant:ant
|
||||
Source1: plexus-classworlds-1.2-build.xml
|
||||
# Fedora-specific maven bits
|
||||
Source3: plexus-classworlds-settings.xml
|
||||
Source4: plexus-classworlds-1.2-jpp-depmap.xml
|
||||
|
||||
# Add plexus-utils dependency
|
||||
Patch0: plexus-classworlds-1.2-pom_xml.patch
|
||||
# workaround objectweb-asm depmap
|
||||
Source5: %{name}.depmap
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: jpackage-utils >= 0:1.7.3
|
||||
BuildRequires: ant >= 0:1.6.5
|
||||
BuildRequires: jakarta-commons-logging
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: xml-commons-jaxp-1.3-apis
|
||||
%if %{with_maven}
|
||||
BuildRequires: maven2 >= 2.0.4-10jpp
|
||||
BuildRequires: maven2-plugin-compiler
|
||||
BuildRequires: maven2-plugin-install
|
||||
BuildRequires: maven2-plugin-jar
|
||||
BuildRequires: maven2-plugin-javadoc
|
||||
BuildRequires: maven2-plugin-resources
|
||||
BuildRequires: maven2-plugin-surefire = 2.3
|
||||
BuildRequires: maven-surefire-provider-junit = 2.3
|
||||
BuildRequires: maven2
|
||||
BuildRequires: maven-compiler-plugin
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-jar-plugin
|
||||
BuildRequires: maven-javadoc-plugin
|
||||
BuildRequires: maven-resources-plugin
|
||||
BuildRequires: maven-doxia
|
||||
BuildRequires: maven-doxia-sitetools
|
||||
BuildRequires: maven-release
|
||||
BuildRequires: maven-release-plugin
|
||||
BuildRequires: maven-shared-invoker
|
||||
BuildRequires: maven-shared-reporting-impl
|
||||
BuildRequires: maven-dependency-plugin
|
||||
BuildRequires: maven-surefire-maven-plugin
|
||||
BuildRequires: maven-surefire-provider-junit
|
||||
%endif
|
||||
BuildRequires: plexus-utils
|
||||
|
||||
Requires(post): jpackage-utils >= 0:1.7.2
|
||||
Requires(postun): jpackage-utils >= 0:1.7.2
|
||||
Requires(post): jpackage-utils
|
||||
Requires(postun): jpackage-utils
|
||||
|
||||
%description
|
||||
Classworlds is a framework for container developers
|
||||
who require complex manipulation of Java's ClassLoaders.
|
||||
Java's native ClassLoader mechanims and classes can cause
|
||||
Java's native ClassLoader mechanisms and classes can cause
|
||||
much headache and confusion for certain types of
|
||||
application developers. Projects which involve dynamic
|
||||
loading of components or otherwise represent a 'container'
|
||||
@ -93,18 +93,20 @@ classworlds.
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Documentation
|
||||
Requires: jpackage-utils
|
||||
|
||||
%description javadoc
|
||||
Javadoc for %{name}.
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{namedversion}
|
||||
%setup -q -n %{name}-%{version}
|
||||
for j in $(find . -name "*.jar" | grep -v /test-data/ | grep -v /test-jars/); do
|
||||
mv $j $j.no
|
||||
done
|
||||
cp %{SOURCE1} build.xml
|
||||
cp %{SOURCE3} settings.xml
|
||||
%patch0 -b .sav
|
||||
|
||||
mkdir -p lib
|
||||
ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) lib/xml-apis-1.3.02.jar
|
||||
ln -sf $(build-classpath ant) lib/ant-1.6.5.jar
|
||||
ln -sf $(build-classpath commons-logging) lib/commons-logging-1.0.3.jar
|
||||
@ -114,14 +116,14 @@ ln -sf $(build-classpath commons-logging) lib/commons-logging-1.0.3.jar
|
||||
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
|
||||
mkdir -p $MAVEN_REPO_LOCAL
|
||||
|
||||
# org.codehaus.plexus.classworlds.strategy.StrategyTest fails
|
||||
# upstream, so ignore failures for now
|
||||
# tests skipped because of old commons-cli package these fail
|
||||
|
||||
%if %{with_maven}
|
||||
mvn-jpp \
|
||||
-e \
|
||||
-Dmaven.test.failure.ignore=true \
|
||||
-Dmaven.test.skip=true \
|
||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||
-Dmaven2.jpp.depmap.file=%{SOURCE5} \
|
||||
install javadoc:javadoc
|
||||
|
||||
%else
|
||||
@ -134,16 +136,14 @@ ant -Dbuild.sysclasspath=only jar javadoc
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# jars
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
|
||||
install -pm 644 target/%{name}-%{namedversion}.jar \
|
||||
install -Dpm 644 target/%{name}-%{version}.jar \
|
||||
$RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
|
||||
%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
|
||||
%add_to_maven_depmap org.codehaus.plexus %{name} %{version} 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}
|
||||
@ -161,9 +161,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_javadir}/%{parent}
|
||||
%{_datadir}/maven2
|
||||
%{_mavendepmapfragdir}
|
||||
%{_javadir}/%{parent}/*
|
||||
%{_mavenpomdir}/*
|
||||
%{_mavendepmapfragdir}/*
|
||||
%doc LICENSE.txt
|
||||
|
||||
%files javadoc
|
||||
@ -171,6 +171,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc %{_javadocdir}/*
|
||||
|
||||
%changelog
|
||||
* Tue Jul 13 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2.3-1
|
||||
- Version bump
|
||||
- Fix few small packaging guidelines violations
|
||||
|
||||
* Thu Aug 20 2009 Andrew Overholt <overholt@redhat.com> 0:1.2-0.a9.8
|
||||
- Bump release.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user