packages/bval
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!17 Fix build failure due to buildnumber-maven-plugin updated

Browse Source 
From: @wang--ge 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-08-21 03:50:04 +00:00 committed by Gitee
commit a09b2600a1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 175 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
0001-remove-redundency-dependency.patch Normal file
View File

@ -0,0 +1,163 @@
From 1a84e435db51d200d94b0ed0ea144d0ee4a735ea Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
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 @@
<type>jar</type>
<requiresJava>1.6</requiresJava>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <requestedVersion>3.3.2</requestedVersion>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <requestedVersion>1.8.3</requestedVersion>
- </dependency>
- </dependencies>
</artifact>
<artifact>
<groupId>org.apache.bval</groupId>
@@ -43,18 +31,6 @@
<type>jar</type>
<requiresJava>1.6</requiresJava>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <requestedVersion>3.3.2</requestedVersion>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <requestedVersion>1.8.3</requestedVersion>
- </dependency>
- </dependencies>
</artifact>
<artifact>
<groupId>org.apache.bval</groupId>
@@ -65,18 +41,6 @@
<type>jar</type>
<requiresJava>1.6</requiresJava>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-core</artifactId>
- <requestedVersion>1.1.1</requestedVersion>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <requestedVersion>1.3.1</requestedVersion>
- </dependency>
- </dependencies>
</artifact>
<artifact>
<groupId>org.apache.bval</groupId>
@@ -94,11 +58,6 @@
<artifactId>bval-core</artifactId>
<requestedVersion>1.1.1</requestedVersion>
</dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <requestedVersion>1.3.1</requestedVersion>
- </dependency>
</dependencies>
</artifact>
<artifact>
@@ -116,26 +75,6 @@
<artifactId>bval-core</artifactId>
<requestedVersion>1.1.1</requestedVersion>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <requestedVersion>3.3.2</requestedVersion>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <requestedVersion>4.8.2</requestedVersion>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <requestedVersion>2.2.6</requestedVersion>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <requestedVersion>2.2.6</requestedVersion>
- </dependency>
</dependencies>
</artifact>
<artifact>
@@ -154,26 +93,6 @@
<artifactId>bval-core</artifactId>
<requestedVersion>1.1.1</requestedVersion>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <requestedVersion>3.3.2</requestedVersion>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <requestedVersion>4.8.2</requestedVersion>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <requestedVersion>2.2.6</requestedVersion>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <requestedVersion>2.2.6</requestedVersion>
- </dependency>
</dependencies>
</artifact>
<artifact>
@@ -196,11 +115,6 @@
<artifactId>bval-xstream</artifactId>
<requestedVersion>1.1.1</requestedVersion>
</dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <requestedVersion>2.3.15</requestedVersion>
- </dependency>
</dependencies>
</artifact>
<artifact>
@@ -224,11 +138,6 @@
<artifactId>bval-xstream</artifactId>
<requestedVersion>1.1.1</requestedVersion>
</dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <requestedVersion>2.3.15</requestedVersion>
- </dependency>
</dependencies>
</artifact>
<artifact>
--
2.33.0

15
bval.spec
View File

@ -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 <wang__ge@126.com> - 1.1.1-4
- Fix build failure due to buildnumber-maven-plugin updated
* Mon Sep 6 2021 yaoxin <yaoxin30@huawei.com> - 1.1.1-3
- Solving the problem that bval compilation fails due to xstream upgrade