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-build.tar.xz b/plexus-compiler-build.tar.xz
index c99dc7f..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:32d357b46f0282c1a25e6291eaa110df071b755e47216a8be6a5b6598f4d9764
-size 3408
+oid sha256:d1c62ddd3528f3226d2906174181b1064ef0e5a02189a2c65015858331721095
+size 3456
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index cf0c10d..e96554a 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -1,7 +1,7 @@
#
# spec file for package plexus-compiler
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,12 @@
Name: plexus-compiler
-Version: 2.8.2
+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: MIT AND Apache-2.0
+License: Apache-2.0 AND MIT
Group: Development/Libraries/Java
URL: https://github.com/codehaus-plexus/plexus-compiler
Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
@@ -34,6 +34,7 @@ BuildRequires: ecj
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: plexus-classworlds
+BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils
@@ -47,10 +48,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: MIT AND Apache-2.0 AND Apache-1.1
+License: Apache-2.0
Group: Development/Libraries/Java
Requires: mvn(org.codehaus.plexus:plexus-compiler-api) = %{version}
Requires: mvn(org.codehaus.plexus:plexus-utils)
@@ -61,7 +59,7 @@ Additional support for csharp, eclipse and jikes compilers
%package javadoc
Summary: Javadoc for %{name}
-License: MIT AND Apache-2.0 AND Apache-1.1
+License: Apache-1.1 AND Apache-2.0 AND MIT
Group: Documentation/HTML
%description javadoc
@@ -87,15 +85,19 @@ 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}org.codehaus.plexus" ${i}
done
%build
mkdir -p lib
-build-jar-repository -s lib plexus/utils plexus/classworlds plexus-containers/plexus-container-default ecj
+build-jar-repository -s lib plexus/utils plexus/classworlds \
+ plexus-containers/plexus-container-default \
+ plexus-containers/plexus-component-annotations \
+ plexus-metadata-generator objectweb-asm/asm \
+ jdom2/jdom2 commons-cli qdox plexus/cli guava/guava xbean/xbean-reflect \
+ ecj
# Tests are skipped because of unavailable plexus-compiler-test artifact
%{ant} \
-Dtest.skip=true \
@@ -106,16 +108,15 @@ build-jar-repository -s lib plexus/utils plexus/classworlds plexus-containers/pl
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
@@ -131,8 +132,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