Update to version 2.1
- preserve older JARs and POMs, so we will be able to update maven-compiler-plugin
This commit is contained in:
Michal Srb
parent
964139d799
commit
201f45333b
184
0001-change-artifactIds.patch
Normal file
184
0001-change-artifactIds.patch
Normal file
@ -0,0 +1,184 @@
|
|||||||
|
From b86f70e56a7e9e23564f7c7794c7ed39e13bc4e2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michal Srb <msrb@redhat.com>
|
||||||
|
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 @@
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compiler</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-temp</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
- <artifactId>plexus-compiler-api</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-api-temp</artifactId>
|
||||||
|
|
||||||
|
<name>Plexus Compiler Api</name>
|
||||||
|
<description>Plexus Compilers component's API to manipulate compilers.</description>
|
||||||
|
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 @@
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compiler</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-temp</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
- <artifactId>plexus-compiler-manager</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-manager-temp</artifactId>
|
||||||
|
|
||||||
|
<name>Plexus Compiler Manager</name>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compiler-api</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-api-temp</artifactId>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</project>
|
||||||
|
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 @@
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compilers</artifactId>
|
||||||
|
+ <artifactId>plexus-compilers-temp</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
- <artifactId>plexus-compiler-csharp</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-csharp-temp</artifactId>
|
||||||
|
|
||||||
|
<name>Plexus C# Compiler</name>
|
||||||
|
<description>C# Compiler support for Plexus Compiler component.</description>
|
||||||
|
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 @@
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compilers</artifactId>
|
||||||
|
+ <artifactId>plexus-compilers-temp</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
- <artifactId>plexus-compiler-eclipse</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-eclipse-temp</artifactId>
|
||||||
|
|
||||||
|
<name>Plexus Eclipse Compiler</name>
|
||||||
|
<description>Eclipse Compiler support for Plexus Compiler component.</description>
|
||||||
|
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 @@
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compilers</artifactId>
|
||||||
|
+ <artifactId>plexus-compilers-temp</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
- <artifactId>plexus-compiler-javac</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-javac-temp</artifactId>
|
||||||
|
|
||||||
|
<name>Plexus Javac Component</name>
|
||||||
|
<description>Javac Compiler support for Plexus Compiler component.</description>
|
||||||
|
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 @@
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compilers</artifactId>
|
||||||
|
+ <artifactId>plexus-compilers-temp</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
- <artifactId>plexus-compiler-jikes</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-jikes-temp</artifactId>
|
||||||
|
|
||||||
|
<name>Plexus Jikes Compiler</name>
|
||||||
|
<description>Jikes Compiler support for Plexus Compiler component.</description>
|
||||||
|
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 @@
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compiler</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-temp</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
- <artifactId>plexus-compilers</artifactId>
|
||||||
|
+ <artifactId>plexus-compilers-temp</artifactId>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
<name>Plexus Compilers</name>
|
||||||
|
@@ -29,7 +29,7 @@
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compiler-api</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-api-temp</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index 5dd60df..153aa5c 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -9,7 +9,7 @@
|
||||||
|
<version>1.3.1</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
- <artifactId>plexus-compiler</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-temp</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
@@ -38,7 +38,7 @@
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
- <artifactId>plexus-compiler-api</artifactId>
|
||||||
|
+ <artifactId>plexus-compiler-api-temp</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
--
|
||||||
|
1.8.1.2
|
||||||
|
|
||||||
@ -43,12 +43,14 @@ Group: Development/Java
|
|||||||
URL: http://plexus.codehaus.org/
|
URL: http://plexus.codehaus.org/
|
||||||
|
|
||||||
Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz
|
Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: 0001-change-artifactIds.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: maven
|
BuildRequires: maven-local
|
||||||
BuildRequires: jpackage-utils
|
BuildRequires: jpackage-utils
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
BuildRequires: classworlds
|
BuildRequires: classworlds
|
||||||
|
BuildRequires: plexus-compiler-extras
|
||||||
BuildRequires: eclipse-ecj
|
BuildRequires: eclipse-ecj
|
||||||
BuildRequires: plexus-containers-container-default
|
BuildRequires: plexus-containers-container-default
|
||||||
BuildRequires: plexus-utils
|
BuildRequires: plexus-utils
|
||||||
@ -87,13 +89,16 @@ API documentation for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n sonatype-plexus-compiler-%{dirhash}
|
%setup -q -n sonatype-plexus-compiler-%{dirhash}
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
|
%pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
|
||||||
|
|
||||||
# don't build/install compiler-test module, it needs maven2 test harness
|
# don't build/install compiler-test module, it needs maven2 test harness
|
||||||
%pom_disable_module plexus-compiler-test
|
%pom_disable_module plexus-compiler-test
|
||||||
|
|
||||||
%build
|
%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
|
%mvn_package ":*{csharp,eclipse,jikes}*" extras
|
||||||
# Tests are skipped because of unavailable plexus-compiler-test artifact
|
# Tests are skipped because of unavailable plexus-compiler-test artifact
|
||||||
%mvn_build -f
|
%mvn_build -f
|
||||||
@ -101,7 +106,32 @@ API documentation for %{name}.
|
|||||||
%install
|
%install
|
||||||
%mvn_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
|
%files -f .mfiles
|
||||||
|
%{_javadir}/plexus/*
|
||||||
|
%{_mavenpomdir}/*
|
||||||
|
%{_mavendepmapfragdir}/*
|
||||||
%files extras -f .mfiles-extras
|
%files extras -f .mfiles-extras
|
||||||
%files pom -f .mfiles-pom
|
%files pom -f .mfiles-pom
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user