Compare commits

..

No commits in common. "c10s" and "c8-stream-201902" have entirely different histories.

13 changed files with 318 additions and 215 deletions

View File

@ -1 +0,0 @@
1

33
.gitignore vendored
View File

@ -1,32 +1 @@
/noarch/
/.build-*.log
/*.src.rpm
/testng-6.0.1.tar.xz
/testng-6.8.tar.gz
/testng-6.8.5.tar.gz
/testng-6.8.7.tar.gz
/testng-6.8.8.tar.gz
/testng-6.8.14.tar.gz
/testng-6.8.17.tar.gz
/testng-6.8.21.tar.gz
/testng-6.9.5.tar.gz
/6.9.8.tar.gz
/6.9.9.tar.gz
/6.9.10.tar.gz
/6.9.11.tar.gz
/6.9.12.tar.gz
/6.11.tar.gz
/6.12.tar.gz
/6.14.3.tar.gz
/testng-6.14.3.tar.gz
/testng-7.0.0~beta4.tar.gz
/testng-7.0.0~beta7.tar.gz
/testng-7.0.0.tar.gz
/testng-7.1.1.tar.gz
/testng-7.2.0~SNAPSHOT.tar.gz
/testng-7.3.0.tar.gz
/testng-7.4.0.tar.gz
/testng-7.6.1.tar.gz
/testng-7.6.1.pom
/testng-7.8.0.tar.gz
/testng-7.8.0.pom
SOURCES/testng-7.0.0.tar.gz

1
.testng.metadata Normal file
View File

@ -0,0 +1 @@
9249508bc41850d68038bede149fc0ef87f5d7a5 SOURCES/testng-7.0.0.tar.gz

View File

@ -1,38 +0,0 @@
From 9155677e2d5acdd2379c38041189da52c7f04946 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 18 Jul 2018 15:57:49 +0200
Subject: [PATCH 2/2] Replace bundled jquery with CDN link
---
testng-core/src/main/java/org/testng/reporters/jq/Main.java | 1 -
testng-core/src/main/resources/org/testng/header | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/testng-core/src/main/java/org/testng/reporters/jq/Main.java b/testng-core/src/main/java/org/testng/reporters/jq/Main.java
index efd6799..2d8b74e 100644
--- a/testng-core/src/main/java/org/testng/reporters/jq/Main.java
+++ b/testng-core/src/main/java/org/testng/reporters/jq/Main.java
@@ -21,7 +21,6 @@ public class Main implements IReporter {
private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/";
private static final String[] RESOURCES =
new String[] {
- "jquery-3.6.0.min.js",
"testng-reports.css",
"testng-reports.js",
"testng-reports1.css",
diff --git a/testng-core/src/main/resources/org/testng/header b/testng-core/src/main/resources/org/testng/header
index f5abbc3..817badc 100644
--- a/testng-core/src/main/resources/org/testng/header
+++ b/testng-core/src/main/resources/org/testng/header
@@ -7,7 +7,7 @@
<link type="text/css" href="testng-reports1.css" rel="stylesheet" id="ultra" />
<link type="text/css" href="testng-reports.css" rel="stylesheet" id="retro" disabled="false"/>
- <script type="text/javascript" src="jquery-3.6.0.min.js"></script>
+ <script type="text/javascript" src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script type="text/javascript" src="testng-reports.js"></script>
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type='text/javascript'>
--
2.31.1

View File

@ -4,13 +4,13 @@ Date: Wed, 31 May 2017 13:44:36 +0200
Subject: [PATCH 1/2] Avoid accidental javascript in javadoc
---
testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java | 4 +++-
src/main/java/org/testng/xml/TestNGContentHandler.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java b/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java
diff --git a/src/main/java/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java
index b74572a..7c490e9 100644
--- a/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java
+++ b/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java
--- a/src/main/java/org/testng/xml/TestNGContentHandler.java
+++ b/src/main/java/org/testng/xml/TestNGContentHandler.java
@@ -250,7 +250,9 @@ public class TestNGContentHandler extends DefaultHandler {
}
}

View File

@ -0,0 +1,38 @@
From 9155677e2d5acdd2379c38041189da52c7f04946 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 18 Jul 2018 15:57:49 +0200
Subject: [PATCH 2/2] Replace bundled jquery with CDN link
---
src/main/java/org/testng/reporters/jq/Main.java | 1 -
src/main/resources/org/testng/header | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/testng/reporters/jq/Main.java b/src/main/java/org/testng/reporters/jq/Main.java
index 1d3e950..3b5bc0d 100644
--- a/src/main/java/org/testng/reporters/jq/Main.java
+++ b/src/main/java/org/testng/reporters/jq/Main.java
@@ -21,7 +21,6 @@ public class Main implements IReporter {
private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/";
private static final String[] RESOURCES =
new String[] {
- "jquery-1.7.1.min.js",
"testng-reports.css",
"testng-reports.js",
"passed.png",
diff --git a/src/main/resources/org/testng/header b/src/main/resources/org/testng/header
index 47f897b..a302d47 100644
--- a/src/main/resources/org/testng/header
+++ b/src/main/resources/org/testng/header
@@ -6,7 +6,7 @@
<title>TestNG reports</title>
<link type="text/css" href="testng-reports.css" rel="stylesheet" />
- <script type="text/javascript" src="jquery-1.7.1.min.js"></script>
+ <script type="text/javascript" src="https://code.jquery.com/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="testng-reports.js"></script>
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type='text/javascript'>
--
2.20.1

View File

@ -10,14 +10,13 @@ wget "https://github.com/cbeust/testng/archive/${upstream_version}.tar.gz" -O "$
rm -rf tarball-tmp
mkdir tarball-tmp
pushd tarball-tmp
tar -xf "../${name}-${upstream_version}.orig.tar.gz"
cd tarball-tmp
tar xf "../${name}-${upstream_version}.orig.tar.gz"
# CLEAN TARBALL
rm -r */bin*
rm -r */gradle*
find -name 'jquery-*.min.js' -delete
rm -r */gradle* */kobalt*
rm */src/main/resources/org/testng/jquery-*.js
tar -czf "../${name}-${version}.tar.gz" *
popd
tar cf "../${name}-${version}.tar.gz" *
cd ..
rm -r tarball-tmp "${name}-${upstream_version}.orig.tar.gz"

