Fridrich Strba 2019-04-11 15:14:53 +00:00 committed by Git OBS Bridge
parent 21f9b8df98
commit 76803f7f95
19 changed files with 138 additions and 169 deletions

View File

@ -10,9 +10,9 @@
<module>junit-platform-console-standalone</module>
<module>junit-platform-engine</module>
<module>junit-platform-launcher</module>
<module>junit-platform-reporting</module>
<module>junit-platform-runner</module>
<module>junit-platform-suite-api</module>
<module>junit-platform-surefire-provider</module>
<module>junit-jupiter-api</module>
<module>junit-jupiter-engine</module>
<module>junit-jupiter-migrationsupport</module>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.3.1</version>
<version>5.4.0</version>
<name>JUnit Jupiter API</name>
<description>Module "junit-jupiter-api" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -67,7 +67,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.3.1</version>
<version>5.4.0</version>
<name>JUnit Jupiter Engine</name>
<description>Module "junit-jupiter-engine" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -61,13 +61,13 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.3.1</version>
<version>5.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-migrationsupport</artifactId>
<version>5.3.1</version>
<version>5.4.0</version>
<name>JUnit Jupiter Migration Support</name>
<description>Module "junit-jupiter-migrationsupport" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -52,22 +52,22 @@
<url>https://github.com/junit-team/junit5</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.3.1</version>
<version>5.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.3.1</version>
<version>5.4.0</version>
<name>JUnit Jupiter Params</name>
<description>Module "junit-jupiter-params" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -61,7 +61,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.3.1</version>
<version>5.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<name>JUnit Platform Commons</name>
<description>Module "junit-platform-commons" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-console</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<name>JUnit Platform Console</name>
<description>Module "junit-platform-console" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -60,8 +60,8 @@
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.3.1</version>
<artifactId>junit-platform-reporting</artifactId>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-console-standalone</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<name>JUnit Platform Console Standalone</name>
<description>Module "junit-platform-console-standalone" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -51,12 +51,4 @@
<developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
<url>https://github.com/junit-team/junit5</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<name>JUnit Platform Engine API</name>
<description>Module "junit-platform-engine" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -58,17 +58,17 @@
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.opentest4j</groupId>
<artifactId>opentest4j</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<name>JUnit Platform Launcher</name>
<description>Module "junit-platform-launcher" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -61,7 +61,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

View File

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-reporting</artifactId>
<version>1.4.0</version>
<name>JUnit Platform Reporting</name>
<description>Module "junit-platform-reporting" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
<url>http://www.eclipse.org/legal/epl-v20.html</url>
</license>
</licenses>
<developers>
<developer>
<id>bechte</id>
<name>Stefan Bechtold</name>
<email>stefan.bechtold@me.com</email>
</developer>
<developer>
<id>jlink</id>
<name>Johannes Link</name>
<email>business@johanneslink.net</email>
</developer>
<developer>
<id>marcphilipp</id>
<name>Marc Philipp</name>
<email>mail@marcphilipp.de</email>
</developer>
<developer>
<id>mmerdes</id>
<name>Matthias Merdes</name>
<email>Matthias.Merdes@heidelberg-mobil.com</email>
</developer>
<developer>
<id>sbrannen</id>
<name>Sam Brannen</name>
<email>sam@sambrannen.com</email>
</developer>
<developer>
<id>sormuras</id>
<name>Christian Stein</name>
<email>sormuras@gmail.com</email>
</developer>
</developers>
<scm>
<connection>scm:git:git://github.com/junit-team/junit5.git</connection>
<developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
<url>https://github.com/junit-team/junit5</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<name>JUnit Platform Runner</name>
<description>Module "junit-platform-runner" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -52,6 +52,12 @@
<url>https://github.com/junit-team/junit5</url>
</scm>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
@ -61,19 +67,13 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-api</artifactId>
<version>1.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-api</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<name>JUnit Platform Suite API</name>
<description>Module "junit-platform-suite-api" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -58,11 +58,5 @@
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.3.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

View File

@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>1.3.1</version>
<name>JUnit Platform Surefire Provider</name>
<description>Module "junit-platform-surefire-provider" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<developers>
<developer>
<id>bechte</id>
<name>Stefan Bechtold</name>
<email>stefan.bechtold@me.com</email>
</developer>
<developer>
<id>jlink</id>
<name>Johannes Link</name>
<email>business@johanneslink.net</email>
</developer>
<developer>
<id>marcphilipp</id>
<name>Marc Philipp</name>
<email>mail@marcphilipp.de</email>
</developer>
<developer>
<id>mmerdes</id>
<name>Matthias Merdes</name>
<email>Matthias.Merdes@heidelberg-mobil.com</email>
</developer>
<developer>
<id>sbrannen</id>
<name>Sam Brannen</name>
<email>sam@sambrannen.com</email>
</developer>
<developer>
<id>sormuras</id>
<name>Christian Stein</name>
<email>sormuras@gmail.com</email>
</developer>
</developers>
<scm>
<connection>scm:git:git://github.com/junit-team/junit5.git</connection>
<developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
<url>https://github.com/junit-team/junit5</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-api</artifactId>
<version>2.22.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>common-java5</artifactId>
<version>2.22.0</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>

View File

@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.3.1</version>
<version>5.4.0</version>
<name>JUnit Vintage Engine</name>
<description>Module "junit-vintage-engine" of JUnit 5.</description>
<url>http://junit.org/junit5/</url>
<url>https://junit.org/junit5/</url>
<licenses>
<license>
<name>Eclipse Public License v2.0</name>
@ -61,7 +61,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>

