From 7d924ae5803e36fbfb2868991e08a11889a1e009 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 4 Mar 2013 17:27:55 +0100 Subject: [PATCH] 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