pool/maven-surefire
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 963963 from Java:packages

Browse Source 
Build with source/target levels 8

OBS-URL: https://build.opensuse.org/request/show/963963
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-surefire?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2022-03-22 18:40:52 +00:00 committed by Git OBS Bridge
commit 7ecf11eaaf
7 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
maven-surefire-build.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

5
maven-surefire-plugins.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 22 13:53:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source and target level 8
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 19 16:59:36 UTC 2021 - Pedro Monreal <pmonreal@suse.com> Mon Apr 19 16:59:36 UTC 2021 - Pedro Monreal <pmonreal@suse.com>

16
maven-surefire-plugins.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-surefire-plugins # spec file
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,7 +23,7 @@ Release: 0
Summary: Test framework project Summary: Test framework project
License: Apache-2.0 AND CPL-1.0 License: Apache-2.0 AND CPL-1.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: http://maven.apache.org/surefire/ URL: https://maven.apache.org/surefire/
# ./generate-tarball.sh # ./generate-tarball.sh
Source0: %{base_name}-%{version}.tar.gz Source0: %{base_name}-%{version}.tar.gz
# Remove bundled binaries which cannot be easily verified for licensing # Remove bundled binaries which cannot be easily verified for licensing
@ -34,6 +34,7 @@ Patch1: 0002-Port-to-current-doxia.patch
Patch2: 0003-Port-to-TestNG-6.11.patch Patch2: 0003-Port-to-TestNG-6.11.patch
Patch3: 0004-Port-to-current-maven-shared-utils.patch Patch3: 0004-Port-to-current-maven-shared-utils.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-lang3)
@ -161,20 +162,21 @@ find . -name dependency-reduced-pom.xml -delete
%{mvn_package} ":*junit-platform*" junit5 %{mvn_package} ":*junit-platform*" junit5
%{mvn_package} ":*{junit,testng,failsafe-plugin,report-parser}*" @1 %{mvn_package} ":*{junit,testng,failsafe-plugin,report-parser}*" @1
%mvn_artifact pom.xml %{mvn_artifact} pom.xml
mkdir -p target/site/apidocs mkdir -p target/site/apidocs
for i in \ for i in \
maven-failsafe-plugin \ maven-failsafe-plugin \
maven-surefire-plugin \ maven-surefire-plugin \
maven-surefire-report-plugin; do maven-surefire-report-plugin; do
pushd ${i} pushd ${i}
%mvn_build -f \ %{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=6 -Dmaven.compiler.release=8 \
%endif %endif
-Dsource=8
popd popd
%mvn_artifact ${i}/pom.xml ${i}/target/${i}-%{version}.jar %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar
if [ -d ${i}/target/site/apidocs ]; then if [ -d ${i}/target/site/apidocs ]; then
cp -r ${i}/target/site/apidocs target/site/apidocs/${i} cp -r ${i}/target/site/apidocs target/site/apidocs/${i}
fi fi

5
maven-surefire-provider-junit5.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 22 13:53:55 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 19 16:59:36 UTC 2021 - Pedro Monreal <pmonreal@suse.com> Mon Apr 19 16:59:36 UTC 2021 - Pedro Monreal <pmonreal@suse.com>

12
maven-surefire-provider-junit5.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-surefire-provider-junit5 # spec file
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,7 +23,7 @@ Release: 0
Summary: JUnit 5 provider for Maven Surefire Summary: JUnit 5 provider for Maven Surefire
License: Apache-2.0 AND CPL-1.0 License: Apache-2.0 AND CPL-1.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: http://maven.apache.org/surefire/ URL: https://maven.apache.org/surefire/
# ./generate-tarball.sh # ./generate-tarball.sh
Source0: %{base_name}-%{version}.tar.gz Source0: %{base_name}-%{version}.tar.gz
# Remove bundled binaries which cannot be easily verified for licensing # Remove bundled binaries which cannot be easily verified for licensing
@ -34,6 +34,7 @@ Patch1: 0002-Port-to-current-doxia.patch
Patch2: 0003-Port-to-TestNG-6.11.patch Patch2: 0003-Port-to-TestNG-6.11.patch
Patch3: 0004-Port-to-current-maven-shared-utils.patch Patch3: 0004-Port-to-current-maven-shared-utils.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven.surefire:common-java5) BuildRequires: mvn(org.apache.maven.surefire:common-java5)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
@ -105,10 +106,11 @@ sed -i /-Xdoclint:all/d pom.xml
%build %build
pushd surefire-providers/surefire-junit-platform pushd surefire-providers/surefire-junit-platform
%mvn_build -f \ %{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=8 -Dmaven.compiler.release=8 \
%endif %endif
-Dsource=8
popd popd

5
maven-surefire.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 22 13:52:58 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 19 16:59:36 UTC 2021 - Pedro Monreal <pmonreal@suse.com> Mon Apr 19 16:59:36 UTC 2021 - Pedro Monreal <pmonreal@suse.com>

15
maven-surefire.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-surefire # spec file for package maven-surefire
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@ Release: 0
Summary: Test framework project Summary: Test framework project
License: Apache-2.0 AND CPL-1.0 License: Apache-2.0 AND CPL-1.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: http://maven.apache.org/surefire/ URL: https://maven.apache.org/surefire/
# ./generate-tarball.sh # ./generate-tarball.sh
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
# Remove bundled binaries which cannot be easily verified for licensing # Remove bundled binaries which cannot be easily verified for licensing
@ -38,6 +38,7 @@ BuildRequires: ant
BuildRequires: apache-commons-io BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-lang3
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javacc BuildRequires: javacc
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: jsr-305 BuildRequires: jsr-305
@ -213,12 +214,12 @@ build-jar-repository -s -p lib \
plexus-languages/plexus-java \ plexus-languages/plexus-java \
testng testng
%ant \ %{ant} \
-Dtest.skip=true \ -Dtest.skip=true \
package javadoc package javadoc
%mvn_artifact pom.xml %{mvn_artifact} pom.xml
%mvn_artifact surefire-providers/pom.xml %{mvn_artifact} surefire-providers/pom.xml
mkdir -p target/site/apidocs mkdir -p target/site/apidocs
@ -232,7 +233,7 @@ for module in \
maven-surefire-plugin \ maven-surefire-plugin \
maven-failsafe-plugin \ maven-failsafe-plugin \
maven-surefire-report-plugin; do maven-surefire-report-plugin; do
%mvn_artifact ${module}/pom.xml ${module}/target/${module}-%{version}.jar %{mvn_artifact} ${module}/pom.xml ${module}/target/${module}-%{version}.jar
if [ -d ${module}/target/site/apidocs ]; then if [ -d ${module}/target/site/apidocs ]; then
cp -r ${module}/target/site/apidocs target/site/apidocs/${module} cp -r ${module}/target/site/apidocs target/site/apidocs/${module}
fi fi
@ -247,7 +248,7 @@ for module in \
surefire-junit47 \ surefire-junit47 \
surefire-testng-utils \ surefire-testng-utils \
surefire-testng; do surefire-testng; do
%mvn_artifact surefire-providers/${module}/pom.xml \ %{mvn_artifact} surefire-providers/${module}/pom.xml \
surefire-providers/${module}/target/${module}-%{version}.jar surefire-providers/${module}/target/${module}-%{version}.jar
if [ -d surefire-providers/${module}/target/site/apidocs ]; then if [ -d surefire-providers/${module}/target/site/apidocs ]; then
cp -r surefire-providers/${module}/target/site/apidocs target/site/apidocs/${module} cp -r surefire-providers/${module}/target/site/apidocs target/site/apidocs/${module}