diff --git a/plexus-compiler-2.8.8.tar.gz b/plexus-compiler-2.8.8.tar.gz new file mode 100644 index 0000000..bdde011 --- /dev/null +++ b/plexus-compiler-2.8.8.tar.gz @@ -0,0 +1,3 @@ +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 c99dc7f..1634265 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:ca3f261c2ae42ff83deea281665bf5385848beb0976232645cda74b2c1c457de +size 3528 diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 607d482..b39cf34 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -17,9 +17,11 @@ Name: plexus-compiler -Version: 2.11.1 +Version: 2.8.8 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 @@ -46,7 +48,10 @@ additional compilers see %{name}-extras package. %package extras Summary: Extra compiler support for %{name} -License: Apache-2.0 +# 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 Group: Development/Libraries/Java Requires: mvn(org.codehaus.plexus:plexus-compiler-api) = %{version} Requires: mvn(org.codehaus.plexus:plexus-utils) @@ -83,7 +88,8 @@ 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-javac plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-jikes 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 @@ -106,15 +112,16 @@ 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-javac plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-jikes 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; do +for i in plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \ + plexus-compilers/plexus-compiler-jikes; 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 @@ -130,7 +137,8 @@ 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-javac plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-jikes 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