diff --git a/0001-remove-redundency-dependency.patch b/0001-remove-redundency-dependency.patch new file mode 100644 index 0000000..d82f530 --- /dev/null +++ b/0001-remove-redundency-dependency.patch @@ -0,0 +1,163 @@ +From 1a84e435db51d200d94b0ed0ea144d0ee4a735ea Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Fri, 18 Aug 2023 14:32:23 +0800 +Subject: [PATCH] remove redundency dependency + +--- + .xmvn-reactor | 91 --------------------------------------------------- + 1 file changed, 91 deletions(-) + +diff --git a/.xmvn-reactor b/.xmvn-reactor +index a21eece..c082231 100644 +--- a/.xmvn-reactor ++++ b/.xmvn-reactor +@@ -20,18 +20,6 @@ + jar + 1.6 + +- +- +- org.apache.commons +- commons-lang3 +- 3.3.2 +- +- +- commons-beanutils +- commons-beanutils-core +- 1.8.3 +- +- + + + org.apache.bval +@@ -43,18 +31,6 @@ + jar + 1.6 + +- +- +- org.apache.commons +- commons-lang3 +- 3.3.2 +- +- +- commons-beanutils +- commons-beanutils-core +- 1.8.3 +- +- + + + org.apache.bval +@@ -65,18 +41,6 @@ + jar + 1.6 + +- +- +- org.apache.bval +- bval-core +- 1.1.1 +- +- +- com.thoughtworks.xstream +- xstream +- 1.3.1 +- +- + + + org.apache.bval +@@ -94,11 +58,6 @@ + bval-core + 1.1.1 + +- +- com.thoughtworks.xstream +- xstream +- 1.3.1 +- + + + +@@ -116,26 +75,6 @@ + bval-core + 1.1.1 + +- +- org.apache.commons +- commons-lang3 +- 3.3.2 +- +- +- junit +- junit +- 4.8.2 +- +- +- javax.xml.bind +- jaxb-api +- 2.2.6 +- +- +- com.sun.xml.bind +- jaxb-impl +- 2.2.6 +- + + + +@@ -154,26 +93,6 @@ + bval-core + 1.1.1 + +- +- org.apache.commons +- commons-lang3 +- 3.3.2 +- +- +- junit +- junit +- 4.8.2 +- +- +- javax.xml.bind +- jaxb-api +- 2.2.6 +- +- +- com.sun.xml.bind +- jaxb-impl +- 2.2.6 +- + + + +@@ -196,11 +115,6 @@ + bval-xstream + 1.1.1 + +- +- org.freemarker +- freemarker +- 2.3.15 +- + + + +@@ -224,11 +138,6 @@ + bval-xstream + 1.1.1 + +- +- org.freemarker +- freemarker +- 2.3.15 +- + + + +-- +2.33.0 + diff --git a/bval.spec b/bval.spec index 9fca0b8..531e51a 100644 --- a/bval.spec +++ b/bval.spec @@ -1,11 +1,12 @@ %bcond_with commons-weaver Name: bval Version: 1.1.1 -Release: 3 +Release: 4 Summary: Apache Bean Validation License: ASL 2.0 Url: http://bval.apache.org/ Source0: https://archive.apache.org/dist/bval/%{version}/bval-parent-%{version}-source-release.zip +Source1: 0001-remove-redundency-dependency.patch BuildRequires: maven-local mvn(com.sun.xml.bind:jaxb-impl) BuildRequires: mvn(com.thoughtworks.xstream:xstream) BuildRequires: mvn(commons-beanutils:commons-beanutils-core) @@ -27,10 +28,13 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.rat:apache-rat-plugin) -BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:jaxb2-maven-plugin) mvn(org.freemarker:freemarker) BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api) BuildRequires: mvn(org.mockito:mockito-core) mvn(xpp3:xpp3) +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) BuildArch: noarch %description @@ -133,7 +137,9 @@ sed -i '/Privileged/d' \ %mvn_package ":{*}::tests:" @1 %build -%mvn_build -f -s -- -Dri -Dproject.build.sourceEncoding=UTF-8 +%mvn_build -b -f -s -- -Dri -Dproject.build.sourceEncoding=UTF-8 +patch -p1 < %{SOURCE1} +%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin %install %mvn_install @@ -157,6 +163,9 @@ sed -i '/Privileged/d' \ %license LICENSE NOTICE %changelog +* Fri Aug 18 2023 Ge Wang - 1.1.1-4 +- Fix build failure due to buildnumber-maven-plugin updated + * Mon Sep 6 2021 yaoxin - 1.1.1-3 - Solving the problem that bval compilation fails due to xstream upgrade