diff --git a/2.1.0.Final.tar.gz b/2.1.0.Final.tar.gz new file mode 100644 index 0000000..83cf0af Binary files /dev/null and b/2.1.0.Final.tar.gz differ diff --git a/fix-build-error-with-java8.patch b/fix-build-error-with-java8.patch deleted file mode 100644 index 9e1ec3d..0000000 --- a/fix-build-error-with-java8.patch +++ /dev/null @@ -1,23 +0,0 @@ -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.3.Final.tar.gz b/jboss-modules-2.0.3.Final.tar.gz deleted file mode 100644 index ceed3c6..0000000 Binary files a/jboss-modules-2.0.3.Final.tar.gz and /dev/null differ diff --git a/jboss-modules.spec b/jboss-modules.spec index ca0d73d..85eb3d0 100644 --- a/jboss-modules.spec +++ b/jboss-modules.spec @@ -1,17 +1,20 @@ %global namedreltag .Final %global namedversion %{version}%{?namedreltag} Name: jboss-modules -Version: 2.0.3 +Version: 2.1.0 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 +Source0: https://github.com/jbossas/jboss-modules/archive/refs/tags/%{namedversion}.tar.gz + BuildArch: noarch 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) +BuildRequires: java-11-openjdk-devel +Requires: java-11-openjdk +Requires: javapackages-tools %description Ths package contains A Modular Classloading System. @@ -22,18 +25,19 @@ 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-dependency-plugin %pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin :bridger -%pom_remove_plugin :module-info -rm -r src/main/java9 +%pom_remove_plugin org.apache.maven.plugins:maven-surefire-plugin 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 +rm src/test/java/org/jboss/modules/MavenResourceTest.java +sed -i '46d' src/test/java/org/jboss/modules/ModuleIteratorTest.java %build +export JAVA_HOME=%{_jvmdir}/java-11-openjdk +export CFLAGS="${RPM_OPT_FLAGS}" +export CXXFLAGS="${RPM_OPT_FLAGS}" %mvn_build %install @@ -47,6 +51,9 @@ rm src/test/java/org/jboss/modules/MavenResourceTest.java \ %license LICENSE.txt XPP3-LICENSE.txt %changelog +* Tue Aug 01 2023 Ge Wang - 2.1.0-1 +- Update to 2.1.0 + * Tue Jun 07 2022 wangkai - 2.0.3-1 - Update to 2.0.3