diff --git a/grizzly.spec b/grizzly.spec index 6eb365f..e00fdbb 100644 --- a/grizzly.spec +++ b/grizzly.spec @@ -5,12 +5,17 @@ %bcond_with jaxws Name: grizzly Version: 2.3.24 -Release: 4 +Release: 5 Summary: Java NIO Server Framework License: (CDDL-1.1 or GPLv2 with exceptions) and BSD and ASL 2.0 and Public Domain URL: http://grizzly.java.net/ Source0: https://github.com/javaee/grizzly/archive/2_3_24.tar.gz -BuildRequires: maven-local mvn(com.sun.istack:istack-commons-maven-plugin) +BuildRequires: maven-local +BuildRequires: mvn(org.eclipse.aether:aether-connector-basic) +BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon) +BuildRequires: mvn(org.apache.maven.wagon:wagon-http) +BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) + %if %{with jersey} BuildRequires: mvn(com.sun.jersey:jersey-client) mvn(com.sun.jersey:jersey-server) BuildRequires: mvn(com.sun.jersey:jersey-servlet) @@ -117,8 +122,10 @@ done %pom_xpath_remove "pom:dependency[pom:artifactId='junit']/pom:scope" %pom_xpath_remove "pom:dependency[pom:artifactId='mockito-all']/pom:scope" modules/http-server +grep -rn istack-commons-maven-plugin | awk -F: '{print $1}' | for line in `xargs`;do sed -i 's/2.4/2.21/g' $line;done + %build -%mvn_build \ +%mvn_build -b \ %ifarch %{arm} -f -- \ %else @@ -149,6 +156,9 @@ xmvn test --batch-mode --offline verify -Dmaven.test.failure.ignore=true %license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt %changelog +* Wed Aug 23 2023 Ge Wang - 2.3.24-5 +- Fix build failure due to istack-commons updated + * Wed Jun 21 2023 liyanan - 2.3.24-4 - Add mvn(javax.servlet:javax.servlet-api) version limit to fix selfbuild failed