246
SOURCES/pom.xml Normal file
View File

@ -0,0 +1,246 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!-- Refer to the file ./build-with-maven for instruction on how to use this pom.xml -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<packaging>jar</packaging>
<name>TestNG</name>
<version>@VERSION@</version>
<description>TestNG is a testing framework.</description>
<url>http://testng.org</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:cbeust/testng.git</connection>
<developerConnection>scm:git:git@github.com:cbeust/testng.git</developerConnection>
<url>git@github.com:cbeust/testng.git</url>
</scm>
<developers>
<developer>
<name>Cedric Beust</name>
</developer>
</developers>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>3</version>
</parent>
<distributionManagement>
<repository>
<id>bintray</id>
<url>https://api.bintray.com/maven/cbeust/maven/testng</url>
</repository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.64</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.17</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>2.0b6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<!-- Generating Javadoc -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<configuration>
<failOnError>false</failOnError>
<excludePackageNames>*internal</excludePackageNames>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Bundle sources -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Compilation -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<!-- Resource handling -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
<!-- OSGi manifest creation -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.1.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<_versionpolicy>$(@)</_versionpolicy>
<Export-Package>com.beust.testng,org.testng*</Export-Package>
<Import-Package>
com.beust.jcommander.*;version="[1.7.0,3.0.0)",
bsh.*;version="[2.0.0,3.0.0)";resolution:=optional,
com.google.inject.*;version="[1.2,1.3)";resolution:=optional,
junit.framework;version="[3.8.1, 5.0.0)";resolution:=optional,
org.junit.*;resolution:=optional,
org.apache.tools.ant.*;version="[1.7.0, 2.0.0)";resolution:=optional,
org.yaml.*;version="[1.6,2.0)";resolution:=optional,
!com.beust.testng,
!org.testng.*,
!com.sun.*,
*
</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>
<!-- Add OSGi manifest in JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
<!-- Tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19</version>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>listener</name>
<value>test.invokedmethodlistener.MyListener</value>
</property>
</properties>
<systemPropertyVariables>
<test.resources.dir>${project.build.testOutputDirectory}</test.resources.dir>
</systemPropertyVariables>
</configuration>
</plugin>
<!-- Signing with gpg -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -1,17 +1,14 @@
%bcond_with bootstrap
Name: testng
Version: 7.8.0
Release: 6%{?dist}
Version: 7.0.0
Release: 2%{?dist}
Summary: Java-based testing framework
License: Apache-2.0
URL: https://testng.org/doc/
License: ASL 2.0
URL: http://testng.org/
# ./generate-tarball.sh
Source0: %{name}-%{version}.tar.gz
# Allows building with maven instead of gradle
Source1: https://repo1.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom
Source1: pom.xml
# Remove bundled binaries to make sure we don't ship anything forbidden
Source2: generate-tarball.sh
@ -20,19 +17,16 @@ Patch0: 0001-Avoid-accidental-javascript-in-javadoc.patch
Patch1: 0002-Replace-bundled-jquery-with-CDN-link.patch
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(com.beust:jcommander)
BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(com.google.inject:guice)
BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache-extras.beanshell:bsh)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
%endif
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
%description
TestNG is a testing framework inspired from JUnit and NUnit but introducing
@ -49,26 +43,28 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-%(echo %{version} | tr '~' '-')
cp %{SOURCE1} pom.xml
%patch0 -p1
%patch1 -p1
%patch 0 -p1
%patch 1 -p1
# Contains differently licensed sources
rm -r testng-test-osgi
find . -mindepth 2 -name 'src' -type d -exec cp -r -t . {} +
sed 's/@VERSION@/%{version}/' %{SOURCE1} > pom.xml
# remove any bundled libs, but not test resources
find ! -path '*/test/*' -name '*.jar' -print -delete
find -name '*.class' -delete
find ! -path "*/test/*" -name *.jar -print -delete
find -name *.class -delete
%pom_remove_dep org.webjars:jquery
# these are unnecessary
%pom_remove_plugin :maven-gpg-plugin
%pom_remove_plugin :maven-source-plugin
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_dep org.yaml:snakeyaml
rm src/main/java/org/testng/internal/Yaml*.java
rm src/main/java/org/testng/Converter.java
# missing test deps
sed -i -e 's/DEV-SNAPSHOT/%{version}/' src/main/java/org/testng/internal/Version.java
cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
%mvn_file : %{name}
@ -76,8 +72,7 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
%mvn_alias : :::jdk15:
%build
# Tests extend a class written in Kotlin
%mvn_build -f -- -Dmaven.compiler.release=11
%mvn_build -f
%install
%mvn_install
@ -90,83 +85,6 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
%license LICENSE.txt
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 7.8.0-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 7.8.0-5
- Bump release for Aug 2024 java mass rebuild
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 7.8.0-4
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.8.0-2
- Rebuild
* Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 7.8.0-1
- Update to upstream version 7.8.0
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-4
- Rebuild with no changes
* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-3
- Port to Google Guice 5
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 7.6.1-1
- Update to upstream version 7.6.1
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 7.4.0-3
- Rebuilt for java-17-openjdk as system jdk
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Nov 08 2021 Marian Koncek <mkoncek@redhat.com> - 7.4.0-1
- Update to upstream version 7.4.0
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.3.0-2
- Bootstrap build
- Non-bootstrap build
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Sep 30 2020 Marian Koncek <mkoncek@redhat.com> - 7.3.0-1
- Update to upstream version 7.3.0
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.2.0~SNAPSHOT-1
- Update to upstream version 7.2.0~SNAPSHOT
* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.1.1-1
- Update to upstream version 7.1.1
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 6.14.3-12
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Feb 19 2020 Fabio Valentini <decathorpe@gmail.com> - 6.14.3-11
- Drop unnecessary dependency on parent POM.
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
- Mass rebuild for javapackages-tools 201902
@ -176,24 +94,12 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
* Wed Aug 14 2019 Marian Koncek <mkoncek@redhat.com> - 7.0.0~beta7-1
- Update to upstream version 7.0.0~beta7
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jul 23 2019 Fabio Valentini <decathorpe@gmail.com> - 6.14.3-8
- Disable groovy support by default.
* Thu Jun 06 2019 Marian Koncek <mkoncek@redhat.com> - 7.0.0~beta4-1
- Update to upstream version 7.0.0~beta4
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.14.3-6
- Mass rebuild for javapackages-tools 201901
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Dec 13 2018 Mat Booth <mat.booth@redhat.com> - 6.14.3-6
- Fix test suite execution
* Wed Jul 18 2018 Michael Simacek <msimacek@redhat.com> - 6.14.3-5
- Clean tarball from binaries
- Replace bundled jquery with CDN link

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

View File

@ -1,7 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_contexts:
- osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

View File

@ -1,7 +0,0 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://src.fedoraproject.org/tests/javapackages
ref: c10s
execute:
how: tmt

View File

@ -1,2 +0,0 @@
SHA512 (testng-7.8.0.tar.gz) = 845fd50bc94e0dac560a6dacd7fcf1cdc1dba870fd73c7fe89342460325c02f02e13a407d4dacf1328723b3c9fefa778b67f2e27208858c629e391cb1e3b4333
SHA512 (testng-7.8.0.pom) = 1f203073eea51a187824e7096a9eb0fd5df7b76ebfe65fa49037b28826dda216f75e73ed352ce4af645389cbbd2d72ccbf2a1fe9ccafe0d5daddcab4ed6d3959