3
junit5-5.4.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e32da502a1be07b24aadb8acd504eefea141ff2cec9192ad69be65cb1ea5313c
size 1050694

4
junit5.changes Normal file
View File

@ -0,0 +1,4 @@
-------------------------------------------------------------------
Thu Apr 11 15:14:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of junit5 5.4.0

View File

@ -16,21 +16,20 @@
#
%global platform_version 1.3.1
%global platform_version 1.4.0
%global jupiter_version %{version}
%global vintage_version %{version}
# Build with or without the console modules
# Disabled by default due to missing dep: info.picocli:picocli
%bcond_with console
Name: junit5
Version: 5.3.1
Version: 5.4.0
Release: 0
Summary: Java regression testing framework
# junit-platform-surefire-provider is under ASL 2.0, all other modules use EPL-2.0 (see LICENSE.md)
License: EPL-2.0 AND Apache-2.0
License: EPL-2.0
Group: Development/Libraries/Java
URL: http://junit.org/junit5/
Source0: https://github.com/junit-team/junit5/archive/r%{version}.tar.gz
Source0: https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz
# Aggregator POM (used for packaging only)
Source100: aggregator.pom
# Platform POMs
@ -41,7 +40,7 @@ Source203: https://repo1.maven.org/maven2/org/junit/platform/junit-platform
Source205: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/%{platform_version}/junit-platform-launcher-%{platform_version}.pom
Source206: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-runner/%{platform_version}/junit-platform-runner-%{platform_version}.pom
Source207: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-api/%{platform_version}/junit-platform-suite-api-%{platform_version}.pom
Source208: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-surefire-provider/%{platform_version}/junit-platform-surefire-provider-%{platform_version}.pom
Source208: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-reporting/%{platform_version}/junit-platform-reporting-%{platform_version}.pom
# Jupiter POMs
Source301: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/%{jupiter_version}/junit-jupiter-api-%{jupiter_version}.pom
Source302: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/%{jupiter_version}/junit-jupiter-engine-%{jupiter_version}.pom
@ -55,8 +54,6 @@ BuildRequires: maven-local
BuildRequires: mvn(com.univocity:univocity-parsers)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.surefire:common-java5)
BuildRequires: mvn(org.apache.maven.surefire:surefire-api)
BuildRequires: mvn(org.apiguardian:apiguardian-api)
BuildRequires: mvn(org.opentest4j:opentest4j)
BuildArch: noarch
@ -91,9 +88,6 @@ JUnit 5 User Guide.
%setup -q -n %{name}-r%{version}
find -name \*.jar -delete
cp -p junit-jupiter-api/LICENSE.md LICENSE-Eclipse.md
cp -p junit-platform-surefire-provider/LICENSE.md LICENSE-Apache.md
cp -p %{SOURCE100} pom.xml
cp -p %{SOURCE200} junit-platform-commons/pom.xml
cp -p %{SOURCE201} junit-platform-console/pom.xml
@ -102,7 +96,7 @@ cp -p %{SOURCE203} junit-platform-engine/pom.xml
cp -p %{SOURCE205} junit-platform-launcher/pom.xml
cp -p %{SOURCE206} junit-platform-runner/pom.xml
cp -p %{SOURCE207} junit-platform-suite-api/pom.xml
cp -p %{SOURCE208} junit-platform-surefire-provider/pom.xml
cp -p %{SOURCE208} junit-platform-reporting/pom.xml
cp -p %{SOURCE301} junit-jupiter-api/pom.xml
cp -p %{SOURCE302} junit-jupiter-engine/pom.xml
cp -p %{SOURCE303} junit-jupiter-migrationsupport/pom.xml
@ -123,9 +117,6 @@ done
%pom_add_dep net.sf.jopt-simple:jopt-simple:5.0.4 junit-platform-console
%pom_add_dep com.univocity:univocity-parsers:2.5.4 junit-jupiter-params
# Incorrect scope - whoever needs Surefire provider will have to depend on Surefire.
%pom_xpath_set "pom:dependency[pom:groupId='org.apache.maven.surefire']/pom:scope" provided junit-platform-surefire-provider
# Incorrect scope - Junit4 is needed for compilation too, not only runtime.
%pom_xpath_set "pom:dependency[pom:artifactId='junit']/pom:scope" compile junit-vintage-engine
@ -142,7 +133,7 @@ done
# Build docs. Ignore exit asciidoc -- it fails for some reason, but
# still produces readable docs.
asciidoc documentation/src/docs/asciidoc/index.adoc || :
asciidoc documentation/src/docs/asciidoc/user-guide/index.adoc || :
ln -s ../../javadoc/junit5 documentation/src/docs/api
%install
@ -158,10 +149,10 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
%if %{with console}
%{_bindir}/%{name}
%endif
%license LICENSE.md LICENSE-Eclipse.md LICENSE-Apache.md
%license LICENSE.md LICENSE-notice.md
%files javadoc -f .mfiles-javadoc
%license LICENSE.md LICENSE-Eclipse.md LICENSE-Apache.md
%license LICENSE.md LICENSE-notice.md
%files guide
%doc documentation/src/docs/*

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e5c4d18ec27320e6652de7ab191d3b5004e40170862dde8cad6fa17804bcbcf6
size 877431