You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by rh...@apache.org on 2020/12/19 04:13:25 UTC
[geode] branch develop updated: GEODE-8496: Bump nebula-facets
plugin. Fix deprecated gradle configuration use. (#5865)
This is an automated email from the ASF dual-hosted git repository.
rhoughton pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 0bdd1e6 GEODE-8496: Bump nebula-facets plugin. Fix deprecated gradle configuration use. (#5865)
0bdd1e6 is described below
commit 0bdd1e68d18967f4a818510bd7495503dc3597f9
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Fri Dec 18 20:12:31 2020 -0800
GEODE-8496: Bump nebula-facets plugin. Fix deprecated gradle configuration use. (#5865)
* Bump nebula-facets plugin. Fix deprecated gradle configuration use.
* Fix dependency for tomcat8 in distributedTest
* facet classpath differences affect api encapsulation tests
* update expected pom
---
.../src/test/resources/expected-pom.xml | 2 +-
build.gradle | 2 +-
.../gradle/plugins/DependencyConstraints.groovy | 2 +-
extensions/geode-modules-tomcat7/build.gradle | 2 ++
extensions/geode-modules-tomcat8/build.gradle | 2 ++
extensions/geode-modules-tomcat9/build.gradle | 1 +
extensions/geode-modules/build.gradle | 2 ++
geode-core/build.gradle | 12 +++--------
.../api/CoreOnlyUsesMembershipAPIArchUnitTest.java | 9 ++++++++-
geode-membership/build.gradle | 2 +-
.../src/test/resources/expected-pom.xml | 20 +++++++++----------
geode-redis/build.gradle | 4 ++--
gradle/test.gradle | 23 ----------------------
13 files changed, 34 insertions(+), 49 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index d8fec55..adf68a3 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -160,7 +160,7 @@
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit-junit4</artifactId>
- <version>0.14.1</version>
+ <version>0.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/build.gradle b/build.gradle
index a3913a6..14cf918 100755
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@
plugins {
id "wrapper"
- id "nebula.facet" version "6.2.0" apply false
+ id "nebula.facet" version "7.0.9" apply false
id "base"
id "idea"
id "eclipse"
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 87724d4..87d91d4 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -104,7 +104,7 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '4.0.0')
api(group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2')
api(group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.2')
- api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.14.1')
+ api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.15.0')
api(group: 'com.zaxxer', name: 'HikariCP', version: '3.4.5')
api(group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4')
api(group: 'commons-codec', name: 'commons-codec', version: '1.15')
diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
index c4d8699..31a841c 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -47,6 +47,8 @@ dependencies {
integrationTestImplementation(project(':extensions:geode-modules-test'))
integrationTestImplementation(project(':geode-dunit'))
integrationTestImplementation('org.httpunit:httpunit')
+ integrationTestImplementation('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat7.version'))
+ integrationTestImplementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat7.version'))
}
sonarqube {
diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
index 574b5b3..70788ed 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -45,6 +45,7 @@ dependencies {
// integrationTest
integrationTestImplementation(project(':extensions:geode-modules-test'))
integrationTestImplementation(project(':geode-dunit'))
+ integrationTestImplementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat8.version'))
// distributedTest
@@ -52,6 +53,7 @@ dependencies {
distributedTestImplementation(project(':geode-dunit'))
distributedTestImplementation(project(':geode-logging'))
distributedTestImplementation('org.httpunit:httpunit')
+ distributedTestImplementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat8.version'))
}
sonarqube {
diff --git a/extensions/geode-modules-tomcat9/build.gradle b/extensions/geode-modules-tomcat9/build.gradle
index 6e47b1c..54fda60 100644
--- a/extensions/geode-modules-tomcat9/build.gradle
+++ b/extensions/geode-modules-tomcat9/build.gradle
@@ -45,6 +45,7 @@ dependencies {
// integrationTest
integrationTestImplementation(project(':extensions:geode-modules-test'))
integrationTestImplementation(project(':geode-dunit'))
+ integrationTestImplementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat9.version'))
}
sonarqube {
diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
index 3787af1..48873e4 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -49,10 +49,12 @@ dependencies {
integrationTestImplementation(project(':extensions:geode-modules-test'))
integrationTestImplementation(project(':geode-dunit'))
integrationTestImplementation('pl.pragmatists:JUnitParams')
+ integrationTestImplementation('org.apache.tomcat:catalina-ha:' + DependencyConstraints.get('tomcat6.version'))
// distributedTest
distributedTestImplementation(project(':geode-dunit'))
+ distributedTestImplementation('org.apache.tomcat:catalina-ha:' + DependencyConstraints.get('tomcat6.version'))
}
sonarqube {
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index da8ba61..baf41b8 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -347,15 +347,9 @@ dependencies {
testRuntime('com.pholser:junit-quickcheck-generators')
integrationTestImplementation(project(':geode-gfsh'))
- integrationTestImplementation(project(':geode-junit')) {
- exclude module: 'geode-core'
- }
- integrationTestImplementation(project(':geode-dunit')) {
- exclude module: 'geode-core'
- }
- integrationTestImplementation(project(':geode-log4j')) {
- exclude module: 'geode-core'
- }
+ integrationTestImplementation(project(':geode-junit'))
+ integrationTestImplementation(project(':geode-dunit'))
+ integrationTestImplementation(project(':geode-log4j'))
integrationTestImplementation(project(':geode-concurrency-test'))
integrationTestImplementation('org.apache.bcel:bcel')
integrationTestImplementation('org.apache.logging.log4j:log4j-core')
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/CoreOnlyUsesMembershipAPIArchUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/CoreOnlyUsesMembershipAPIArchUnitTest.java
index d79714e..80e0a22 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/CoreOnlyUsesMembershipAPIArchUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/CoreOnlyUsesMembershipAPIArchUnitTest.java
@@ -140,8 +140,15 @@ public class CoreOnlyUsesMembershipAPIArchUnitTest {
}
private ClassFileImporter getClassFileImporter() {
+ ImportOption ignoreTestFacets = new ImportOption() {
+ @Override
+ public boolean includes(Location location) {
+ return !location.contains("/test/") && !location.contains("/integrationTest/");
+ }
+ };
return new ClassFileImporter(
- new ImportOptions().with(ImportOption.Predefined.DO_NOT_INCLUDE_ARCHIVES));
+ new ImportOptions()
+ .with(ignoreTestFacets));
}
diff --git a/geode-membership/build.gradle b/geode-membership/build.gradle
index 04bf450..afa684f 100644
--- a/geode-membership/build.gradle
+++ b/geode-membership/build.gradle
@@ -55,7 +55,7 @@ dependencies {
integrationTestImplementation('com.tngtech.archunit:archunit-junit4')
integrationTestImplementation('pl.pragmatists:JUnitParams')
- integrationTestRuntime('org.apache.logging.log4j:log4j-core')
+ integrationTestRuntimeOnly('org.apache.logging.log4j:log4j-core')
distributedTestImplementation(project(':geode-junit'))
diff --git a/geode-membership/src/test/resources/expected-pom.xml b/geode-membership/src/test/resources/expected-pom.xml
index 95d05f1..9eeaf7c 100644
--- a/geode-membership/src/test/resources/expected-pom.xml
+++ b/geode-membership/src/test/resources/expected-pom.xml
@@ -57,6 +57,16 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geode</groupId>
+ <artifactId>geode-serialization</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geode</groupId>
+ <artifactId>geode-tcp-server</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>runtime</scope>
@@ -86,15 +96,5 @@
<artifactId>commons-validator</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-serialization</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-tcp-server</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</project>
diff --git a/geode-redis/build.gradle b/geode-redis/build.gradle
index c35fd9b..8e8854e 100644
--- a/geode-redis/build.gradle
+++ b/geode-redis/build.gradle
@@ -75,13 +75,13 @@ dependencies {
// This only exists for debugging PubSubNativeRedisAcceptanceTest
acceptanceTestImplementation('org.buildobjects:jproc:2.3.0')
- distributedTestCompile('org.apache.logging.log4j:log4j-core')
+ distributedTestImplementation('org.apache.logging.log4j:log4j-core')
distributedTestImplementation(project(':geode-dunit'))
distributedTestImplementation(sourceSets.commonTest.output)
distributedTestImplementation('redis.clients:jedis')
distributedTestImplementation('io.lettuce:lettuce-core')
- distributedTestCompile('javax.servlet:javax.servlet-api')
+ distributedTestImplementation('javax.servlet:javax.servlet-api')
distributedTestImplementation('org.springframework.boot:spring-boot-starter-jetty')
distributedTestImplementation('org.springframework.boot:spring-boot-starter-web') {
exclude module: 'spring-boot-starter-tomcat'
diff --git a/gradle/test.gradle b/gradle/test.gradle
index e12c3e1..e601f5c 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -44,48 +44,25 @@ test {
apply plugin: 'nebula.facet'
facets {
integrationTest {
- testTaskName = 'integrationTest'
includeInCheckLifecycle = false
}
distributedTest {
- testTaskName = 'distributedTest'
includeInCheckLifecycle = false
}
performanceTest {
- testTaskName = 'performanceTest'
includeInCheckLifecycle = false
}
acceptanceTest {
- testTaskName = 'acceptanceTest'
includeInCheckLifecycle = false
}
uiTest {
- testTaskName = 'uiTest'
includeInCheckLifecycle = false
}
upgradeTest {
- testTaskName = 'upgradeTest'
includeInCheckLifecycle = false
}
}
-configurations {
- testAnnotationProcessor.extendsFrom annotationProcessor
- integrationTestAnnotationProcessor.extendsFrom annotationProcessor
- distributedTestAnnotationProcessor.extendsFrom annotationProcessor
- performanceTestAnnotationProcessor.extendsFrom annotationProcessor
- acceptanceTestAnnotationProcessor.extendsFrom annotationProcessor
- uiTestAnnotationProcessor.extendsFrom annotationProcessor
- upgradeTestAnnotationProcessor.extendsFrom annotationProcessor
- // Facets does not extend the new runtimeOnly configurations
- integrationTestRuntimeOnly.extendsFrom(runtimeOnly)
- distributedTestRuntimeOnly.extendsFrom(runtimeOnly)
- performanceTestRuntimeOnly.extendsFrom(runtimeOnly)
- acceptanceTestRuntimeOnly.extendsFrom(runtimeOnly)
- uiTestRuntimeOnly.extendsFrom(runtimeOnly)
- upgradeTestRuntimeOnly.extendsFrom(runtimeOnly)
-}
-
dependencies {
// Do not add dependencies here that are not part of a custom configuration.
// Dependencies should be explicit in the relevant build.gradle files to keep our modules