From bcc1f05f8be8eac3ecb4786509e736b008a36504 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 Jan 2013 16:17:03 +0100 Subject: [PATCH 1/3] Update to upstream version 3.0 - Build with xmvn - Install license files, resolves: rhbz#895544 --- .gitignore | 1 + maven-compiler-plugin.spec | 71 ++++++++++++-------------------------- sources | 2 +- 3 files changed, 24 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 40dc02f..adebbfd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ maven-compiler-plugin-2.0.2.tar.xz /maven-compiler-plugin-2.3.2.tar.xz /maven-compiler-plugin-2.4.tar.xz /maven-compiler-plugin-2.5.1-source-release.zip +/maven-compiler-plugin-3.0-source-release.zip diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index b8087ba..10ff67e 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,6 +1,6 @@ Name: maven-compiler-plugin -Version: 2.5.1 -Release: 2%{?dist} +Version: 3.0 +Release: 1%{?dist} Summary: Maven Compiler Plugin Group: Development/Libraries @@ -10,28 +10,15 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/% BuildArch: noarch -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: maven -BuildRequires: maven-plugin-plugin -BuildRequires: maven-compiler-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: maven-doxia-sitetools -BuildRequires: maven-plugin-testing-harness -BuildRequires: maven-toolchain -BuildRequires: plexus-utils -BuildRequires: plexus-compiler - -Requires: maven -Requires: maven-toolchain -Requires: plexus-utils -Requires: plexus-compiler -Requires: jpackage-utils -Requires: java +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: xmvn >= 0.2.4 +BuildRequires: maven-plugin-plugin +BuildRequires: maven-shared-incremental +BuildRequires: maven-surefire-provider-junit +BuildRequires: maven-doxia-sitetools +BuildRequires: maven-plugin-testing-harness +BuildRequires: maven-toolchain +BuildRequires: plexus-compiler >= 2.0 Provides: maven2-plugin-compiler = %{version}-%{release} Obsoletes: maven2-plugin-compiler <= 0:2.0.8 @@ -42,45 +29,31 @@ The Compiler Plugin is used to compile the sources of your project. %package javadoc Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc API documentation for %{name}. - %prep %setup -q %build -mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore +%mvn_build -f %install +%mvn_install -# jars -install -d -m 0755 %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +%files -f .mfiles +%doc LICENSE NOTICE -# poms -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom - - -%add_maven_depmap JPP-%{name}.pom %{name}.jar - -# javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} - -%files -%{_javadir}/* -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* - -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE %changelog +* Tue Jan 15 2013 Mikolaj Izdebski - 3.0-1 +- Update to upstream version 3.0 +- Build with xmvn +- Install license files, resolves: rhbz#895544 + * Thu Jul 19 2012 Fedora Release Engineering - 2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 9bacdc0..f53fb28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -586235ad82136608c9a7ee7d9d994e9f maven-compiler-plugin-2.5.1-source-release.zip +d7236609116c82bd6071a05f962ebd46 maven-compiler-plugin-3.0-source-release.zip From d7d25f27672bc02e14f85f86a226cb7b5d59b476 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 4 Mar 2013 15:53:12 +0100 Subject: [PATCH 2/3] Update to version 3.0 - use modified artifactIds for plexus-compiler --- ...nst-newer-version-of-plexus-compiler.patch | 43 +++++++++++++++++++ maven-compiler-plugin.spec | 5 ++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 0001-Build-against-newer-version-of-plexus-compiler.patch diff --git a/0001-Build-against-newer-version-of-plexus-compiler.patch b/0001-Build-against-newer-version-of-plexus-compiler.patch new file mode 100644 index 0000000..492c05d --- /dev/null +++ b/0001-Build-against-newer-version-of-plexus-compiler.patch @@ -0,0 +1,43 @@ +From 9a4756bfc63ed777a1326bd40345a4209564d3d8 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Mon, 4 Mar 2013 14:19:19 +0100 +Subject: [PATCH] Build against newer version of plexus-compiler + +--- + pom.xml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 58b2c49..dd77b84 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -138,7 +138,7 @@ under the License. + + + org.codehaus.plexus +- plexus-compiler-api ++ plexus-compiler-api-temp + ${plexusCompilerVersion} + + +@@ -149,7 +149,7 @@ under the License. + + + org.codehaus.plexus +- plexus-compiler-manager ++ plexus-compiler-manager-temp + ${plexusCompilerVersion} + + +@@ -160,7 +160,7 @@ under the License. + + + org.codehaus.plexus +- plexus-compiler-javac ++ plexus-compiler-javac-temp + ${plexusCompilerVersion} + runtime + +-- +1.8.1.2 + diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 10ff67e..e9f8c01 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -7,11 +7,12 @@ Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-compiler-plugin Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip +Patch0: 0001-Build-against-newer-version-of-plexus-compiler.patch BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: xmvn >= 0.2.4 +BuildRequires: maven-local BuildRequires: maven-plugin-plugin BuildRequires: maven-shared-incremental BuildRequires: maven-surefire-provider-junit @@ -36,6 +37,8 @@ API documentation for %{name}. %prep %setup -q +%patch0 -p1 + %build %mvn_build -f From f200eda5283e5853b3b63d30123928eb225a84ee Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 4 Mar 2013 17:32:55 +0100 Subject: [PATCH 3/3] Build against proper plexus-compiler --- ...nst-newer-version-of-plexus-compiler.patch | 43 ------------------- maven-compiler-plugin.spec | 8 ++-- 2 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 0001-Build-against-newer-version-of-plexus-compiler.patch diff --git a/0001-Build-against-newer-version-of-plexus-compiler.patch b/0001-Build-against-newer-version-of-plexus-compiler.patch deleted file mode 100644 index 492c05d..0000000 --- a/0001-Build-against-newer-version-of-plexus-compiler.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9a4756bfc63ed777a1326bd40345a4209564d3d8 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Mon, 4 Mar 2013 14:19:19 +0100 -Subject: [PATCH] Build against newer version of plexus-compiler - ---- - pom.xml | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 58b2c49..dd77b84 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -138,7 +138,7 @@ under the License. - - - org.codehaus.plexus -- plexus-compiler-api -+ plexus-compiler-api-temp - ${plexusCompilerVersion} - - -@@ -149,7 +149,7 @@ under the License. - - - org.codehaus.plexus -- plexus-compiler-manager -+ plexus-compiler-manager-temp - ${plexusCompilerVersion} - - -@@ -160,7 +160,7 @@ under the License. - - - org.codehaus.plexus -- plexus-compiler-javac -+ plexus-compiler-javac-temp - ${plexusCompilerVersion} - runtime - --- -1.8.1.2 - diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index e9f8c01..f9d7f10 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,13 +1,12 @@ Name: maven-compiler-plugin Version: 3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Compiler Plugin Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-compiler-plugin Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: 0001-Build-against-newer-version-of-plexus-compiler.patch BuildArch: noarch @@ -37,8 +36,6 @@ API documentation for %{name}. %prep %setup -q -%patch0 -p1 - %build %mvn_build -f @@ -52,6 +49,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Tue Mar 05 2013 Michal Srb - 3.0-2 +- Build against proper plexus-compiler + * Tue Jan 15 2013 Mikolaj Izdebski - 3.0-1 - Update to upstream version 3.0 - Build with xmvn