diff --git a/bridger-1.4.Final.jar b/bridger-1.4.Final.jar deleted file mode 100644 index fe91580..0000000 Binary files a/bridger-1.4.Final.jar and /dev/null differ 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-2.0.2.Final.tar.gz b/jboss-modules-2.0.2.Final.tar.gz deleted file mode 100644 index c1617db..0000000 Binary files a/jboss-modules-2.0.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 6686524..226d78c 100644 --- a/jboss-modules.spec +++ b/jboss-modules.spec @@ -1,19 +1,17 @@ %global namedreltag .Final %global namedversion %{version}%{?namedreltag} Name: jboss-modules -Version: 2.0.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 -Source1: bridger-1.4.Final.jar -Source2: jdk-misc-2.Final.jar +Patch0: fix-build-error-with-java8.patch BuildArch: noarch -BuildRequires: maven maven-local mvn(junit:junit) mvn(org.jboss:jboss-parent:pom:) -BuildRequires: graphviz mvn(jdepend:jdepend) mvn(org.jboss.apiviz:apiviz) -BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base) maven-dependency-plugin - +BuildRequires: maven-local mvn(junit:junit) mvn(org.jboss:jboss-parent:pom:) +BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base) +BuildRequires: graphviz mvn(jdepend:jdepend) mvn(org.jboss.apiviz:apiviz) %description Ths package contains A Modular Classloading System. @@ -24,24 +22,23 @@ This package contains the API documentation for %{name}. %prep %autosetup -p1 -n %{name}-%{namedversion} - %pom_remove_plugin :maven-javadoc-plugin - -%pom_remove_plugin :maven-compiler-plugin - -mvn install:install-file -Dgroupid=org.jboss.bridger -Dartifactid=bridger -Dversion=1.4.Final -Dpackaging=maven-plugin -Dfile=%{SOURCE1} -mvn install:install-file -Dgroupid=org.jboss -Dartifactid=jdk-misc -Dversion=2.Final -Dpackaging=jar -Dfile=%{SOURCE2} - +%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 %build -%mvn_build -s -f +%mvn_build %install -%mvn_install -X +%mvn_install -%files -f .mfiles-%{name} +%files -f .mfiles %doc README.md %license LICENSE.txt XPP3-LICENSE.txt @@ -49,6 +46,9 @@ rm src/test/java/org/jboss/modules/MavenResourceTest.java \ %license LICENSE.txt XPP3-LICENSE.txt %changelog +* Thu Oct 20 2022 yaoxin - 2.0.3-1 +- Update to 2.0.3 + * Tue Jan 18 2022 SimpleUpdate Robot - 2.0.2-1 - Upgrade to version 2.0.2 diff --git a/jdk-misc-2.Final.jar b/jdk-misc-2.Final.jar deleted file mode 100644 index 36a6810..0000000 Binary files a/jdk-misc-2.Final.jar and /dev/null differ