From 964139d799696b1a78a72c3b59a96f6c66e6b217 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 Jan 2013 16:40:37 +0100 Subject: [PATCH 1/7] Update to upstream version 2.1 - Build with xmvn --- .gitignore | 1 + plexus-compiler-ignoreOptionalProblems.patch | 18 ---- plexus-compiler.spec | 106 ++++--------------- sources | 2 +- 4 files changed, 23 insertions(+), 104 deletions(-) delete mode 100644 plexus-compiler-ignoreOptionalProblems.patch diff --git a/.gitignore b/.gitignore index 1978db1..bd58cd8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ plexus-compiler-1.5.2.tar.gz /sonatype-plexus-components-plexus-compiler-1.8-0-g7ca7d76.tar.gz sonatype-plexus-compiler-plexus-compiler-1.8.3-0-gef6142f.tar.gz /sonatype-plexus-compiler-plexus-compiler-1.9.1-0-g233d1ab.tar.gz +/plexus-compiler-2.1.tar.gz diff --git a/plexus-compiler-ignoreOptionalProblems.patch b/plexus-compiler-ignoreOptionalProblems.patch deleted file mode 100644 index a7b9877..0000000 --- a/plexus-compiler-ignoreOptionalProblems.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java -index 49d890d..b6952b9 100644 ---- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java -+++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java -@@ -404,6 +404,13 @@ public class EclipseJavaCompiler - - return result; - } -+ -+ // added in recent JDT versions -+ public boolean ignoreOptionalProblems() -+ { -+ return false; -+ } -+ - } - - private class EclipseCompilerINameEnvironment diff --git a/plexus-compiler.spec b/plexus-compiler.spec index eee0e2b..1f29f03 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -29,11 +29,11 @@ # %global parent plexus -%global dirhash 56a0f9b +%global dirhash 16e340d Name: plexus-compiler -Version: 1.9.2 -Release: 3%{?dist} +Version: 2.1 +Release: 1%{?dist} Epoch: 0 Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing @@ -44,8 +44,6 @@ URL: http://plexus.codehaus.org/ Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz -Patch0: plexus-compiler-ignoreOptionalProblems.patch - BuildArch: noarch BuildRequires: maven BuildRequires: jpackage-utils @@ -58,11 +56,6 @@ BuildRequires: plexus-containers-component-metadata BuildRequires: junit4 BuildRequires: plexus-pom -Requires: classworlds -Requires: plexus-containers-container-default -Requires: plexus-utils -Requires: junit4 - %description Plexus Compiler adds support for using various compilers from a unified api. Support for javac is available in main package. For @@ -70,29 +63,29 @@ additional compilers see %{name}-extras package. %package extras Summary: Extra compiler support for %{name} -Group: Development/Libraries # ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/ # ...codehaus/plexus/compiler/csharp/CSharpCompiler.java # ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java License: MIT and ASL 2.0 and ASL 1.1 -Requires: jpackage-utils -Requires: eclipse-ecj -Requires: %{name} = %{version}-%{release} %description extras Additional support for csharp, eclipse and jikes compilers +%package pom +Summary: Maven POM files for %{name} + +%description pom +This package provides %{summary}. + %package javadoc Summary: Javadoc for %{name} Group: Documentation -Requires: jpackage-utils %description javadoc API documentation for %{name}. %prep %setup -q -n sonatype-plexus-compiler-%{dirhash} -%patch0 -p1 %pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml @@ -100,83 +93,26 @@ API documentation for %{name}. %pom_disable_module plexus-compiler-test %build -mvn-rpmbuild -e \ - -Dmaven.test.skip=true \ - install javadoc:aggregate - +%mvn_package ":plexus-compiler{,s}" pom +%mvn_package ":*{csharp,eclipse,jikes}*" extras +# Tests are skipped because of unavailable plexus-compiler-test artifact +%mvn_build -f %install -# jars -install -d -m 755 %{buildroot}%{_javadir}/%{parent} -install -d -m 755 %{buildroot}%{_mavenpomdir} +%mvn_install -for mod in plexus-compiler-{api,manager}; do - jarname=${mod/plexus-} - install -pm 644 $mod/target/${mod}-%{version}.jar \ - %{buildroot}%{_javadir}/%{parent}/$jarname.jar - - install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-$jarname.pom - %add_maven_depmap JPP.%{parent}-$jarname.pom %{parent}/$jarname.jar -done - -pushd plexus-compilers -for mod in plexus-compiler-{csharp,eclipse,jikes,javac}; do - jarname=${mod/plexus-} - install -pm 644 $mod/target/${mod}-%{version}.jar \ - %{buildroot}%{_javadir}/%{parent}/$jarname.jar - - install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-$jarname.pom - %add_maven_depmap JPP.%{parent}-$jarname.pom %{parent}/$jarname.jar -f extras -done - -install -pm 644 plexus-compiler-javac/target/plexus-compiler-javac-%{version}.jar \ - %{buildroot}%{_javadir}/%{parent}/compiler-javac.jar - -install -pm 644 plexus-compiler-javac/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compiler-javac.pom -%add_maven_depmap JPP.%{parent}-compiler-javac.pom %{parent}/compiler-javac.jar - -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compilers.pom -%add_maven_depmap JPP.%{parent}-compilers.pom -popd - -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compiler.pom -%add_maven_depmap JPP.%{parent}-compiler.pom - - -# javadocs -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%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 -%{_javadir}/%{parent}/compiler-api.jar -%{_javadir}/%{parent}/compiler-manager.jar -%{_javadir}/%{parent}/compiler-javac.jar -%{_mavenpomdir}/JPP.%{parent}-compilers.pom -%{_mavenpomdir}/JPP.%{parent}-compiler.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-api.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-manager.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-javac.pom -%{_mavendepmapfragdir}/%{name} - -%files extras -%{_mavendepmapfragdir}/%{name}-extras -%{_javadir}/%{parent}/compiler-csharp.jar -%{_javadir}/%{parent}/compiler-eclipse.jar -%{_javadir}/%{parent}/compiler-jikes.jar -%{_mavenpomdir}/JPP.%{parent}-compiler-jikes.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-eclipse.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-csharp.pom +%files -f .mfiles +%files extras -f .mfiles-extras +%files pom -f .mfiles-pom %files javadoc %doc %{_javadocdir}/%{name} %changelog +* Wed Jan 23 2013 Mikolaj Izdebski - 0:2.1-1 +- Update to upstream version 2.1 +- Build with xmvn + * Wed Dec 5 2012 Michal Srb - 0:1.9.2-3 - Replaced dependency to plexus-container-default with plexus-containers-container-default diff --git a/sources b/sources index 2be2e4b..21ec3cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -623e888e90e834c2e57d943732bc2453 plexus-compiler-1.9.2.tar.gz +b5a2e177eda83ad4b70488f6d4b93a3b plexus-compiler-2.1.tar.gz From 201f45333b87b34426700f43643c8ec3d9b5b070 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 4 Mar 2013 15:32:04 +0100 Subject: [PATCH 2/7] Update to version 2.1 - preserve older JARs and POMs, so we will be able to update maven-compiler-plugin --- 0001-change-artifactIds.patch | 184 ++++++++++++++++++++++++++++++++++ plexus-compiler.spec | 34 ++++++- 2 files changed, 216 insertions(+), 2 deletions(-) create mode 100644 0001-change-artifactIds.patch diff --git a/0001-change-artifactIds.patch b/0001-change-artifactIds.patch new file mode 100644 index 0000000..b1838e4 --- /dev/null +++ b/0001-change-artifactIds.patch @@ -0,0 +1,184 @@ +From b86f70e56a7e9e23564f7c7794c7ed39e13bc4e2 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Mon, 4 Mar 2013 13:53:57 +0100 +Subject: [PATCH] change artifactIds + +--- + plexus-compiler-api/pom.xml | 4 ++-- + plexus-compiler-manager/pom.xml | 6 +++--- + plexus-compilers/plexus-compiler-csharp/pom.xml | 4 ++-- + plexus-compilers/plexus-compiler-eclipse/pom.xml | 4 ++-- + plexus-compilers/plexus-compiler-javac/pom.xml | 4 ++-- + plexus-compilers/plexus-compiler-jikes/pom.xml | 4 ++-- + plexus-compilers/pom.xml | 6 +++--- + pom.xml | 4 ++-- + 8 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/plexus-compiler-api/pom.xml b/plexus-compiler-api/pom.xml +index 3edcf43..dfce09a 100644 +--- a/plexus-compiler-api/pom.xml ++++ b/plexus-compiler-api/pom.xml +@@ -4,11 +4,11 @@ + + + org.codehaus.plexus +- plexus-compiler ++ plexus-compiler-temp + 2.1 + + +- plexus-compiler-api ++ plexus-compiler-api-temp + + Plexus Compiler Api + Plexus Compilers component's API to manipulate compilers. +diff --git a/plexus-compiler-manager/pom.xml b/plexus-compiler-manager/pom.xml +index 8e8e561..0247f23 100644 +--- a/plexus-compiler-manager/pom.xml ++++ b/plexus-compiler-manager/pom.xml +@@ -4,18 +4,18 @@ + + + org.codehaus.plexus +- plexus-compiler ++ plexus-compiler-temp + 2.1 + + +- plexus-compiler-manager ++ plexus-compiler-manager-temp + + Plexus Compiler Manager + + + + org.codehaus.plexus +- plexus-compiler-api ++ plexus-compiler-api-temp + + + +diff --git a/plexus-compilers/plexus-compiler-csharp/pom.xml b/plexus-compilers/plexus-compiler-csharp/pom.xml +index a069836..aaeec22 100644 +--- a/plexus-compilers/plexus-compiler-csharp/pom.xml ++++ b/plexus-compilers/plexus-compiler-csharp/pom.xml +@@ -4,11 +4,11 @@ + + + org.codehaus.plexus +- plexus-compilers ++ plexus-compilers-temp + 2.1 + + +- plexus-compiler-csharp ++ plexus-compiler-csharp-temp + + Plexus C# Compiler + C# Compiler support for Plexus Compiler component. +diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml +index 5040ba7..d7812c5 100644 +--- a/plexus-compilers/plexus-compiler-eclipse/pom.xml ++++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml +@@ -4,11 +4,11 @@ + + + org.codehaus.plexus +- plexus-compilers ++ plexus-compilers-temp + 2.1 + + +- plexus-compiler-eclipse ++ plexus-compiler-eclipse-temp + + Plexus Eclipse Compiler + Eclipse Compiler support for Plexus Compiler component. +diff --git a/plexus-compilers/plexus-compiler-javac/pom.xml b/plexus-compilers/plexus-compiler-javac/pom.xml +index 24971bf..65493df 100644 +--- a/plexus-compilers/plexus-compiler-javac/pom.xml ++++ b/plexus-compilers/plexus-compiler-javac/pom.xml +@@ -4,11 +4,11 @@ + + + org.codehaus.plexus +- plexus-compilers ++ plexus-compilers-temp + 2.1 + + +- plexus-compiler-javac ++ plexus-compiler-javac-temp + + Plexus Javac Component + Javac Compiler support for Plexus Compiler component. +diff --git a/plexus-compilers/plexus-compiler-jikes/pom.xml b/plexus-compilers/plexus-compiler-jikes/pom.xml +index b81ec41..20efed5 100644 +--- a/plexus-compilers/plexus-compiler-jikes/pom.xml ++++ b/plexus-compilers/plexus-compiler-jikes/pom.xml +@@ -4,11 +4,11 @@ + + + org.codehaus.plexus +- plexus-compilers ++ plexus-compilers-temp + 2.1 + + +- plexus-compiler-jikes ++ plexus-compiler-jikes-temp + + Plexus Jikes Compiler + Jikes Compiler support for Plexus Compiler component. +diff --git a/plexus-compilers/pom.xml b/plexus-compilers/pom.xml +index a20a7c7..886aab9 100644 +--- a/plexus-compilers/pom.xml ++++ b/plexus-compilers/pom.xml +@@ -4,11 +4,11 @@ + + + org.codehaus.plexus +- plexus-compiler ++ plexus-compiler-temp + 2.1 + + +- plexus-compilers ++ plexus-compilers-temp + pom + + Plexus Compilers +@@ -29,7 +29,7 @@ + + + org.codehaus.plexus +- plexus-compiler-api ++ plexus-compiler-api-temp + + + org.codehaus.plexus +diff --git a/pom.xml b/pom.xml +index 5dd60df..153aa5c 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -9,7 +9,7 @@ + 1.3.1 + + +- plexus-compiler ++ plexus-compiler-temp + 2.1 + pom + +@@ -38,7 +38,7 @@ + + + org.codehaus.plexus +- plexus-compiler-api ++ plexus-compiler-api-temp + ${project.version} + + +-- +1.8.1.2 + diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 1f29f03..5eb8980 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -43,12 +43,14 @@ Group: Development/Java URL: http://plexus.codehaus.org/ Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz +Patch0: 0001-change-artifactIds.patch BuildArch: noarch -BuildRequires: maven +BuildRequires: maven-local BuildRequires: jpackage-utils BuildRequires: junit BuildRequires: classworlds +BuildRequires: plexus-compiler-extras BuildRequires: eclipse-ecj BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils @@ -87,13 +89,16 @@ API documentation for %{name}. %prep %setup -q -n sonatype-plexus-compiler-%{dirhash} +%patch0 -p1 + %pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml # don't build/install compiler-test module, it needs maven2 test harness %pom_disable_module plexus-compiler-test %build -%mvn_package ":plexus-compiler{,s}" pom +%mvn_package ":plexus-compiler-temp" pom +%mvn_package ":plexus-compilers-temp" pom %mvn_package ":*{csharp,eclipse,jikes}*" extras # Tests are skipped because of unavailable plexus-compiler-test artifact %mvn_build -f @@ -101,7 +106,32 @@ API documentation for %{name}. %install %mvn_install +# only temporary solution +# we need to preserve older JARs and POMs for a while, because current maven-compiler-plugin +# won't work with this newer version of plexus-compiler and we can't update maven-compiler-plugin +# because it requires this newer version of plexus-compiler. +# thus temporarly we need both versions of plexus-compiler +install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus +cp /usr/share/java/plexus/compiler-api.jar %{buildroot}/usr/share/java/plexus/compiler-api.jar +cp /usr/share/java/plexus/compiler-javac.jar %{buildroot}/usr/share/java/plexus/compiler-javac.jar +cp /usr/share/java/plexus/compiler-manager.jar %{buildroot}/usr/share/java/plexus/compiler-manager.jar +cp /usr/share/java/plexus/compiler-csharp.jar %{buildroot}/usr/share/java/plexus/compiler-csharp.jar +cp /usr/share/java/plexus/compiler-eclipse.jar %{buildroot}/usr/share/java/plexus/compiler-eclipse.jar +cp /usr/share/java/plexus/compiler-jikes.jar %{buildroot}/usr/share/java/plexus/compiler-jikes.jar +cp /usr/share/maven-poms/JPP.plexus-compiler-api.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-api.pom +cp /usr/share/maven-poms/JPP.plexus-compiler-javac.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-javac.pom +cp /usr/share/maven-poms/JPP.plexus-compiler-manager.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-manager.pom +cp /usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus@plexus-compiler.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus@plexus-compiler.pom +cp /usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus@plexus-compilers.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus@plexus-compilers.pom +cp /usr/share/maven-poms/JPP.plexus-compiler-csharp.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-csharp.pom +cp /usr/share/maven-poms/JPP.plexus-compiler-eclipse.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-eclipse.pom +cp /usr/share/maven-poms/JPP.plexus-compiler-jikes.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-jikes.pom +cp /usr/share/maven-fragments/plexus-compiler.xml %{buildroot}/usr/share/maven-fragments/plexus-compiler-orig.xml + %files -f .mfiles +%{_javadir}/plexus/* +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* %files extras -f .mfiles-extras %files pom -f .mfiles-pom From 7d924ae5803e36fbfb2868991e08a11889a1e009 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 4 Mar 2013 17:27:55 +0100 Subject: [PATCH 3/7] Build with original POM files - with aliases to temporarily created artifact IDs --- 0001-change-artifactIds.patch | 184 ---------------------------------- plexus-compiler.spec | 34 +------ 2 files changed, 4 insertions(+), 214 deletions(-) delete mode 100644 0001-change-artifactIds.patch diff --git a/0001-change-artifactIds.patch b/0001-change-artifactIds.patch deleted file mode 100644 index b1838e4..0000000 --- a/0001-change-artifactIds.patch +++ /dev/null @@ -1,184 +0,0 @@ -From b86f70e56a7e9e23564f7c7794c7ed39e13bc4e2 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Mon, 4 Mar 2013 13:53:57 +0100 -Subject: [PATCH] change artifactIds - ---- - plexus-compiler-api/pom.xml | 4 ++-- - plexus-compiler-manager/pom.xml | 6 +++--- - plexus-compilers/plexus-compiler-csharp/pom.xml | 4 ++-- - plexus-compilers/plexus-compiler-eclipse/pom.xml | 4 ++-- - plexus-compilers/plexus-compiler-javac/pom.xml | 4 ++-- - plexus-compilers/plexus-compiler-jikes/pom.xml | 4 ++-- - plexus-compilers/pom.xml | 6 +++--- - pom.xml | 4 ++-- - 8 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/plexus-compiler-api/pom.xml b/plexus-compiler-api/pom.xml -index 3edcf43..dfce09a 100644 ---- a/plexus-compiler-api/pom.xml -+++ b/plexus-compiler-api/pom.xml -@@ -4,11 +4,11 @@ - - - org.codehaus.plexus -- plexus-compiler -+ plexus-compiler-temp - 2.1 - - -- plexus-compiler-api -+ plexus-compiler-api-temp - - Plexus Compiler Api - Plexus Compilers component's API to manipulate compilers. -diff --git a/plexus-compiler-manager/pom.xml b/plexus-compiler-manager/pom.xml -index 8e8e561..0247f23 100644 ---- a/plexus-compiler-manager/pom.xml -+++ b/plexus-compiler-manager/pom.xml -@@ -4,18 +4,18 @@ - - - org.codehaus.plexus -- plexus-compiler -+ plexus-compiler-temp - 2.1 - - -- plexus-compiler-manager -+ plexus-compiler-manager-temp - - Plexus Compiler Manager - - - - org.codehaus.plexus -- plexus-compiler-api -+ plexus-compiler-api-temp - - - -diff --git a/plexus-compilers/plexus-compiler-csharp/pom.xml b/plexus-compilers/plexus-compiler-csharp/pom.xml -index a069836..aaeec22 100644 ---- a/plexus-compilers/plexus-compiler-csharp/pom.xml -+++ b/plexus-compilers/plexus-compiler-csharp/pom.xml -@@ -4,11 +4,11 @@ - - - org.codehaus.plexus -- plexus-compilers -+ plexus-compilers-temp - 2.1 - - -- plexus-compiler-csharp -+ plexus-compiler-csharp-temp - - Plexus C# Compiler - C# Compiler support for Plexus Compiler component. -diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml -index 5040ba7..d7812c5 100644 ---- a/plexus-compilers/plexus-compiler-eclipse/pom.xml -+++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml -@@ -4,11 +4,11 @@ - - - org.codehaus.plexus -- plexus-compilers -+ plexus-compilers-temp - 2.1 - - -- plexus-compiler-eclipse -+ plexus-compiler-eclipse-temp - - Plexus Eclipse Compiler - Eclipse Compiler support for Plexus Compiler component. -diff --git a/plexus-compilers/plexus-compiler-javac/pom.xml b/plexus-compilers/plexus-compiler-javac/pom.xml -index 24971bf..65493df 100644 ---- a/plexus-compilers/plexus-compiler-javac/pom.xml -+++ b/plexus-compilers/plexus-compiler-javac/pom.xml -@@ -4,11 +4,11 @@ - - - org.codehaus.plexus -- plexus-compilers -+ plexus-compilers-temp - 2.1 - - -- plexus-compiler-javac -+ plexus-compiler-javac-temp - - Plexus Javac Component - Javac Compiler support for Plexus Compiler component. -diff --git a/plexus-compilers/plexus-compiler-jikes/pom.xml b/plexus-compilers/plexus-compiler-jikes/pom.xml -index b81ec41..20efed5 100644 ---- a/plexus-compilers/plexus-compiler-jikes/pom.xml -+++ b/plexus-compilers/plexus-compiler-jikes/pom.xml -@@ -4,11 +4,11 @@ - - - org.codehaus.plexus -- plexus-compilers -+ plexus-compilers-temp - 2.1 - - -- plexus-compiler-jikes -+ plexus-compiler-jikes-temp - - Plexus Jikes Compiler - Jikes Compiler support for Plexus Compiler component. -diff --git a/plexus-compilers/pom.xml b/plexus-compilers/pom.xml -index a20a7c7..886aab9 100644 ---- a/plexus-compilers/pom.xml -+++ b/plexus-compilers/pom.xml -@@ -4,11 +4,11 @@ - - - org.codehaus.plexus -- plexus-compiler -+ plexus-compiler-temp - 2.1 - - -- plexus-compilers -+ plexus-compilers-temp - pom - - Plexus Compilers -@@ -29,7 +29,7 @@ - - - org.codehaus.plexus -- plexus-compiler-api -+ plexus-compiler-api-temp - - - org.codehaus.plexus -diff --git a/pom.xml b/pom.xml -index 5dd60df..153aa5c 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -9,7 +9,7 @@ - 1.3.1 - - -- plexus-compiler -+ plexus-compiler-temp - 2.1 - pom - -@@ -38,7 +38,7 @@ - - - org.codehaus.plexus -- plexus-compiler-api -+ plexus-compiler-api-temp - ${project.version} - - --- -1.8.1.2 - diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 5eb8980..fa633ca 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -43,7 +43,6 @@ Group: Development/Java URL: http://plexus.codehaus.org/ Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz -Patch0: 0001-change-artifactIds.patch BuildArch: noarch BuildRequires: maven-local @@ -89,16 +88,16 @@ API documentation for %{name}. %prep %setup -q -n sonatype-plexus-compiler-%{dirhash} -%patch0 -p1 - %pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml # don't build/install compiler-test module, it needs maven2 test harness %pom_disable_module plexus-compiler-test %build -%mvn_package ":plexus-compiler-temp" pom -%mvn_package ":plexus-compilers-temp" pom +# temporary solution only +%mvn_alias ":{*}" :@1-temp + +%mvn_package ":plexus-compiler{,s}" pom %mvn_package ":*{csharp,eclipse,jikes}*" extras # Tests are skipped because of unavailable plexus-compiler-test artifact %mvn_build -f @@ -106,32 +105,7 @@ API documentation for %{name}. %install %mvn_install -# only temporary solution -# we need to preserve older JARs and POMs for a while, because current maven-compiler-plugin -# won't work with this newer version of plexus-compiler and we can't update maven-compiler-plugin -# because it requires this newer version of plexus-compiler. -# thus temporarly we need both versions of plexus-compiler -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus -cp /usr/share/java/plexus/compiler-api.jar %{buildroot}/usr/share/java/plexus/compiler-api.jar -cp /usr/share/java/plexus/compiler-javac.jar %{buildroot}/usr/share/java/plexus/compiler-javac.jar -cp /usr/share/java/plexus/compiler-manager.jar %{buildroot}/usr/share/java/plexus/compiler-manager.jar -cp /usr/share/java/plexus/compiler-csharp.jar %{buildroot}/usr/share/java/plexus/compiler-csharp.jar -cp /usr/share/java/plexus/compiler-eclipse.jar %{buildroot}/usr/share/java/plexus/compiler-eclipse.jar -cp /usr/share/java/plexus/compiler-jikes.jar %{buildroot}/usr/share/java/plexus/compiler-jikes.jar -cp /usr/share/maven-poms/JPP.plexus-compiler-api.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-api.pom -cp /usr/share/maven-poms/JPP.plexus-compiler-javac.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-javac.pom -cp /usr/share/maven-poms/JPP.plexus-compiler-manager.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-manager.pom -cp /usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus@plexus-compiler.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus@plexus-compiler.pom -cp /usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus@plexus-compilers.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus@plexus-compilers.pom -cp /usr/share/maven-poms/JPP.plexus-compiler-csharp.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-csharp.pom -cp /usr/share/maven-poms/JPP.plexus-compiler-eclipse.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-eclipse.pom -cp /usr/share/maven-poms/JPP.plexus-compiler-jikes.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-jikes.pom -cp /usr/share/maven-fragments/plexus-compiler.xml %{buildroot}/usr/share/maven-fragments/plexus-compiler-orig.xml - %files -f .mfiles -%{_javadir}/plexus/* -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* %files extras -f .mfiles-extras %files pom -f .mfiles-pom From 4c98fedefd3a18f97450d85d7691d7a664d86d3e Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 5 Mar 2013 08:51:48 +0100 Subject: [PATCH 4/7] Bump release version --- plexus-compiler.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index fa633ca..4cd069f 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -33,7 +33,7 @@ Name: plexus-compiler Version: 2.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing @@ -113,6 +113,9 @@ API documentation for %{name}. %doc %{_javadocdir}/%{name} %changelog +* Tue Mar 05 2013 Michal Srb - 0:2.1-2 +- Build with original POM files + * Wed Jan 23 2013 Mikolaj Izdebski - 0:2.1-1 - Update to upstream version 2.1 - Build with xmvn From 6facf154a8c7e159cfd4468d5b65eada7cb2774c Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 5 Mar 2013 10:05:37 +0100 Subject: [PATCH 5/7] Remove auxiliary aliases --- plexus-compiler.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 4cd069f..cdf14f3 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -33,7 +33,7 @@ Name: plexus-compiler Version: 2.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing @@ -94,9 +94,6 @@ API documentation for %{name}. %pom_disable_module plexus-compiler-test %build -# temporary solution only -%mvn_alias ":{*}" :@1-temp - %mvn_package ":plexus-compiler{,s}" pom %mvn_package ":*{csharp,eclipse,jikes}*" extras # Tests are skipped because of unavailable plexus-compiler-test artifact @@ -113,6 +110,9 @@ API documentation for %{name}. %doc %{_javadocdir}/%{name} %changelog +* Tue Mar 05 2013 Michal Srb - 0:2.1-3 +- Remove auxiliary aliases + * Tue Mar 05 2013 Michal Srb - 0:2.1-2 - Build with original POM files From 4f7059a91f28d46f50ece15ffab7341bcd5b840f Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 5 Mar 2013 10:47:23 +0100 Subject: [PATCH 6/7] Update to upstream version 2.2 --- plexus-compiler.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index cdf14f3..3b1f1eb 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -32,8 +32,8 @@ %global dirhash 16e340d Name: plexus-compiler -Version: 2.1 -Release: 3%{?dist} +Version: 2.2 +Release: 1%{?dist} Epoch: 0 Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing @@ -110,6 +110,9 @@ API documentation for %{name}. %doc %{_javadocdir}/%{name} %changelog +* Tue Mar 05 2013 Michal Srb - 0:2.2-1 +- Update to upstream version 2.2 + * Tue Mar 05 2013 Michal Srb - 0:2.1-3 - Remove auxiliary aliases diff --git a/sources b/sources index 21ec3cf..fe2122c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5a2e177eda83ad4b70488f6d4b93a3b plexus-compiler-2.1.tar.gz +9e082787775c08ba4a7e44dbff92c64d plexus-compiler-2.2.tar.gz From 158693cbd645079580f688393b7104146d473cb1 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 5 Mar 2013 13:18:28 +0100 Subject: [PATCH 7/7] Add license file (Resolves: #903268) - use different URL for tarball --- plexus-compiler.spec | 14 +++++++++----- sources | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 3b1f1eb..bdf9ffe 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -29,7 +29,6 @@ # %global parent plexus -%global dirhash 16e340d Name: plexus-compiler Version: 2.2 @@ -42,7 +41,8 @@ License: MIT and ASL 2.0 Group: Development/Java URL: http://plexus.codehaus.org/ -Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz +Source0: https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local @@ -86,7 +86,9 @@ Group: Documentation API documentation for %{name}. %prep -%setup -q -n sonatype-plexus-compiler-%{dirhash} +%setup -q -n %{name}-%{name}-%{version} + +cp %{SOURCE1} LICENSE %pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml @@ -103,15 +105,17 @@ API documentation for %{name}. %mvn_install %files -f .mfiles +%doc LICENSE %files extras -f .mfiles-extras %files pom -f .mfiles-pom -%files javadoc -%doc %{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc +%doc LICENSE %changelog * Tue Mar 05 2013 Michal Srb - 0:2.2-1 - Update to upstream version 2.2 +- Add license file (Resolves: #903268) * Tue Mar 05 2013 Michal Srb - 0:2.1-3 - Remove auxiliary aliases diff --git a/sources b/sources index fe2122c..197d737 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -9e082787775c08ba4a7e44dbff92c64d plexus-compiler-2.2.tar.gz +49503026ac81afbf8a3ce7c75abc91bf plexus-compiler-2.2.tar.gz +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt