[Bug 670815] New: Update maven to latest version (3.0.2)
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: Update maven to latest version (3.0.2)
https://bugzilla.redhat.com/show_bug.cgi?id=670815
Summary: Update maven to latest version (3.0.2)
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: medium
Priority: low
Component: maven
AssignedTo: sochotni(a)redhat.com
ReportedBy: sochotni(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Target Release: ---
Description of problem:
Current rawhide version: 3.0
latest upstream: 3.0.2
--
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, 2 months
[maven] Add forgotten sources
by Stanislav Ochotnicky
commit 19154e40967cc298c2e7f615842abf805a28d560
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jan 28 17:57:55 2011 +0100
Add forgotten sources
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe00e61..38baa99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/apache-maven-3.0-src.tar.gz
+/apache-maven-3.0.2-src.tar.gz
diff --git a/sources b/sources
index 3dc133b..f872c34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8daf3549934f12af31de5325b5f3b136 apache-maven-3.0-src.tar.gz
+09b3092100e1f15fa4777217562309ea apache-maven-3.0.2-src.tar.gz
13 years, 2 months
[maven] Update to latest version (3.0.2)
by Stanislav Ochotnicky
commit 68392573333a27cfe1ac5562bb3e77ac8ff43dbc
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jan 28 17:12:57 2011 +0100
Update to latest version (3.0.2)
- Ignore test failures temporarily
0002-Use-custom-resolver.patch | 29 ++++++++++++++++++++++++++---
maven-script-local | 6 +++++-
maven.spec | 23 ++++++++++++++---------
3 files changed, 45 insertions(+), 13 deletions(-)
---
diff --git a/0002-Use-custom-resolver.patch b/0002-Use-custom-resolver.patch
index 13ddcf3..10ab008 100644
--- a/0002-Use-custom-resolver.patch
+++ b/0002-Use-custom-resolver.patch
@@ -1,6 +1,6 @@
-From 0ef392488f676a6b64d408bb98d21eefaa1d3d10 Mon Sep 17 00:00:00 2001
+From c804249cb3355df3ac10b4a83fffa2a4c84bd69b Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Tue, 2 Nov 2010 14:47:05 +0100
+Date: Tue, 18 Jan 2011 11:09:32 +0100
Subject: [PATCH 2/2] Use custom resolver
WorkspaceReader is used to resolve main dependencies, but we had to
@@ -11,12 +11,13 @@ project when WorkspaceReader is not available yet.
.../repository/internal/DefaultModelResolver.java | 9 +++++++++
.../org/apache/maven/artifact/ArtifactUtils.java | 10 ++++++++--
.../main/java/org/apache/maven/DefaultMaven.java | 7 +++++++
+ .../main/java/org/apache/maven/ReactorReader.java | 4 ++--
.../apache/maven/plugin/MavenPluginValidator.java | 5 ++++-
.../internal/DefaultPluginVersionResolver.java | 9 +++++++++
.../apache/maven/project/ProjectModelResolver.java | 9 +++++++++
.../project/artifact/MavenMetadataSource.java | 9 +++++++++
.../model/validation/DefaultModelValidator.java | 16 +++++++++++++---
- 8 files changed, 68 insertions(+), 6 deletions(-)
+ 9 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index cae3735..2d11d64 100644
@@ -95,6 +96,28 @@ index e892ee9..0222b01 100644
DefaultSettingsDecryptionRequest decrypt = new DefaultSettingsDecryptionRequest();
decrypt.setProxies( request.getProxies() );
decrypt.setServers( request.getServers() );
+diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+index 62e181a..3d08c65 100644
+--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
++++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+@@ -216,7 +216,7 @@ class ReactorReader
+
+ public File findArtifact( Artifact artifact )
+ {
+- String projectKey = artifact.getGroupId() + ':' + artifact.getArtifactId() + ':' + artifact.getVersion();
++ String projectKey = ArtifactUtils.key( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
+
+ MavenProject project = projectsByGAV.get( projectKey );
+
+@@ -230,7 +230,7 @@ class ReactorReader
+
+ public List<String> findVersions( Artifact artifact )
+ {
+- String key = artifact.getGroupId() + ':' + artifact.getArtifactId();
++ String key = ArtifactUtils.versionlessKey( artifact.getGroupId(), artifact.getArtifactId() );
+
+ List<MavenProject> projects = projectsByGA.get( key );
+ if ( projects == null || projects.isEmpty() )
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
index 009635b..7d03748 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
diff --git a/maven-script-local b/maven-script-local
index 7763429..bdbc22e 100644
--- a/maven-script-local
+++ b/maven-script-local
@@ -40,4 +40,8 @@ fi
export M2_HOME=/usr/share/maven
echo $JAVA_HOME
export JAVA_HOME
-$M2_HOME/bin/mvn -o -Dmaven.jpp.mode ${local_add} "$@"
+# can't put it on command line due to
+# http://jira.codehaus.org/browse/SUREFIRE-121
+export MAVEN_OPTS="-Dmaven.jpp.mode ${local_add}"
+
+$M2_HOME/bin/mvn -o "$@"
diff --git a/maven.spec b/maven.spec
index 534d800..c3f6a82 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,7 +1,7 @@
Name: maven
-Version: 3.0
-Release: 6%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -46,7 +46,9 @@ BuildRequires: plexus-containers-container-default
BuildRequires: animal-sniffer >= 1.6-5
BuildRequires: mojo-parent
BuildRequires: atinject
-BuildRequires: aether
+BuildRequires: aether >= 1.9
+BuildRequires: async-http-client
+BuildRequires: sonatype-oss-parent
BuildRequires: sisu
BuildRequires: google-guice
BuildRequires: hamcrest
@@ -67,7 +69,9 @@ Requires: plexus-utils
Requires: xbean
Requires: xerces-j2
Requires: maven-wagon
-Requires: aether
+Requires: aether >= 1.9
+Requires: async-http-client
+Requires: sonatype-oss-parent
Requires: sisu
Requires: google-guice
Requires: atinject
@@ -112,11 +116,6 @@ sed -i 's:<scope>runtime</scope>::' maven-core/pom.xml
# not really used during build, but a precaution
rm maven-ant-tasks-*.jar
-# these fail only with patch 201. No idea why (since that is activated
-# only with maven2.jpp.mode=true
-rm maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
-rm maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java
-
# fix line endings
sed -i 's:\r::' *.txt
@@ -136,8 +135,10 @@ popd
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
+# temporary ignore of failures in maven-compat
mvn-jpp -e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven.test.failure.ignore=true \
install javadoc:aggregate
mkdir m2home
@@ -308,6 +309,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog
+* 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
+
* Wed Jan 12 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0-6
- Fix bug #669034
13 years, 3 months
[async-http-client] Initial commit
by Stanislav Ochotnicky
commit 8eadeaf2d37fc69e153151d98864707d2e3cab16
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jan 28 09:06:53 2011 +0100
Initial commit
.gitignore | 1 +
0001-Remove-test-dependencies.patch | 107 ++++++++++++++++++++++++++++++++++
async-http-client.spec | 110 +++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 219 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b71727d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/AsyncHttpClient-async-http-client-async-http-client-1.4.1-0-g5ce359e.tar.gz
diff --git a/0001-Remove-test-dependencies.patch b/0001-Remove-test-dependencies.patch
new file mode 100644
index 0000000..9147405
--- /dev/null
+++ b/0001-Remove-test-dependencies.patch
@@ -0,0 +1,107 @@
+From d868287aa574cbb64d1dcdc159e470b984ae379f Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 17 Jan 2011 12:53:27 +0100
+Subject: [PATCH] Remove test dependencies
+
+these are missing in fedora repos for now
+---
+ pom.xml | 76 ---------------------------------------------------------------
+ 1 files changed, 0 insertions(+), 76 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 4c7bbed..5e6234b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -80,68 +80,6 @@
+ <version>1.6.1</version>
+ </dependency>
+
+- <!-- Test dependencies -->
+- <dependency>
+- <groupId>ch.qos.logback</groupId>
+- <artifactId>logback-classic</artifactId>
+- <version>0.9.26</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>log4j</groupId>
+- <artifactId>log4j</artifactId>
+- <version>1.2.13</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.testng</groupId>
+- <artifactId>testng</artifactId>
+- <version>5.8</version>
+- <scope>test</scope>
+- <classifier>jdk15</classifier>
+- </dependency>
+- <dependency>
+- <groupId>org.eclipse.jetty</groupId>
+- <artifactId>jetty-server</artifactId>
+- <version>7.1.4.v20100610</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.eclipse.jetty</groupId>
+- <artifactId>jetty-servlet</artifactId>
+- <version>7.1.4.v20100610</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.eclipse.jetty</groupId>
+- <artifactId>jetty-servlets</artifactId>
+- <version>7.1.4.v20100610</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.eclipse.jetty</groupId>
+- <artifactId>jetty-security</artifactId>
+- <version>7.1.4.v20100610</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.tomcat</groupId>
+- <artifactId>coyote</artifactId>
+- <version>6.0.29</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.tomcat</groupId>
+- <artifactId>catalina</artifactId>
+- <version>6.0.29</version>
+- <scope>test</scope>
+- <exclusions>
+- <exclusion>
+- <artifactId>servlet-api</artifactId>
+- <groupId>org.apache.tomcat</groupId>
+- </exclusion>
+- </exclusions>
+- </dependency>
+
+ <!-- Optional Apache Http Client -->
+ <dependency>
+@@ -163,20 +101,6 @@
+ <optional>true</optional>
+ </dependency>
+
+- <dependency>
+- <groupId>org.sonatype.http-testing-harness</groupId>
+- <artifactId>testng-runner</artifactId>
+- <version>0.3</version>
+- <type>jar</type>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.sonatype.http-testing-harness</groupId>
+- <artifactId>server-provider</artifactId>
+- <version>0.3</version>
+- <type>jar</type>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+ <build>
+ <defaultGoal>install</defaultGoal>
+--
+1.7.3.4
+
diff --git a/async-http-client.spec b/async-http-client.spec
new file mode 100644
index 0000000..8c671f4
--- /dev/null
+++ b/async-http-client.spec
@@ -0,0 +1,110 @@
+%global githash 5ce359e
+%global dirhash a691a35
+Name: async-http-client
+Version: 1.4.1
+
+
+Release: 2%{?dist}
+Summary: Asynchronous Http Client for Java
+
+Group: Development/Libraries
+License: ASL 2.0
+URL: https://github.com/AsyncHttpClient/%{name}
+# it seems github has redirects plus it generates tarball on the fly
+# to get tarball go to https://github.com/AsyncHttpClient/async-http-client/archives/async-http-...
+# click "downloads" in upper right corner
+# click "download .tar.gz"
+Source0: AsyncHttpClient-%{name}-%{name}-%{version}-0-g%{githash}.tar.gz
+
+Patch0: 0001-Remove-test-dependencies.patch
+
+BuildArch: noarch
+
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-shade-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-release-plugin
+BuildRequires: sonatype-oss-parent
+BuildRequires: netty
+
+Requires: netty
+Requires: java >= 1:1.6.0
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+
+%description
+Async Http Client library purpose is to allow Java applications to
+easily execute HTTP requests and asynchronously process the HTTP
+responses. The Async HTTP Client library is simple to use.
+
+
+%package javadoc
+Summary: API documentation for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+%{summary}.
+
+%prep
+# last part will have to change every time
+%setup -q -n AsyncHttpClient-%{name}-%{dirhash}
+
+%patch0 -p1
+
+%build
+# we don't have all test dependencies available so disable tests
+mvn-local -e \
+ -Dmaven.test.skip=true \
+ install javadoc:aggregate
+
+
+%install
+
+install -d -m 755 %{buildroot}%{_javadir}/
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap com.ning %{name} %{version} JPP %{name}
+
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+
+%files
+%defattr(-,root,root,-)
+%doc README changelog.html LICENSE-2.0.txt
+%{_javadir}/%{name}.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc LICENSE-2.0.txt
+%{_javadocdir}/%{name}
+
+
+
+%changelog
+* Wed Jan 26 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.4.1-2
+- Add maven-shade-plugin to BR
+
+* Mon Jan 17 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.4.1-1
+- Initial version
+
diff --git a/sources b/sources
index e69de29..3bef80e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+86ec6d2bd9211cb50cfed40ae40810fe AsyncHttpClient-async-http-client-async-http-client-1.4.1-0-g5ce359e.tar.gz
13 years, 3 months
Broken dependencies: maven2
by Fedora Koji Build System
maven2 has broken dependencies in the rawhide tree:
On x86_64:
maven2-2.2.1-20.fc15.noarch requires modello
On i386:
maven2-2.2.1-20.fc15.noarch requires modello
Please resolve this as soon as possible.
13 years, 3 months
Broken dependencies: maven-scm
by Fedora Koji Build System
maven-scm has broken dependencies in the rawhide tree:
On x86_64:
maven-scm-1.4-5.fc15.noarch requires modello >= 0:1.0-0.a8
On i386:
maven-scm-1.4-5.fc15.noarch requires modello >= 0:1.0-0.a8
Please resolve this as soon as possible.
13 years, 3 months
Broken dependencies: ant
by Fedora Koji Build System
ant has broken dependencies in the rawhide tree:
On x86_64:
ant-scripts-1.8.2-1.fc15.noarch requires /usr/bin/perl
On i386:
ant-scripts-1.8.2-1.fc15.noarch requires /usr/bin/perl
Please resolve this as soon as possible.
13 years, 3 months