From 79179262168f3a39a6cb28bf8e646fd32f3814c7 Mon Sep 17 00:00:00 2001
From: hht8 <huanghaitao12138@163.com>
Date: Thu, 3 Dec 2020 17:12:55 +0800
Subject: [PATCH] Disable test to avoid jetty8

---
 ...atch => Updates-testNG-to-use-6.9.10.patch |  0
 arquillian-core.spec                          | 20 ++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)
 rename 3fa56bfa6b5866cc096568cfc008466ad101c0fc.patch => Updates-testNG-to-use-6.9.10.patch (100%)

diff --git a/3fa56bfa6b5866cc096568cfc008466ad101c0fc.patch b/Updates-testNG-to-use-6.9.10.patch
similarity index 100%
rename from 3fa56bfa6b5866cc096568cfc008466ad101c0fc.patch
rename to Updates-testNG-to-use-6.9.10.patch
diff --git a/arquillian-core.spec b/arquillian-core.spec
index 407fc4b..e320dd9 100644
--- a/arquillian-core.spec
+++ b/arquillian-core.spec
@@ -3,13 +3,13 @@
 
 Name:                arquillian-core
 Version:             1.1.11
-Release:             1
+Release:             2
 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
+Patch0:              Updates-testNG-to-use-6.9.10.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:)
@@ -27,8 +27,7 @@ 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.mockito:mockito-all)
 BuildRequires:       mvn(org.slf4j:slf4j-simple) mvn(org.testng:testng)
 BuildArch:           noarch
 
@@ -249,10 +248,18 @@ rm -r container/test-impl-base/src/test/java/org/jboss/arquillian/container/test
 #<<end
 rm -r testng/core/src/test/* testng/container/src/test/*
 %pom_remove_plugin -r org.codehaus.mojo:animal-sniffer-maven-plugin
+%pom_remove_dep org.jboss.arquillian.core:arquillian-core-impl-base config/impl-base
+%pom_remove_dep org.jboss.arquillian.core:arquillian-core-impl-base container/impl-base
+%pom_remove_dep org.jboss.arquillian.core:arquillian-core-impl-base container/test-impl-base
+%pom_remove_dep org.jboss.arquillian.core:arquillian-core-impl-base test/impl-base
+%pom_remove_dep org.jboss.arquillian.core:arquillian-core-impl-base junit/core
+%pom_remove_dep org.jboss.arquillian.test:arquillian-test-impl-base junit/core
+%pom_remove_dep org.jboss.arquillian.core:arquillian-core-impl-base testenrichers/cdi
+%pom_remove_dep org.jboss.arquillian.test:arquillian-test-impl-base testenrichers/cdi
 %pom_xpath_set pom:properties/pom:version.jetty_jetty 8.1 protocols/servlet
 
 %build
-%mvn_build -s -- -Pejb31
+%mvn_build -s -- -Pejb31 -Dmaven.test.skip=true
 
 %install
 %mvn_install
@@ -348,5 +355,8 @@ rm -r testng/core/src/test/* testng/container/src/test/*
 %license LICENSE
 
 %changelog
+* Thu Dec 03 2020 huanghaitao <huanghaitao8@huawei.com> - 1.1.11-2
+- Disable test to avoid jetty8
+
 * Wed Aug 12 2020 maminjie <maminjie1@huawei.com> - 1.1.11-1
 - package init