!1 package init

Merge pull request !1 from maminjie/master
2020-09-01 09:36:28 +08:00 · 2020-09-01 09:36:28 +08:00 · 2b031a1c3d
commit 2b031a1c3d
parent 68d0986aa3 dd43fed8da
4 changed files with 422 additions and 0 deletions
--- a/1.1.11.Final.tar.gz
+++ b/1.1.11.Final.tar.gz
--- a/3fa56bfa6b5866cc096568cfc008466ad101c0fc.patch
+++ b/3fa56bfa6b5866cc096568cfc008466ad101c0fc.patch
@ -0,0 +1,66 @@
+From 3fa56bfa6b5866cc096568cfc008466ad101c0fc Mon Sep 17 00:00:00 2001
+From: Dipak Pawar <dipakpawar231@gmail.com>
+Date: Fri, 11 Nov 2016 19:57:07 +0530
+Subject: [PATCH] [ARQ-2058] Updates testNG to use 6.9.10 (closes #117)
+
+---
+ build/pom.xml                                                  |  2 +-
+ .../jboss/arquillian/testng/container/TestNGTestRunner.java    | 10 ----------
+ .../java/org/jboss/arquillian/testng/TestNGTestBaseClass.java  |  3 +--
+ 3 files changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/build/pom.xml b/build/pom.xml
+index 7969511..04994f4 100644
+--- a/build/pom.xml
+++ b/build/pom.xml
+@@ -26,7 +26,7 @@
+         <version.javax.inject_javax.inject>1</version.javax.inject_javax.inject>
+         <version.junit_junit>4.12</version.junit_junit>
+         <version.mockito_all>1.8.3</version.mockito_all>
+-        <version.testng_testng>5.14.6</version.testng_testng>
+        <version.testng_testng>6.9.10</version.testng_testng>
+     </properties>
+ 
+     <!-- Dependency Management -->
+diff --git a/testng/container/src/main/java/org/jboss/arquillian/testng/container/TestNGTestRunner.java b/testng/container/src/main/java/org/jboss/arquillian/testng/container/TestNGTestRunner.java
+index 92ef01a..e46fd1c 100644
+--- a/testng/container/src/main/java/org/jboss/arquillian/testng/container/TestNGTestRunner.java
+++ b/testng/container/src/main/java/org/jboss/arquillian/testng/container/TestNGTestRunner.java
+@@ -60,16 +60,6 @@ private XmlSuite createSuite(Class<?> className, String methodName)
+       XmlSuite suite = new XmlSuite();
+       suite.setName("Arquillian");
+ 
+-      // TestNG >= 6.3 has removed this method
+-      try
+-      {
+-         Method method = XmlSuite.class.getMethod("setAnnotations", String.class);
+-         method.invoke(suite, "JDK");
+-      }
+-      catch (Exception e) {
+-         // no-op
+-      }
+-
+       XmlTest test = new XmlTest(suite);
+       test.setName("Arquillian - " + className);
+       List<XmlClass> testClasses = new ArrayList<XmlClass>();
+diff --git a/testng/core/src/test/java/org/jboss/arquillian/testng/TestNGTestBaseClass.java b/testng/core/src/test/java/org/jboss/arquillian/testng/TestNGTestBaseClass.java
+index b5f7711..bb5a303 100644
+--- a/testng/core/src/test/java/org/jboss/arquillian/testng/TestNGTestBaseClass.java
+++ b/testng/core/src/test/java/org/jboss/arquillian/testng/TestNGTestBaseClass.java
+@@ -35,7 +35,6 @@
+ import org.mockito.stubbing.Answer;
+ import org.testng.TestListenerAdapter;
+ import org.testng.TestNG;
+-import org.testng.internal.AnnotationTypeEnum;
+ import org.testng.xml.XmlClass;
+ import org.testng.xml.XmlSuite;
+ import org.testng.xml.XmlTest;
+@@ -204,7 +203,7 @@ private XmlSuite createSuite(String[] groups, Class<?>... classes)
+    {
+       XmlSuite suite = new XmlSuite();
+       suite.setName("Arquillian - TEST");
+-      suite.setAnnotations(AnnotationTypeEnum.JDK.getName());
+
+       suite.setConfigFailurePolicy("continue");
+       XmlTest test = new XmlTest(suite);
+       if(groups != null)
--- a/arquillian-core.spec
+++ b/arquillian-core.spec
@ -0,0 +1,352 @@
+%global namedreltag .Final
+%global namedversion %{version}%{?namedreltag}
+
+Name:                arquillian-core
+Version:             1.1.11
+Release:             1
+Summary:             Java Testing Platform for the JVM Member
+License:             ASL 2.0
+URL:                 http://arquillian.org/
+Source0:             https://github.com/arquillian/arquillian-core/archive/%{namedversion}.tar.gz
+# [ARQ-2058] Updates testNG to use 6.9.10 https://github.com/arquillian/arquillian-core/issues/119
+Patch0:              3fa56bfa6b5866cc096568cfc008466ad101c0fc.patch
+BuildRequires:       graphviz maven-local mvn(javax.annotation:jsr250-api) mvn(javax.el:el-api)
+BuildRequires:       mvn(javax.enterprise:cdi-api) mvn(javax.inject:javax.inject)
+BuildRequires:       mvn(jdepend:jdepend) mvn(junit:junit) mvn(org.jboss:jboss-parent:pom:)
+BuildRequires:       mvn(org.jboss.apiviz:apiviz) mvn(org.jboss.shrinkwrap:shrinkwrap-api)
+BuildRequires:       mvn(org.jboss.shrinkwrap:shrinkwrap-bom:pom:)
+BuildRequires:       mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base)
+BuildRequires:       mvn(org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base)
+BuildRequires:       mvn(org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-javaee)
+BuildRequires:       mvn(org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-bom:pom:)
+BuildRequires:       mvn(org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-impl-javaee)
+BuildRequires:       mvn(org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi)
+BuildRequires:       mvn(org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-bom:pom:)
+BuildRequires:       mvn(org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec)
+BuildRequires:       mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec)
+BuildRequires:       mvn(org.jboss.weld:weld-core)
+BuildRequires:       mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:       mvn(org.codehaus.mojo:buildnumber-maven-plugin)
+BuildRequires:       mvn(org.eclipse.jetty:jetty-server:8.1)
+BuildRequires:       mvn(org.eclipse.jetty:jetty-servlet:8.1) mvn(org.mockito:mockito-all)
+BuildRequires:       mvn(org.slf4j:slf4j-simple) mvn(org.testng:testng)
+BuildArch:           noarch
+
+%description
+Arquillian is a revolutionary testing platform built on the JVM that
+substantially reduces the effort required to write and execute Java
+middle-ware integration and functional tests. No more mocks.
+No more container life-cycle and deployment hassles. Just real tests!
+
+%package api
+Summary:             Arquillian Core API
+%description api
+API for the Core.
+
+%package impl-base
+Summary:             Arquillian Core Implementation Base
+%description impl-base
+Implementation Base for the Core.
+
+%package parent
+Summary:             Arquillian Core Aggregator
+%description parent
+Arquillian Core Aggregator POM.
+
+%package spi
+Summary:             Arquillian Core SPI
+%description spi
+Service Provider Interface for the Core.
+
+%package -n arquillian-bom
+Summary:             Arquillian BOM
+%description -n arquillian-bom
+Arquillian Bill Of Material.
+
+%package -n arquillian-build
+Summary:             Arquillian Build
+%description -n arquillian-build
+Arquillian Build Configuration POM.
+
+%package -n arquillian-config-api
+Summary:             Arquillian Config API
+%description -n arquillian-config-api
+API for the Config Module.
+
+%package -n arquillian-config-impl-base
+Summary:             Arquillian Config Implementation Base
+License:             ASL 2.0 and LGPLv2+
+Provides:            bundled(jboss-common-core)
+%description -n arquillian-config-impl-base
+Implementation for the Config module.
+
+%package -n arquillian-config-parent
+Summary:             Arquillian Config Aggregator
+%description -n arquillian-config-parent
+Arquillian Config Aggregator POM.
+
+%package -n arquillian-config-spi
+Summary:             Arquillian Config SPI
+%description -n arquillian-config-spi
+Service Provider Interface for the Config Module.
+
+%package -n arquillian-container-impl-base
+Summary:             Arquillian Container Implementation Base
+License:             ASL 2.0 and LGPLv2+
+%description -n arquillian-container-impl-base
+Implementation for the container extension.
+
+%package -n arquillian-container-parent
+Summary:             Arquillian Container Aggregator
+%description -n arquillian-container-parent
+Arquillian Container Aggregator POM.
+
+%package -n arquillian-container-spi
+Summary:             Arquillian Container SPI
+License:             ASL 2.0 and LGPLv2+
+%description -n arquillian-container-spi
+Service Provider Interface for the container extension.
+
+%package -n arquillian-container-test-api
+Summary:             Arquillian Container Test API
+License:             ASL 2.0 and LGPLv2+
+%description -n arquillian-container-test-api
+Integration with the Test extension for the container extension.
+
+%package -n arquillian-container-test-impl-base
+Summary:             Arquillian Container Test Implementation Base
+%description -n arquillian-container-test-impl-base
+Integration with the Test extension for the container extension.
+
+%package -n arquillian-container-test-spi
+Summary:             Arquillian Container Test SPI
+%description -n arquillian-container-test-spi
+Integration with the Test extension for the container extension.
+
+%package -n arquillian-junit-container
+Summary:             Arquillian TestRunner JUnit Container
+%description -n arquillian-junit-container
+JUnit Container Implementation for the Arquillian Project.
+
+%package -n arquillian-junit-core
+Summary:             Arquillian TestRunner JUnit Core
+%description -n arquillian-junit-core
+JUnit Implementation for the Arquillian Project.
+
+%package -n arquillian-junit-parent
+Summary:             Arquillian TestRunner JUnit Aggregator
+%description -n arquillian-junit-parent
+Arquillian JUnit Aggregator POM.
+
+%package -n arquillian-junit-standalone
+Summary:             Arquillian TestRunner JUnit Standalone
+%description -n arquillian-junit-standalone
+JUnit Standalone Implementation for the Arquillian Project.
+
+%package -n arquillian-parent
+Summary:             Arquillian Aggregator
+%description -n arquillian-parent
+Arquillian Aggregator POM.
+
+%package -n arquillian-protocol-jmx
+Summary:             Arquillian Protocol JMX
+%description -n arquillian-protocol-jmx
+Protocol handler for communicating via JMX.
+
+%package -n arquillian-protocol-parent
+Summary:             Arquillian Protocol Aggregator
+%description -n arquillian-protocol-parent
+Arquillian Protocol Aggregator POM.
+
+%package -n arquillian-protocol-servlet
+Summary:             Arquillian Protocol Servlet 2.5/3.x
+License:             ASL 2.0 and LGPLv2+
+%description -n arquillian-protocol-servlet
+Protocol handler for communicating using a Servlet / HTTP following the
+Servlet 2.5/ 2.5/.x spec.
+
+%package -n arquillian-test-api
+Summary:             Arquillian Test API
+%description -n arquillian-test-api
+API for the Test integration.
+
+%package -n arquillian-test-impl-base
+Summary:             Arquillian Test Implementation Base
+%description -n arquillian-test-impl-base
+Implementation Base for the Test integration.
+
+%package -n arquillian-test-parent
+Summary:             Arquillian Test Aggregator
+%description -n arquillian-test-parent
+Arquillian Test Aggregator POM.
+
+%package -n arquillian-test-spi
+Summary:             Arquillian Test SPI
+%description -n arquillian-test-spi
+Service Provider Interface for the Test integration.
+
+%package -n arquillian-testenricher-cdi
+Summary:             Arquillian TestEnricher CDI
+%description -n arquillian-testenricher-cdi
+CDI TestEnricher for the Arquillian Project.
+
+%package -n arquillian-testenricher-ejb
+Summary:             Arquillian TestEnricher EJB
+%description -n arquillian-testenricher-ejb
+EJB TestEnricher for the Arquillian Project.
+
+%package -n arquillian-testenricher-initialcontext
+Summary:             Arquillian TestEnricher InitialContext
+%description -n arquillian-testenricher-initialcontext
+InitialContext TestEnricher for the Arquillian Project.
+
+%package -n arquillian-testenricher-parent
+Summary:             Arquillian TestEnricher Aggregator
+%description -n arquillian-testenricher-parent
+Arquillian TestEnricher Aggregator POM.
+
+%package -n arquillian-testenricher-resource
+Summary:             Arquillian TestEnricher Resource
+%description -n arquillian-testenricher-resource
+Resource TestEnricher for the Arquillian Project.
+
+%package -n arquillian-testng-container
+Summary:             Arquillian TestRunner TestNG Container
+%description -n arquillian-testng-container
+TestNG Container Implementation for the Arquillian Project.
+
+%package -n arquillian-testng-core
+Summary:             Arquillian TestRunner TestNG Core
+%description -n arquillian-testng-core
+TestNG Implementations for the Arquillian Project.
+
+%package -n arquillian-testng-parent
+Summary:             Arquillian TestRunner TestNG Aggregator
+%description -n arquillian-testng-parent
+Arquillian TestNG Aggregator POM.
+
+%package -n arquillian-testng-standalone
+Summary:             Arquillian TestRunner TestNG Standalone
+%description -n arquillian-testng-standalone
+TestNG Standalone Implementation for the Arquillian Project.
+
+%package javadoc
+Summary:             Javadoc for %{name}
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}-%{namedversion}
+%patch0 -p1
+#Remove some usecases that failed due to mockito upgrade
+#>>begin
+rm -r test/impl-base/src/test/java/org/jboss/arquillian/test/impl/*
+rm -r container/impl-base/src/test/java/org/jboss/arquillian/container/impl/*
+rm -r container/test-impl-base/src/test/java/org/jboss/arquillian/container/test/impl/execution/*
+rm -r container/test-impl-base/src/test/java/org/jboss/arquillian/container/test/impl/enricher/resource/*
+rm -r container/test-impl-base/src/test/java/org/jboss/arquillian/container/test/impl/domain/*
+rm -r container/test-impl-base/src/test/java/org/jboss/arquillian/container/test/impl/client/deployment/*
+#<<end
+rm -r testng/core/src/test/* testng/container/src/test/*
+%pom_remove_plugin -r org.codehaus.mojo:animal-sniffer-maven-plugin
+%pom_xpath_set pom:properties/pom:version.jetty_jetty 8.1 protocols/servlet
+
+%build
+%mvn_build -s -- -Pejb31
+
+%install
+%mvn_install
+
+%files api -f .mfiles-%{name}-api
+%doc README.asciidoc
+%license LICENSE
+
+%files impl-base -f .mfiles-%{name}-impl-base
+
+%files spi -f .mfiles-%{name}-spi
+
+%files parent -f .mfiles-%{name}-parent
+%license LICENSE
+
+%files -n arquillian-bom -f .mfiles-arquillian-bom
+%license LICENSE
+
+%files -n arquillian-build -f .mfiles-arquillian-build
+%license LICENSE
+
+%files -n arquillian-config-api -f .mfiles-arquillian-config-api
+
+%files -n arquillian-config-impl-base -f .mfiles-arquillian-config-impl-base
+
+%files -n arquillian-config-spi -f .mfiles-arquillian-config-spi
+
+%files -n arquillian-config-parent -f .mfiles-arquillian-config-parent
+%license LICENSE
+
+%files -n arquillian-container-impl-base -f .mfiles-arquillian-container-impl-base
+
+%files -n arquillian-container-spi -f .mfiles-arquillian-container-spi
+
+%files -n arquillian-container-test-api -f .mfiles-arquillian-container-test-api
+
+%files -n arquillian-container-test-impl-base -f .mfiles-arquillian-container-test-impl-base
+
+%files -n arquillian-container-test-spi -f .mfiles-arquillian-container-test-spi
+
+%files -n arquillian-container-parent -f .mfiles-arquillian-container-parent
+%license LICENSE
+
+%files -n arquillian-junit-container -f .mfiles-arquillian-junit-container
+
+%files -n arquillian-junit-core -f .mfiles-arquillian-junit-core
+
+%files -n arquillian-junit-standalone -f .mfiles-arquillian-junit-standalone
+
+%files -n arquillian-junit-parent -f .mfiles-arquillian-junit-parent
+%license LICENSE
+
+%files -n arquillian-parent -f .mfiles-arquillian-parent
+%license LICENSE
+
+%files -n arquillian-protocol-jmx -f .mfiles-arquillian-protocol-jmx
+
+%files -n arquillian-protocol-servlet -f .mfiles-arquillian-protocol-servlet
+
+%files -n arquillian-protocol-parent -f .mfiles-arquillian-protocol-parent
+%license LICENSE
+
+%files -n arquillian-test-api -f .mfiles-arquillian-test-api
+
+%files -n arquillian-test-impl-base -f .mfiles-arquillian-test-impl-base
+
+%files -n arquillian-test-spi -f .mfiles-arquillian-test-spi
+
+%files -n arquillian-test-parent -f .mfiles-arquillian-test-parent
+%license LICENSE
+
+%files -n arquillian-testenricher-cdi -f .mfiles-arquillian-testenricher-cdi
+
+%files -n arquillian-testenricher-ejb -f .mfiles-arquillian-testenricher-ejb
+
+%files -n arquillian-testenricher-initialcontext -f .mfiles-arquillian-testenricher-initialcontext
+
+%files -n arquillian-testenricher-resource -f .mfiles-arquillian-testenricher-resource
+
+%files -n arquillian-testenricher-parent -f .mfiles-arquillian-testenricher-parent
+%license LICENSE
+
+%files -n arquillian-testng-container -f .mfiles-arquillian-testng-container
+
+%files -n arquillian-testng-core -f .mfiles-arquillian-testng-core
+
+%files -n arquillian-testng-standalone -f .mfiles-arquillian-testng-standalone
+
+%files -n arquillian-testng-parent -f .mfiles-arquillian-testng-parent
+%license LICENSE
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
+
+%changelog
+* Wed Aug 12 2020 maminjie <maminjie1@huawei.com> - 1.1.11-1
+- package init
--- a/arquillian-core.yaml
+++ b/arquillian-core.yaml
@ -0,0 +1,4 @@
+version_control: github
+src_repo: arquillian/arquillian-core
+tag_prefix: ^
+seperator: "."