rpms/plexus-runtime-builder/devel plexus-runtime-builder-maven204.patch, NONE, 1.1 plexus-runtime-builder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Deepak Bhole (dbhole)
fedora-extras-commits at redhat.com
Tue Mar 20 03:58:36 UTC 2007
Author: dbhole
Update of /cvs/extras/rpms/plexus-runtime-builder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22456/devel
Modified Files:
.cvsignore sources
Added Files:
plexus-runtime-builder-maven204.patch
plexus-runtime-builder.spec
Log Message:
auto-import plexus-runtime-builder-1.0-0.1.a9.2jpp.1.fc7 on branch devel from plexus-runtime-builder-1.0-0.1.a9.2jpp.1.fc7.src.rpm
plexus-runtime-builder-maven204.patch:
--- NEW FILE plexus-runtime-builder-maven204.patch ---
--- ./src/test/java/org/codehaus/plexus/builder/runtime/PlexusRuntimeBuilderTest.java.sav 2005-10-13 19:34:53.000000000 -0400
+++ ./src/test/java/org/codehaus/plexus/builder/runtime/PlexusRuntimeBuilderTest.java 2006-06-19 15:49:30.000000000 -0400
@@ -28,6 +28,7 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -78,10 +79,17 @@
ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "legacy" );
+ String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
+ String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+ ArtifactRepositoryPolicy snapshotsPolicy = new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+ ArtifactRepositoryPolicy releasesPolicy = new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
ArtifactRepository localRepository =
artifactRepositoryFactory.createArtifactRepository( "local",
"file://" + getTestFile( "src/test/repository" ).getAbsolutePath(),
- repositoryLayout );
+ repositoryLayout,
+ snapshotsPolicy,
+ releasesPolicy );
Set projectArtifacts = new HashSet();
--- ./src/main/java/org/codehaus/plexus/builder/AbstractBuilder.java.sav 2005-10-20 09:15:01.000000000 -0400
+++ ./src/main/java/org/codehaus/plexus/builder/AbstractBuilder.java 2006-06-19 15:48:30.000000000 -0400
@@ -248,12 +248,18 @@
if ( resolveTransitively )
{
- result = artifactResolver.resolveTransitively( sourceArtifacts,
+
+ try {
+ result = artifactResolver.resolveTransitively( sourceArtifacts,
originatingArtifact,
localRepository,
remoteRepositories,
metadata,
artifactFilter );
+ } catch (org.apache.maven.artifact.resolver.ArtifactNotFoundException e) {
+ throw new ArtifactResolutionException(e.getOriginalMessage(), e.getGroupId(), e.getArtifactId(), e.getVersion(), e.getType(), e);
+ }
+
// TODO: Assert that there wasn't any conflicts.
resolvedArtifacts = result.getArtifacts();
@@ -266,7 +272,11 @@
{
Artifact artifact = (Artifact) it.next();
- artifactResolver.resolve( artifact, remoteRepositories, localRepository );
+ try {
+ artifactResolver.resolve( artifact, remoteRepositories, localRepository );
+ } catch (org.apache.maven.artifact.resolver.ArtifactNotFoundException e) {
+ throw new ArtifactResolutionException(e.getOriginalMessage(), e.getGroupId(), e.getArtifactId(), e.getVersion(), e.getType(), e);
+ }
resolvedArtifacts.add( artifact );
}
--- NEW FILE plexus-runtime-builder.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the
# distribution.
# 3. Neither the name of the JPackage Project nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
%define _with_gcj_support 1
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:
%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:
%{_gcj_support}}%{!?_gcj_support:0}}}
%define parent plexus
%define subname runtime-builder
Name: %{parent}-%{subname}
Version: 1.0
Release: 0.1.a9.2jpp.1%{?dist}
Epoch: 0
Summary: Plexus Component Descriptor Creator
License: MIT-Style
Group: Development/Java
URL: http://plexus.codehaus.org/
Source0: %{name}-src.tar.gz
# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-runtime-builder-1.0-alpha-9 plexus-runtime-builder/
# tar czf plexus-runtime-builder-1.0-alpha-9.tar.gz plexus-runtime-builder/
Patch0: %{name}-maven204.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-httpclient
BuildRequires: maven2 >= 2.0.4
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
BuildRequires: maven2-common-poms >= 1.0
BuildRequires: maven-wagon
BuildRequires: plexus-appserver
BuildRequires: plexus-archiver
BuildRequires: plexus-container-default
BuildRequires: plexus-utils
BuildRequires: plexus-velocity
BuildRequires: plexus-xmlrpc
BuildRequires: velocity
BuildRequires: xmlrpc
Requires: jakarta-commons-codec
Requires: jakarta-commons-httpclient
Requires: maven2-common-poms >= 1.0
Requires: maven-wagon
Requires: plexus-appserver
Requires: plexus-archiver
Requires: plexus-container-default
Requires: plexus-utils
Requires: plexus-velocity
Requires: plexus-xmlrpc
Requires: velocity
Requires: xmlrpc
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
embedded or for a full scale application server. There are many
reusable components for hibernate, form processing, jndi, i18n,
velocity, etc. Plexus also includes an application server which
is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
%description javadoc
Javadoc for %{name}.
%prep
%setup -q -n %{name}
%patch -b .sav
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
# FIXME: Ignoring text failures for now
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven2.jpp.mode=true \
-Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
rm -rf $RPM_BUILD_ROOT
# jars
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-9 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
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%files
%defattr(-,root,root,-)
%{_javadir}/plexus
%{_datadir}/maven2
%{_mavendepmapfragdir}
%config(noreplace) /etc/maven/fragments/plexus-runtime-builder
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/runtime-builder-1.0.jar.*
%endif
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%changelog
* Thu Feb 22 2007 Tania Bento <tbento at redhat.com> 0:1.0-0.1.a9.2jpp.1
- Fixed %%Release.
- Fixed %%BuildRoot.
- Removed %%Vendor.
- Removed %%Distribution.
- Fixed instructions how to generate the source drop.
- Added gcj support.
- Removed %%post and %%postun sections for javadoc.
* Tue Oct 17 2006 Deepak Bhole <dbhole at redhat.com> 1.0-0.a9.2jpp
- Update for maven2 9jpp.
* Mon Jun 12 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a9.1jpp
- Initial build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plexus-runtime-builder/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Mar 2007 22:54:53 -0000 1.1
+++ .cvsignore 20 Mar 2007 03:58:02 -0000 1.2
@@ -0,0 +1 @@
+plexus-runtime-builder-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plexus-runtime-builder/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Mar 2007 22:54:53 -0000 1.1
+++ sources 20 Mar 2007 03:58:02 -0000 1.2
@@ -0,0 +1 @@
+333189c5a731cda698c57ff179694cf1 plexus-runtime-builder-src.tar.gz
More information about the fedora-extras-commits
mailing list