!8 Solving the problem that bval compilation fails due to xstream upgrade

From: @starlet-dx
Reviewed-by: @xiezhipeng1
Signed-off-by: @xiezhipeng1

bval.spec

@@ -1,7 +1,7 @@
 %bcond_with commons-weaver
 Name:                bval
 Version:             1.1.1
-Release:             2
+Release:             3
 Summary:             Apache Bean Validation
 License:             ASL 2.0
 Url:                 http://bval.apache.org/
@@ -31,7 +31,6 @@ 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.apache.bval:bval-xstream)
 BuildArch:           noarch
 
 %description
@@ -46,6 +45,12 @@ Summary:             Apache BVal :: Extras
 %description extras
 BVal - non-JSR303 routines and constraints.
 
+%package json
+Summary:             Apache BVal :: JSON
+
+%description json
+BVal - Optional JSON Component.
+
 %package jsr
 Summary:             Apache BVal :: JSR 349
 
@@ -58,6 +63,12 @@ Summary:             Apache BVal :: Parent POM
 %description parent
 Apache BVal Parent POM.
 
+%package xstream
+Summary:             Apache BVal :: XStream
+
+%description xstream
+BVal XML Metadata with XStream.
+
 %package javadoc
 Summary:             Javadoc for %{name}
 
@@ -71,13 +82,13 @@ find . -name "*.jar" -delete
 %pom_disable_module bval-tck
 %pom_disable_module bval-tck11
 %pom_disable_module bundle
-%pom_disable_module bval-xstream
-%pom_disable_module bval-json
 %pom_xpath_remove pom:Embed-Dependency bundle
 %pom_remove_plugin -r :findbugs-maven-plugin
 %pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin
 %pom_remove_plugin org.codehaus.mojo:jdepend-maven-plugin
 %pom_remove_plugin -r :maven-source-plugin
+%pom_add_dep xpp3:xpp3:1.1.4c:test %{name}-json
+%pom_add_dep xpp3:xpp3:1.1.4c:test %{name}-xstream
 %if %{without commons-weaver}
 %pom_remove_plugin -r :commons-weaver-maven-plugin
 %pom_remove_dep -r :commons-weaver-privilizer-api
@@ -122,7 +133,7 @@ sed -i '/Privileged/d' \
 %mvn_package ":{*}::tests:" @1
 
 %build
-%mvn_build -s -- -Dri -Dproject.build.sourceEncoding=UTF-8
+%mvn_build -f -s -- -Dri -Dproject.build.sourceEncoding=UTF-8
 
 %install
 %mvn_install
@@ -133,15 +144,22 @@ sed -i '/Privileged/d' \
 
 %files extras -f .mfiles-%{name}-extras
 
+%files json -f .mfiles-%{name}-json
+
 %files jsr -f .mfiles-%{name}-jsr
 
 %files parent -f .mfiles-%{name}-parent
 %license LICENSE NOTICE
 
+%files xstream -f .mfiles-%{name}-xstream
+
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE
 
 %changelog
+* Mon Sep 6 2021 yaoxin <yaoxin30@huawei.com> - 1.1.1-3
+- Solving the problem that bval compilation fails due to xstream upgrade
+
 * Sat Sep 4 2021 houyingchao <houyingchao@huawei.com> - 1.1.1-2
 - Solving the problem that bval compilation fails due to xstream upgrade