Update to latest upstream release
This commit is contained in:
parent
2f8a7def0a
commit
a1ada49a68
240
pom.xml
Normal file
240
pom.xml
Normal file
@ -0,0 +1,240 @@
|
||||
|
||||
<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>6.11</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>
|
||||
</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.7</source>
|
||||
<target>1.7</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>
|
||||
<Import-Package>
|
||||
bsh.*;version="[2.0.0,3.0.0)";resolution:=optional,
|
||||
com.beust.jcommander.*;version="[1.7.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>
|
33
testng.spec
33
testng.spec
@ -1,24 +1,27 @@
|
||||
%bcond_without groovy
|
||||
|
||||
Name: testng
|
||||
Version: 6.9.12
|
||||
Release: 5%{?dist}
|
||||
Version: 6.11
|
||||
Release: 1%{?dist}
|
||||
Summary: Java-based testing framework
|
||||
License: ASL 2.0
|
||||
URL: http://testng.org/
|
||||
Source0: https://github.com/cbeust/testng/archive/%{version}.tar.gz
|
||||
|
||||
# Allows building with maven instead of gradle
|
||||
Source1: pom.xml
|
||||
|
||||
Patch0: 0001-Avoid-accidental-javascript-in-javadoc.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.beust:jcommander)
|
||||
BuildRequires: mvn(com.google.inject:guice::no_aop:)
|
||||
BuildRequires: mvn(com.google.inject:guice)
|
||||
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)
|
||||
BuildRequires: mvn(org.beanshell:bsh)
|
||||
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
||||
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
|
||||
BuildRequires: mvn(org.yaml:snakeyaml)
|
||||
%if %{with groovy}
|
||||
@ -45,6 +48,8 @@ This package contains the API documentation for %{name}.
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
cp %{SOURCE1} .
|
||||
|
||||
# remove any bundled libs, but not test resources
|
||||
find ! -path "*/test/*" -name *.jar -print -delete
|
||||
find -name *.class -delete
|
||||
@ -58,21 +63,18 @@ find -name *.class -delete
|
||||
%if %{with groovy}
|
||||
%pom_add_plugin "org.codehaus.gmavenplus:gmavenplus-plugin" pom.xml \
|
||||
"<executions><execution><goals><goal>addTestSources</goal><goal>testGenerateStubs</goal><goal>testCompile</goal><goal>removeTestStubs</goal></goals></execution></executions>"
|
||||
%pom_add_dep "org.assertj:assertj-core::test"
|
||||
%pom_add_dep "org.spockframework:spock-core::test"
|
||||
%pom_add_dep "org.codehaus.groovy:groovy-all::test"
|
||||
|
||||
# remove failing test
|
||||
sed -i -e '/parallelDataProviderSample/,+12d' ./src/test/java/test/dataprovider/DataProviderTest.java
|
||||
%endif
|
||||
|
||||
# avoid SNAPSHOT in version number
|
||||
sed -i -e '/<version>/s/-SNAPSHOT//' pom.xml
|
||||
|
||||
# plugins not in Fedora
|
||||
%pom_remove_plugin com.coderplus.maven.plugins:copy-rename-maven-plugin
|
||||
sed -i -e 's/VersionTemplateJava/Version.java/' pom.xml
|
||||
mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resources/org/testng/internal/Version.java
|
||||
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}
|
||||
# jdk15 classifier is used by some other packages
|
||||
%mvn_alias : :::jdk15:
|
||||
@ -95,6 +97,11 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
|
||||
%license LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Tue Jul 04 2017 Mat Booth <mat.booth@redhat.com> - 6.11-1
|
||||
- Update to latest upstream release
|
||||
- Continue building with maven for now, instead of moving to gradle due to
|
||||
rhbz#1467724
|
||||
|
||||
* Wed May 31 2017 Michael Simacek <msimacek@redhat.com> - 6.9.12-5
|
||||
- Avoid accidental javascript in comment
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user