[maven-plugin-bundle] BR maven
by Alexander Kurtakov
commit 1799a668e97c5ab91c7173f5b91f7683e46d8eb2
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Feb 11 00:07:13 2011 +0200
BR maven
maven-plugin-bundle.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 2706ab0..2d73b0f 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -11,6 +11,7 @@ BuildRequires: aqute-bndlib >= 0.0.363
BuildRequires: plexus-utils >= 1.4.5
BuildRequires: felix-osgi-obr
BuildRequires: kxml
+BuildRequires: maven
BuildRequires: maven-shared-dependency-tree >= 1.1-3
BuildRequires: maven-wagon >= 1.0-0.2.b2
BuildRequires: maven-compiler-plugin
13 years, 3 months
[maven-plugin-bundle] BR maven-surefire-provider-junit4.
by Alexander Kurtakov
commit f566e9a97c5ad1f96583e8a1850780410541205f
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Feb 10 23:58:11 2011 +0200
BR maven-surefire-provider-junit4.
maven-plugin-bundle.spec | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 728740f..2706ab0 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-bundle
Version: 2.0.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
@@ -20,7 +20,7 @@ BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin >= 2.3
-BuildRequires: maven-surefire-provider-junit >= 2.3
+BuildRequires: maven-surefire-provider-junit4 >= 2.3
BuildRequires: maven-doxia-sitetools
BuildRequires: felix-parent
Requires: aqute-bndlib >= 0.0.363
@@ -56,11 +56,7 @@ API documentation for %{name}.
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
rm -rf %{buildroot}
@@ -99,6 +95,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Thu Feb 10 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.0-9
+- BR maven-surefire-provider-junit4.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years, 3 months
[maven-plugin-testing] Fix building.
by Alexander Kurtakov
commit 2c7ce2dc9c44b811c8bb7e83af534e3cc4645cd1
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Feb 10 23:54:05 2011 +0200
Fix building.
Adapt to current guidelines.
maven-plugin-testing-harness-ArtifactStub.patch | 15 ++++-
maven-plugin-testing-pom.patch | 13 -----
maven-plugin-testing.spec | 64 ++++++++++-------------
3 files changed, 39 insertions(+), 53 deletions(-)
---
diff --git a/maven-plugin-testing-harness-ArtifactStub.patch b/maven-plugin-testing-harness-ArtifactStub.patch
index 057fa1d..279df12 100644
--- a/maven-plugin-testing-harness-ArtifactStub.patch
+++ b/maven-plugin-testing-harness-ArtifactStub.patch
@@ -1,6 +1,15 @@
---- maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java.orig 2010-09-17 17:22:42.971256182 +0800
-+++ maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java 2010-09-17 17:45:26.268003574 +0800
-@@ -497,4 +497,8 @@
+--- maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java.sav2 2008-03-18 13:39:00.000000000 +0200
++++ maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java 2011-02-10 19:51:44.810981152 +0200
+@@ -62,7 +62,7 @@ public class ArtifactStub
+ *
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+- public int compareTo( Object object )
++ public int compareTo( Artifact object )
+ {
+ return 0;
+ }
+@@ -497,4 +497,8 @@ public class ArtifactStub
sb.append( getClassifier() );
}
}
diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec
index c7d6860..6a7e63f 100644
--- a/maven-plugin-testing.spec
+++ b/maven-plugin-testing.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-testing
Version: 1.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Maven Plugin Testing
Group: Development/Libraries
@@ -9,35 +9,32 @@ URL: http://maven.apache.org/plugin-testing/
#svn export http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-te... maven-plugin-testing-1.2
#tar caf maven-plugin-testing-1.2 maven-plugin-testing-1.2/
Source0: %{name}-%{version}.tar.xz
-Source1: %{name}-depmap.xml
-Patch0: %{name}-pom.patch
# patch for building with plexus-containers 1.5.4
Patch1: maven-plugin-testing-harness-SilentLog.patch
Patch2: maven-plugin-testing-harness-ArtifactStub.patch
Patch3: maven-plugin-testing-harness-AbstractMojoTestCase.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: junit
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-source
-BuildRequires: maven2-plugin-site
+BuildRequires: maven
+BuildRequires: maven-install-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-site-plugin
BuildRequires: plexus-maven-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-shared-reporting-impl
-BuildRequires: maven-shared-test-tools
+BuildRequires: maven-test-tools
-Requires: maven2
+Requires: maven
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
@@ -86,38 +83,26 @@ Provides: maven-shared-test-tools = 1:%{version}-%{release}
Framework to test Maven Plugins with Easymock objects.
%prep
-%setup -q #You may need to update this according to your Source0
-rm -fr src/site/site.xml
-%patch0 -b .sav0
+%setup -q
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
- -Dmaven.test.skip=true \
+mvn-rpmbuild \
+ -Dmaven.test.failure.ignore=true \
install javadoc:aggregate
#tests are skipped due to some test failures most probably caused by issues with our plexus container
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
install -m 644 maven-plugin-testing-harness/target/%{name}-harness-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/%{name}-harness-%{version}.jar
+ %{buildroot}%{_javadir}/%{name}/%{name}-harness.jar
install -m 644 maven-plugin-testing-tools/target/%{name}-tools-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/%{name}-tools-%{version}.jar
+ %{buildroot}%{_javadir}/%{name}/%{name}-tools.jar
install -m 644 maven-test-tools/target/maven-test-tools-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/maven-test-tools-%{version}.jar
-
-(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ %{buildroot}%{_javadir}/%{name}/maven-test-tools.jar
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
@@ -135,13 +120,14 @@ install -pm 644 maven-test-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}
%add_to_maven_depmap org.apache.maven.shared maven-test-tools %{version} JPP/%{name} maven-test-tools
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
-ls -lR $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -175,6 +161,10 @@ rm -rf %{buildroot}
%{_javadir}/%{name}/maven-test-tools*
%changelog
+* Thu Feb 10 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.2-9
+- Fix building.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years, 3 months
[Bug 669259] New: jsvc runtime crash when using jvm
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: jsvc runtime crash when using jvm
https://bugzilla.redhat.com/show_bug.cgi?id=669259
Summary: jsvc runtime crash when using jvm
Product: Fedora
Version: 14
Platform: x86_64
OS/Version: Linux
Status: NEW
Severity: low
Priority: low
Component: apache-commons-daemon
AssignedTo: sochotni(a)redhat.com
ReportedBy: johnny.luong(a)trustcommerce.com
QAContact: extras-qa(a)fedoraproject.org
CC: chris.spike(a)arcor.de, sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Description of problem:
The JSVC executable seems to crash when using the JVM provided by Fedora 14.
Version-Release number of selected component (if applicable):
How reproducible:
Always
Steps to Reproduce:
1. Run JSVC against a class that implements the Daemon interface.
2.
3.
Actual results:
JVM crashes, gives weird backtrace.
Expected results:
JVM should start the program.
Additional info:
commons-daemon-1.0.5 compiled from source seems to work correctly.
jvm in use is from this rpm: java-1.6.0-openjdk-1.6.0.0-49.1.9.3.fc14.x86_64
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years, 3 months
[ant] Revert define->global change (different semantic in rpm 4.9.X)
by Stanislav Ochotnicky
commit 5a1fcaf5bc09a520d6d38a00a3367edaac7b057b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 9 17:52:15 2011 +0100
Revert define->global change (different semantic in rpm 4.9.X)
ant.spec | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 593608e..11f7ffb 100644
--- a/ant.spec
+++ b/ant.spec
@@ -28,10 +28,10 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%global without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%global bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%global bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
%bcond_with bootstrap
@@ -809,6 +809,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Feb 9 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.8.2-3
- Add backward compatible maven depmap for nodeps jar
+- Revert define->global change (different semantic in rpm 4.9.X)
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years, 3 months
[plexus-maven-plugin] Fix build
by Stanislav Ochotnicky
commit a5f77dda41571f19e6befea601622377572e05e7
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Feb 10 15:19:05 2011 +0100
Fix build
- Versionless jars & javadocs
- Build with maven 3
- Remove old patch
plexus-maven-plugin-add-deps.patch | 54 ------------------------------------
plexus-maven-plugin.spec | 48 +++++++++++++------------------
2 files changed, 20 insertions(+), 82 deletions(-)
---
diff --git a/plexus-maven-plugin.spec b/plexus-maven-plugin.spec
index e3c5802..7aa6c92 100644
--- a/plexus-maven-plugin.spec
+++ b/plexus-maven-plugin.spec
@@ -18,15 +18,12 @@ URL: http://plexus.codehaus.org/
# tar czf plexus-maven-plugin-1.3.8-src.tar.xz plexus-maven-plugin-1.3.8
Source0: %{name}-%{version}-src.tar.xz
-Patch0: %{name}-add-deps.patch
-Patch1: %{name}-doxia.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: %{name}-doxia.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -60,6 +57,7 @@ from within Maven.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -67,42 +65,31 @@ Javadoc for %{name}.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild 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.2 JPP/%{parent} %{subname}
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
+%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
@@ -118,9 +105,14 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}
%changelog
+* Thu Feb 10 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.3.8-4
+- Fix build
+- Versionless jars & javadocs
+- Build with maven 3
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.3.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years, 3 months
[maven] Added mvn-rpmbuild script to be used in spec files
by Stanislav Ochotnicky
commit f5501c5008f4d8ff1357f2a14bbb6dff5e114836
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Feb 10 11:57:07 2011 +0100
Added mvn-rpmbuild script to be used in spec files
- mvn-local is now mixed mode (online with javadir priority)
- Changed mvn.jpp to mvn.local
0002-Use-custom-resolver.patch | 34 ++++++++++++++--------------
JavadirWorkspaceReader.java | 6 ++--
MavenJPackageDepmap.java | 12 +++++-----
maven-script-local | 37 ++----------------------------
maven-script-rpmbuild | 47 ++++++++++++++++++++++++++++++++++++++++
maven.spec | 10 +++++++-
6 files changed, 85 insertions(+), 61 deletions(-)
---
diff --git a/0002-Use-custom-resolver.patch b/0002-Use-custom-resolver.patch
index 10ab008..eec152c 100644
--- a/0002-Use-custom-resolver.patch
+++ b/0002-Use-custom-resolver.patch
@@ -35,7 +35,7 @@ index cae3735..2d11d64 100644
throws UnresolvableModelException
{
Artifact pomArtifact = new DefaultArtifact( groupId, artifactId, "", "pom", version );
-+ if ( System.getProperty("maven.jpp.mode") != null) {
++ if ( System.getProperty("maven.local.mode") != null) {
+ JavadirWorkspaceReader wReader = new JavadirWorkspaceReader();
+ File pomFile = wReader.findArtifact(pomArtifact);
+ // if pom file does not exist continue resolving using different
@@ -55,15 +55,15 @@ index 1f37d4f..d60dab8 100644
throw new NullPointerException( "artifactId is null" );
}
- if ( version == null )
-+ // in jpp mode we ignore versions because these would only cause
++ // in local mode we ignore versions because these would only cause
+ // problems
-+ if ( version == null && System.getProperty("maven.jpp.mode") == null )
++ if ( version == null && System.getProperty("maven.local.mode") == null )
{
throw new NullPointerException( "version is null" );
}
- return groupId + ":" + artifactId + ":" + version;
-+ if( System.getProperty("maven.jpp.mode") == null ) {
++ if( System.getProperty("maven.local.mode") == null ) {
+ return groupId + ":" + artifactId + ":" + version;
+ } else {
+ return versionlessKey(groupId, artifactId);
@@ -88,7 +88,7 @@ index e892ee9..0222b01 100644
}
+ // Set our own workspace reader to resolve from /usr/share/java
-+ if ( System.getProperty("maven.jpp.mode") != null)
++ if ( System.getProperty("maven.local.mode") != null)
+ {
+ session.setWorkspaceReader(new JavadirWorkspaceReader());
+ }
@@ -127,10 +127,10 @@ index 009635b..7d03748 100644
}
- if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() ) )
-+ // ignore incorrect version in jpp mode (we can have different
++ // ignore incorrect version in local mode (we can have different
+ // versions in /usr/share/java
+ if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() )
-+ && System.getProperty("maven.jpp.mode") == null)
++ && System.getProperty("maven.local.mode") == null)
{
errors.add( "Plugin's descriptor contains the wrong version: " + pluginDescriptor.getVersion() );
}
@@ -142,8 +142,8 @@ index fb074fb..bf2e703 100644
throws PluginVersionResolutionException
{
logger.debug( "Resolving plugin version for " + request.getGroupId() + ":" + request.getArtifactId() );
-+ if (System.getProperty("maven.jpp.mode") != null) {
-+ // in jpp mode we always use "latest" as a resolved version
++ if (System.getProperty("maven.local.mode") != null) {
++ // in local mode we always use "latest" as a resolved version
+ // (we ignore it anyway)
+ DefaultPluginVersionResult result = new DefaultPluginVersionResult("latest");
+ result.setRepository(request.getRepositorySession().getWorkspaceReader().getRepository());
@@ -170,7 +170,7 @@ index 403351a..2351620 100644
if ( pomFile == null )
{
Artifact pomArtifact = new DefaultArtifact( groupId, artifactId, "", "pom", version );
-+ if ( System.getProperty("maven.jpp.mode") != null) {
++ if ( System.getProperty("maven.local.mode") != null) {
+ JavadirWorkspaceReader wReader = new JavadirWorkspaceReader();
+ pomFile = wReader.findArtifact(pomArtifact);
+ // if pom file does not exist continue resolving using different resolvers
@@ -193,7 +193,7 @@ index 066fbf3..a7cbf40 100644
+ // Seems like plexus-container-default has some quirks that
+ // cause it to lose version. Needs more looking into and fix it
+ // properly
-+ if (dependency.getVersion() == null && System.getProperty("maven.jpp.mode") != null)
++ if (dependency.getVersion() == null && System.getProperty("maven.local.mode") != null)
+ {
+ System.out.println("FIXING NULL VERSION:" + dependency.getGroupId() + ":" + dependency.getArtifactId() + ":" + dependency.getVersion());
+ dependency.setVersion("1.0.0");
@@ -210,8 +210,8 @@ index 033211a..eec6caf 100644
if ( !management )
{
- validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d );
-+ // in jpp mode set version to "latest" and validate
-+ if(System.getProperty("maven.jpp.mode") != null && d.getVersion() == null)
++ // in local mode set version to "latest" and validate
++ if(System.getProperty("maven.local.mode") != null && d.getVersion() == null)
+ d.setVersion("latest");
+ else
+ validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d );
@@ -223,8 +223,8 @@ index 033211a..eec6caf 100644
validateEffectiveDependency( problems, d, false, prefix, request );
- validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d );
-+ // in jpp mode set version to "latest" and validate
-+ if(System.getProperty("maven.jpp.mode") != null && d.getVersion() == null)
++ // in local mode set version to "latest" and validate
++ if(System.getProperty("maven.local.mode") != null && d.getVersion() == null)
+ d.setVersion("latest");
+ else
+ validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d );
@@ -236,8 +236,8 @@ index 033211a..eec6caf 100644
validateStringNotEmpty( prefix + "type", problems, Severity.ERROR, d.getType(), d.getManagementKey(), d );
- validateStringNotEmpty( prefix + "version", problems, Severity.ERROR, d.getVersion(), d.getManagementKey(),
-+ // in jpp mode ignore missing version completely
-+ if(System.getProperty("maven.jpp.mode") == null)
++ // in local mode ignore missing version completely
++ if(System.getProperty("maven.local.mode") == null)
+ validateStringNotEmpty( prefix + "version", problems, Severity.ERROR, d.getVersion(), d.getManagementKey(),
d );
}
diff --git a/JavadirWorkspaceReader.java b/JavadirWorkspaceReader.java
index 81dc6b1..0fe02b7 100644
--- a/JavadirWorkspaceReader.java
+++ b/JavadirWorkspaceReader.java
@@ -85,18 +85,18 @@ public class JavadirWorkspaceReader
StringBuffer path = new StringBuffer();
String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom";
- path.append(System.getProperty("maven.jpp.pom.path", "JPP/maven2/poms")).append("/").append(fName);
+ path.append(System.getProperty("maven.local.pom.path", "JPP/maven2/poms")).append("/").append(fName);
java.io.File f;
// NOTE: We are returning default_poms/ as the path for this pom
// even though it may not exist there. This may cause an error,
// but that is fine because if the pom is not there, there is
// a serious problem anyways..
- f = new java.io.File(System.getProperty("maven.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
+ f = new java.io.File(System.getProperty("maven.local.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
//System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
if (!f.exists()) {
path = new StringBuffer();
- path.append(System.getProperty("maven.jpp.default.pom.path", "JPP/maven2/default_poms")).append("/").append(fName);
+ path.append(System.getProperty("maven.local.default.pom.path", "JPP/maven2/default_poms")).append("/").append(fName);
}
path.insert(0, "/usr/share/maven2/repository/");
return path;
diff --git a/MavenJPackageDepmap.java b/MavenJPackageDepmap.java
index c65155a..8cd1651 100644
--- a/MavenJPackageDepmap.java
+++ b/MavenJPackageDepmap.java
@@ -51,7 +51,7 @@ public class MavenJPackageDepmap {
Hashtable<String, String> jppDep;
String idToCheck, jppCombination;
- if (System.getProperty("maven.ignore.versions") == null && System.getProperty("maven.jpp.mode") == null) {
+ if (System.getProperty("maven.ignore.versions") == null && System.getProperty("maven.local.mode") == null) {
idToCheck = groupId+","+artifactId+","+version;
} else {
idToCheck = groupId+","+artifactId;
@@ -86,7 +86,7 @@ public class MavenJPackageDepmap {
public boolean shouldEliminate(String groupId, String artifactId, String version) {
String idToCheck;
- if (System.getProperty("maven.ignore.versions") == null && System.getProperty("maven.jpp.mode") == null) {
+ if (System.getProperty("maven.ignore.versions") == null && System.getProperty("maven.local.mode") == null) {
idToCheck = groupId+","+artifactId+","+version;
} else {
idToCheck = groupId+","+artifactId;
@@ -98,7 +98,7 @@ public class MavenJPackageDepmap {
private static void buildJppArtifactMap() {
- if (System.getProperty("maven.ignore.versions") != null || System.getProperty("maven.jpp.mode") != null) {
+ if (System.getProperty("maven.ignore.versions") != null || System.getProperty("maven.local.mode") != null) {
debug("Processing file: /usr/share/java-utils/xml/maven2-versionless-depmap.xml");
processDepmapFile("/etc/maven/maven2-versionless-depmap.xml");
}
@@ -106,7 +106,7 @@ public class MavenJPackageDepmap {
debug("Processing file: /usr/share/java-utils/xml/maven2-depmap.xml");
processDepmapFile("/etc/maven/maven2-depmap.xml");
- String customFileName = System.getProperty("maven.jpp.depmap.file", null);
+ String customFileName = System.getProperty("maven.local.depmap.file", null);
if (customFileName != null) {
debug("Processing file: " + customFileName);
processDepmapFile(customFileName);
@@ -158,7 +158,7 @@ public class MavenJPackageDepmap {
if (jppNodeList.getLength() == 1) {
jppAD = getArtifactDefinition((Element) jppNodeList.item(0));
- if (System.getProperty("maven.ignore.versions") == null && System.getProperty("maven.jpp.mode") == null) {
+ if (System.getProperty("maven.ignore.versions") == null && System.getProperty("maven.local.mode") == null) {
debug("*** Adding: " + mavenAD.groupId + "," + mavenAD.artifactId + "," + mavenAD.version + " => "
+ jppAD.groupId + "," + jppAD.artifactId + "," + jppAD.version + " to map...");
@@ -207,7 +207,7 @@ public class MavenJPackageDepmap {
public static void debug(String msg) {
- if (System.getProperty("maven.jpp.debug") != null)
+ if (System.getProperty("maven.local.debug") != null)
System.err.println(msg);
}
}
diff --git a/maven-script-local b/maven-script-local
index bdbc22e..a5ebc59 100644
--- a/maven-script-local
+++ b/maven-script-local
@@ -5,43 +5,12 @@ if [ -f /usr/share/java-utils/java-functions ] ; then
set_javacmd
fi
-function install_metadata()
-{
- mkdir -p "$1"
- tar xf /usr/share/maven/repo-metadata.tar.xz -C "$1"
-}
-
-
-# add maven.repo.local if it's not defined already
-local_add="-Dmaven.repo.local=$(pwd)/.m2/"
-
-function process_args()
-{
-while [ $# != 0 ]; do
- flag="$1"
- case "$flag" in
- *) ind=`expr match "$flag" -Dmaven.repo.local=`
- if [[ $ind != 0 ]];then
- install_metadata "${flag/-Dmaven.repo.local=/}/"
- local_add=""
- fi
- ;;
- esac
- shift
-done
-}
-
-process_args "$@"
-
-if [ -n "$local_add" ];then
- install_metadata "${local_add/-Dmaven.repo.local=/}/"
-fi
-
export M2_HOME=/usr/share/maven
echo $JAVA_HOME
export JAVA_HOME
# can't put it on command line due to
# http://jira.codehaus.org/browse/SUREFIRE-121
-export MAVEN_OPTS="-Dmaven.jpp.mode ${local_add}"
+export MAVEN_OPTS="-Dmaven.local.mode ${local_add}"
+echo "Running mvn in local mode. Please report bugs to http://bugzilla.redhat.com"
-$M2_HOME/bin/mvn -o "$@"
+$M2_HOME/bin/mvn "$@"
diff --git a/maven-script-rpmbuild b/maven-script-rpmbuild
new file mode 100644
index 0000000..3f3c1ae
--- /dev/null
+++ b/maven-script-rpmbuild
@@ -0,0 +1,47 @@
+#!/bin/sh
+if [ -f /usr/share/java-utils/java-functions ] ; then
+ . /usr/share/java-utils/java-functions
+ set_jvm
+ set_javacmd
+fi
+
+function install_metadata()
+{
+ mkdir -p "$1"
+ tar xf /usr/share/maven/repo-metadata.tar.xz -C "$1"
+}
+
+
+# add maven.repo.local if it's not defined already
+local_add="-Dmaven.repo.local=$(pwd)/.m2/"
+
+function process_args()
+{
+while [ $# != 0 ]; do
+ flag="$1"
+ case "$flag" in
+ *) ind=`expr match "$flag" -Dmaven.repo.local=`
+ if [[ $ind != 0 ]];then
+ install_metadata "${flag/-Dmaven.repo.local=/}/"
+ local_add=""
+ fi
+ ;;
+ esac
+ shift
+done
+}
+
+process_args "$@"
+
+if [ -n "$local_add" ];then
+ install_metadata "${local_add/-Dmaven.repo.local=/}/"
+fi
+
+export M2_HOME=/usr/share/maven
+echo $JAVA_HOME
+export JAVA_HOME
+# can't put it on command line due to
+# http://jira.codehaus.org/browse/SUREFIRE-121
+export MAVEN_OPTS="-Dmaven.local.mode ${local_add}"
+
+$M2_HOME/bin/mvn -o "$@"
diff --git a/maven.spec b/maven.spec
index c3f6a82..47faca6 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,7 +1,7 @@
Name: maven
Version: 3.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -17,6 +17,7 @@ Source101: MavenJPackageDepmap.java
# 2xx for created non-buildable sources
Source200: %{name}-script
Source201: %{name}-script-local
+Source202: %{name}-script-rpmbuild
# Other included files
Source250: repo-metadata.tar.xz
@@ -246,6 +247,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_bindir}
# Wrappers
cp -af %{SOURCE200} $RPM_BUILD_ROOT%{_bindir}/mvn3
cp -af %{SOURCE201} $RPM_BUILD_ROOT%{_bindir}/mvn-local
+cp -af %{SOURCE202} $RPM_BUILD_ROOT%{_bindir}/mvn-rpmbuild
###################
# Individual jars #
@@ -286,6 +288,7 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt README.txt
%attr(0755,root,root) %{_bindir}/mvn3
%attr(0755,root,root) %{_bindir}/mvn-local
+%attr(0755,root,root) %{_bindir}/mvn-rpmbuild
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/bin
%attr(0755,root,root) %{_datadir}/%{name}/bin/mvn
@@ -309,6 +312,11 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog
+* Thu Feb 10 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.2-2
+- Added mvn-rpmbuild script to be used in spec files
+- mvn-local is now mixed mode (online with javadir priority)
+- Changed mvn.jpp to mvn.local
+
* Fri Jan 28 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.2-1
- Update to latest version (3.0.2)
- Ignore test failures temporarily
13 years, 3 months
[apache-commons-codec] Drop versioned jars and javadocs.
by Mat Booth
commit 082709f53b9426863f84a89c4d3b3556cd9ac587
Author: mbooth <mbooth(a)sd.matbooth.co.uk>
Date: Thu Feb 10 00:23:42 2011 +0000
Drop versioned jars and javadocs.
apache-commons-codec.spec | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index dd38662..4d167ed 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -8,7 +8,7 @@
Name: apache-%{short_name}
Version: 1.4
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Implementations of common encoders and decoders
Group: Development/Libraries
License: ASL 2.0
@@ -68,21 +68,21 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
+mvn-jpp \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ install javadoc:javadoc
%install
rm -rf %{buildroot}
# jars
install -pD -T target/%{short_name}-%{version}.jar \
- %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ %{buildroot}%{_javadir}/%{short_name}.jar
+(cd %{buildroot}%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
# javadocs
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
# pom
install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
@@ -101,6 +101,11 @@ rm -rf %{buildroot}
%postun
%update_maven_depmap
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES*
@@ -110,10 +115,13 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
+%doc LICENSE.txt
%{_javadocdir}/%{name}
%changelog
+* Thu Feb 10 2011 mbooth <mbooth(a)sd.matbooth.co.uk> 1.4-12
+- Drop versioned jars and javadocs.
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years, 3 months
[apache-commons-net] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
by Dennis Gilmore
commit 69cd3623121492e223c7866add03bb73e4c1f027
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 9 12:08:21 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
apache-commons-net.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-net.spec b/apache-commons-net.spec
index 32883ef..2647933 100644
--- a/apache-commons-net.spec
+++ b/apache-commons-net.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Internet protocol suite Java library
License: ASL 2.0
Group: Development/Libraries
@@ -105,6 +105,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc LICENSE.txt NOTICE.txt
%changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Fri Dec 10 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2-1
- Replace maven plugins with apache-commons-parent for BR
- Versionless jars and javadocs
13 years, 3 months
