diff --git a/fix-build-error-with-java8.patch b/fix-build-error-with-java8.patch new file mode 100644 index 0000000..9e1ec3d --- /dev/null +++ b/fix-build-error-with-java8.patch @@ -0,0 +1,23 @@ +diff --git a/pom.xml b/pom.xml +index 5aa2975..9dff2c2 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -151,7 +151,6 @@ + compile + + +- 8 + ${project.build.directory} + ${project.compileSourceRoots} + ${project.build.outputDirectory} +@@ -167,7 +166,6 @@ + compile + + +- 9 + ${project.build.directory} + ${project.basedir}/src/main/java9 + ${project.build.directory}/classes/META-INF/versions/9 +-- +2.27.0 + diff --git a/jboss-modules-1.5.2.Final.tar.gz b/jboss-modules-1.5.2.Final.tar.gz deleted file mode 100644 index fcc9de8..0000000 Binary files a/jboss-modules-1.5.2.Final.tar.gz and /dev/null differ diff --git a/jboss-modules-2.0.3.Final.tar.gz b/jboss-modules-2.0.3.Final.tar.gz new file mode 100644 index 0000000..ceed3c6 Binary files /dev/null and b/jboss-modules-2.0.3.Final.tar.gz differ diff --git a/jboss-modules.spec b/jboss-modules.spec index 280c01b..ca0d73d 100644 --- a/jboss-modules.spec +++ b/jboss-modules.spec @@ -1,12 +1,13 @@ %global namedreltag .Final %global namedversion %{version}%{?namedreltag} Name: jboss-modules -Version: 1.5.2 -Release: 2 +Version: 2.0.3 +Release: 1 Summary: A Modular Classloading System License: ASL 2.0 and xpp URL: https://github.com/jbossas/jboss-modules Source0: https://github.com/jbossas/jboss-modules/archive/%{namedversion}/jboss-modules-%{namedversion}.tar.gz +Patch0: fix-build-error-with-java8.patch BuildArch: noarch BuildRequires: maven-local mvn(junit:junit) mvn(org.jboss:jboss-parent:pom:) BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base) @@ -21,9 +22,14 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{namedversion} +%patch0 -p1 %pom_remove_plugin :maven-javadoc-plugin -%pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :maven-dependency-plugin %pom_remove_plugin :maven-checkstyle-plugin +%pom_remove_plugin :bridger +%pom_remove_plugin :module-info +rm -r src/main/java9 +rm src/test/java/org/jboss/modules/MavenResource2Test.java rm src/test/java/org/jboss/modules/MavenResourceTest.java \ src/test/java/org/jboss/modules/maven/MavenSettingsTest.java @@ -41,6 +47,9 @@ rm src/test/java/org/jboss/modules/MavenResourceTest.java \ %license LICENSE.txt XPP3-LICENSE.txt %changelog +* Tue Jun 07 2022 wangkai - 2.0.3-1 +- Update to 2.0.3 + * Fri Sep 5 2020 shaoqiang kang - 1.5.2-2 - modify Macro * Wed Aug 26 2020 shaoqiang kang - 1.5.2-1