[java-sig-commits] [maven] Make javadoc noarch
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Feb 10 13:57:17 UTC 2012
commit 7dbeeb52a24d377920d3d664c7bdfde3ea382ab2
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Thu Feb 9 11:18:25 2012 +0100
Make javadoc noarch
- Make compilation source level 1.5
0001-Add-plugin-api-deps.patch | 2 +-
0002-Use-custom-resolver.patch | 2 +-
0003-Use-utf-8-source-encoding.patch | 2 +-
...-text-scope-skipping-with-maven.test.skip.patch | 2 +-
0005-Use-generics-in-modello-generated-code.patch | 2 +-
...ake-compiler-plugin-default-to-source-1.5.patch | 33 ++++++++++++++++++++
maven.spec | 16 ++++++++--
7 files changed, 51 insertions(+), 8 deletions(-)
---
diff --git a/0001-Add-plugin-api-deps.patch b/0001-Add-plugin-api-deps.patch
index 1d1a81f..3f264d7 100644
--- a/0001-Add-plugin-api-deps.patch
+++ b/0001-Add-plugin-api-deps.patch
@@ -1,7 +1,7 @@
From d0dbdcde31414336340a5089fecf4f93cb5125ad Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 12 Oct 2010 16:56:50 +0200
-Subject: [PATCH 1/5] Add plugin-api deps
+Subject: [PATCH 1/6] Add plugin-api deps
---
maven-plugin-api/pom.xml | 5 +++++
diff --git a/0002-Use-custom-resolver.patch b/0002-Use-custom-resolver.patch
index 596f52d..0be399c 100644
--- a/0002-Use-custom-resolver.patch
+++ b/0002-Use-custom-resolver.patch
@@ -1,7 +1,7 @@
From 46e6dbc205065a670fa3b6e7c41e02e30b2fdb7a Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 18 Jan 2011 11:09:32 +0100
-Subject: [PATCH 2/5] Use custom resolver
+Subject: [PATCH 2/6] Use custom resolver
WorkspaceReader is used to resolve main dependencies, but we had to
add this resolve to ProjectModelResolver and DefaultModelResolver as
diff --git a/0003-Use-utf-8-source-encoding.patch b/0003-Use-utf-8-source-encoding.patch
index 98d7d4a..fe1a713 100644
--- a/0003-Use-utf-8-source-encoding.patch
+++ b/0003-Use-utf-8-source-encoding.patch
@@ -1,7 +1,7 @@
From b38e59d0512fed8f376fcbdea71204b04cdee1cb Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon, 22 Aug 2011 15:59:53 +0200
-Subject: [PATCH 3/5] Use utf-8 source encoding
+Subject: [PATCH 3/6] Use utf-8 source encoding
---
pom.xml | 1 +
diff --git a/0004-Fix-text-scope-skipping-with-maven.test.skip.patch b/0004-Fix-text-scope-skipping-with-maven.test.skip.patch
index 02591e1..43bdabe 100644
--- a/0004-Fix-text-scope-skipping-with-maven.test.skip.patch
+++ b/0004-Fix-text-scope-skipping-with-maven.test.skip.patch
@@ -1,7 +1,7 @@
From c626f99ce509b9a505d2ced39efd7ae7c748d71e Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 30 Aug 2011 11:44:42 +0200
-Subject: [PATCH 4/5] Fix text scope skipping with maven.test.skip
+Subject: [PATCH 4/6] Fix text scope skipping with maven.test.skip
Previously maven put test dependencies into dependency graph even when
"maven.test.skip" was true, therefore. This patch fixes that with few
diff --git a/0005-Use-generics-in-modello-generated-code.patch b/0005-Use-generics-in-modello-generated-code.patch
index a4d2c68..b2d3310 100644
--- a/0005-Use-generics-in-modello-generated-code.patch
+++ b/0005-Use-generics-in-modello-generated-code.patch
@@ -1,7 +1,7 @@
From 1c572bcc5083b79307ab0c0e4ee9ba15e334c7d3 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 31 Jan 2012 13:12:32 +0100
-Subject: [PATCH 5/5] Use generics in modello generated code
+Subject: [PATCH 5/6] Use generics in modello generated code
---
maven-model/pom.xml | 2 ++
diff --git a/0006-Make-compiler-plugin-default-to-source-1.5.patch b/0006-Make-compiler-plugin-default-to-source-1.5.patch
new file mode 100644
index 0000000..2bf709c
--- /dev/null
+++ b/0006-Make-compiler-plugin-default-to-source-1.5.patch
@@ -0,0 +1,33 @@
+From 62e01ae45ea1da847e4cabdcbd64950654f9d4a5 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Thu, 9 Feb 2012 11:11:26 +0100
+Subject: [PATCH 6/6] Make compiler plugin default to source 1.5
+
+This will help with modello problems and is generally better probably
+---
+ pom.xml | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c55f33c..fd27b03 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -393,6 +393,15 @@
+ <pluginManagement>
+ <plugins>
+ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <version>2.1</version>
++ <configuration>
++ <source>1.5</source>
++ <target>1.5</target>
++ </configuration>
++ </plugin>
++ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>${plexusVersion}</version>
+--
+1.7.7.6
+
diff --git a/maven.spec b/maven.spec
index 83cdd22..883c391 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -32,6 +32,8 @@ Source250: repo-metadata.tar.xz
# Patch1XX could be upstreamed probably
Patch100: 0005-Use-generics-in-modello-generated-code.patch
+Patch101: 0006-Make-compiler-plugin-default-to-source-1.5.patch
+
# Patch15X are already upstream
Patch150: 0001-Add-plugin-api-deps.patch
Patch151: 0003-Use-utf-8-source-encoding.patch
@@ -111,17 +113,19 @@ reporting and documentation from a central piece of information.
Summary: API documentation for %{name}
Group: Documentation
Requires: jpackage-utils
+BuildArch: noarch
%description javadoc
%{summary}.
%prep
%setup -q -n apache-%{name}-%{version}%{?ver_add}
-%patch100 -p1
%patch150 -p1
%patch151 -p1
%patch200 -p1
%patch201 -p1
+%patch100 -p1
+%patch101 -p1
# get custom resolver in place
mkdir -p maven-aether-provider/src/main/java/org/apache/maven/artifact/resolver \
@@ -156,7 +160,8 @@ mvn-rpmbuild -e install javadoc:aggregate
mkdir m2home
(cd m2home
-tar xvf ../apache-maven/target/*tar.gz
+tar --delay-directory-restore -xvf ../apache-maven/target/*tar.gz
+chmod -R +rwX apache-%{name}-%{version}%{?ver_add}
chmod -x apache-%{name}-%{version}%{?ver_add}/conf/settings.xml
)
@@ -340,6 +345,11 @@ install -Dm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
%changelog
+* Thu Feb 9 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.4-2
+- Make javadoc noarch
+- Make compilation source level 1.5
+- Fix borked tarball unpacking (reason unknown)
+
* Tue Jan 31 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.4-1
- Update to latest upstream version
More information about the java-sig-commits
mailing list