From afdf4e6ed872d2a914e53a2a2a50bcc6fb310659e8856b85f4b918bdd014c4b5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 11 Mar 2022 15:44:32 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=7

---
 plexus-compiler-2.11.1.tar.gz |  3 +++
 plexus-compiler-2.8.8.tar.gz  |  3 ---
 plexus-compiler-build.tar.xz  |  4 ++--
 plexus-compiler.spec          | 22 +++++++---------------
 4 files changed, 12 insertions(+), 20 deletions(-)
 create mode 100644 plexus-compiler-2.11.1.tar.gz
 delete mode 100644 plexus-compiler-2.8.8.tar.gz

diff --git a/plexus-compiler-2.11.1.tar.gz b/plexus-compiler-2.11.1.tar.gz
new file mode 100644
index 0000000..1986437
--- /dev/null
+++ b/plexus-compiler-2.11.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:daa7b09904a2e95deafaa2f0370679738da5f007b38e39627ddfbfd0eea6d061
+size 96692
diff --git a/plexus-compiler-2.8.8.tar.gz b/plexus-compiler-2.8.8.tar.gz
deleted file mode 100644
index bdde011..0000000
--- a/plexus-compiler-2.8.8.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c208cb22e0102c529c2851df6c94688fba3318c4954f12616645d6281d75c90
-size 91627
diff --git a/plexus-compiler-build.tar.xz b/plexus-compiler-build.tar.xz
index 1634265..2890fe7 100644
--- a/plexus-compiler-build.tar.xz
+++ b/plexus-compiler-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca3f261c2ae42ff83deea281665bf5385848beb0976232645cda74b2c1c457de
-size 3528
+oid sha256:d1c62ddd3528f3226d2906174181b1064ef0e5a02189a2c65015858331721095
+size 3456
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index b39cf34..607d482 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -17,11 +17,9 @@
 
 
 Name:           plexus-compiler
-Version:        2.8.8
+Version:        2.11.1
 Release:        0
 Summary:        Compiler call initiators for Plexus
-# extras subpackage has a bit different licensing
-# parts of compiler-api are ASL2.0/MIT
 License:        Apache-2.0 AND MIT
 Group:          Development/Libraries/Java
 URL:            https://github.com/codehaus-plexus/plexus-compiler
@@ -48,10 +46,7 @@ additional compilers see %{name}-extras package.
 
 %package extras
 Summary:        Extra compiler support for %{name}
-# 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:        Apache-1.1 AND Apache-2.0 AND MIT
+License:        Apache-2.0
 Group:          Development/Libraries/Java
 Requires:       mvn(org.codehaus.plexus:plexus-compiler-api) = %{version}
 Requires:       mvn(org.codehaus.plexus:plexus-utils)
@@ -88,8 +83,7 @@ cp %{SOURCE2} LICENSE.MIT
 
 for i in plexus-compiler-api plexus-compiler-manager plexus-compiler-test \
          plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \
-		 plexus-compilers/plexus-compiler-jikes plexus-compilers/plexus-compiler-javac \
-		 plexus-compilers/plexus-compiler-j2objc; do
+		 plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do
   %pom_remove_parent ${i}
   %pom_xpath_inject "pom:project" "<version>%{version}</version><groupId>org.codehaus.plexus</groupId>" ${i}
 done
@@ -112,16 +106,15 @@ build-jar-repository -s lib plexus/utils plexus/classworlds \
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
 for i in plexus-compiler-api plexus-compiler-manager \
          plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \
-		 plexus-compilers/plexus-compiler-jikes plexus-compilers/plexus-compiler-javac \
-		 plexus-compilers/plexus-compiler-j2objc; do
+		 plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do
   install -pm 0644 ${i}/target/$(basename ${i})-%{version}.jar %{buildroot}%{_javadir}/%{name}/$(basename ${i}).jar
 done
 
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 # These ones belong to the *-extras package
-for i in plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \
-		 plexus-compilers/plexus-compiler-jikes; do
+for i in plexus-compilers/plexus-compiler-csharp \
+		 plexus-compilers/plexus-compiler-eclipse; do
   bsnm=$(basename ${i})
   install -pm 0644 ${i}/pom.xml  %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom
   %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar -f extras
@@ -137,8 +130,7 @@ done
 # javadoc
 for i in plexus-compiler-api plexus-compiler-manager \
          plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \
-		 plexus-compilers/plexus-compiler-jikes plexus-compilers/plexus-compiler-javac \
-		 plexus-compilers/plexus-compiler-j2objc; do
+		 plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do
   install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i}
   cp -pr ${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/
 done