You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/07/18 10:04:07 UTC

[isis] branch master updated: ISIS-2341: fixes stable smoketests to run with gradle build

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 452c413  ISIS-2341: fixes stable smoketests to run with gradle build
452c413 is described below

commit 452c413a6be3f15a52ecfaa108e36bf07b367f64
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jul 18 12:03:53 2020 +0200

    ISIS-2341: fixes stable smoketests to run with gradle build
---
 .../isis/testdomain/commandexecution/WrapperAsyncTest.java   |  0
 examples/smoketests/stable/build.gradle                      |  8 +++++++-
 examples/smoketests/stable/pom.xml                           | 12 ++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java b/examples/smoketests/incubating/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
similarity index 100%
rename from examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
rename to examples/smoketests/incubating/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
diff --git a/examples/smoketests/stable/build.gradle b/examples/smoketests/stable/build.gradle
index 6ac7cd2..5cdc83d 100644
--- a/examples/smoketests/stable/build.gradle
+++ b/examples/smoketests/stable/build.gradle
@@ -6,6 +6,10 @@ plugins {
 group = 'org.apache.isis.app'
 description = 'Apache Isis App - Smoketests'
 
+compileJava {
+    options.compilerArgs << '-parameters'
+}
+
 sourceSets {
 	main {
         resources {
@@ -38,7 +42,9 @@ dependencies {
     compile project(':isis-parent:isis:isis-extensions:isis-extensions-secman:isis-extensions-secman-shiro-realm')
     compile project(':isis-parent:isis:isis-extensions:isis-extensions-shiro-realm-ldap:isis-extensions-shiro-realm-ldap-impl')
     compile(Libs.springDataJpa)
-    testCompile(Libs.jerseySpring5)
+    testCompile(Libs.jerseySpring5) {
+        exclude(module: 'jersey-server')
+    }
     testCompile(Libs.javaxJson)
     testCompile(Libs.moxy)
     testCompile project(':isis-parent:isis:isis-mavendeps:isis-mavendeps-integtests')
diff --git a/examples/smoketests/stable/pom.xml b/examples/smoketests/stable/pom.xml
index 582d944..d736fbc 100644
--- a/examples/smoketests/stable/pom.xml
+++ b/examples/smoketests/stable/pom.xml
@@ -25,4 +25,16 @@
 
 	<name>Apache Isis App - Smoketests (stable)</name>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.glassfish.jersey.ext</groupId>
+			<artifactId>jersey-spring5</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.glassfish.jersey.core</groupId>
+					<artifactId>jersey-server</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
 </project>