You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/09/26 02:57:50 UTC
[geode] branch develop updated: Bump archunit from 0.12.0 to 0.14.1
(#5537)
This is an automated email from the ASF dual-hosted git repository.
onichols 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 ff58476 Bump archunit from 0.12.0 to 0.14.1 (#5537)
ff58476 is described below
commit ff5847605490735115c0cf91a7c8c54dae9f474b
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Fri Sep 25 19:56:46 2020 -0700
Bump archunit from 0.12.0 to 0.14.1 (#5537)
* Bump archunit from 0.12.0 to 0.14.1
* serialization can depend on annotations in commons
* sertcp server n depend on annotations in commons
* allow membership to depend on annotations in commons module
* allow dependency on annotations in commons
Co-authored-by: Bill Burcham <bi...@gmail.com>
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../internal/membership/MembershipDependenciesJUnitTest.java | 1 +
.../distributed/internal/membership/api/MembershipAPIArchUnitTest.java | 1 +
.../internal/serialization/SerializationDependenciesJUnitTest.java | 3 ++-
.../distributed/internal/tcpserver/TcpServerDependenciesTest.java | 3 ++-
6 files changed, 8 insertions(+), 4 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 e518c28..60b291a 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -166,7 +166,7 @@
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit-junit4</artifactId>
- <version>0.12.0</version>
+ <version>0.14.1</version>
<scope>compile</scope>
</dependency>
<dependency>
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 9c916c3..62eea99 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
@@ -105,7 +105,7 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '3.0.11')
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.12.0')
+ api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.14.1')
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/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
index a1b1260..cb41f1f 100644
--- a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
+++ b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
@@ -57,6 +57,7 @@ public class MembershipDependenciesJUnitTest {
.or(resideInAPackage("org.apache.geode.distributed.internal.tcpserver.."))
.or(resideInAPackage("org.apache.geode.internal.inet.."))
.or(resideInAPackage("org.apache.geode.internal.lang.."))
+ .or(resideInAPackage("org.apache.geode.annotations.."))
.or(not(resideInAPackage("org.apache.geode..")))
.or(type(AvailablePortHelper.class))
diff --git a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/MembershipAPIArchUnitTest.java b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/MembershipAPIArchUnitTest.java
index f480641..4694217 100644
--- a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/MembershipAPIArchUnitTest.java
+++ b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/MembershipAPIArchUnitTest.java
@@ -50,6 +50,7 @@ public class MembershipAPIArchUnitTest {
// Serialization is a dependency of membership
.or(resideInAPackage("org.apache.geode.internal.serialization.."))
.or(resideInAPackage("org.apache.geode.distributed.internal.tcpserver.."))
+ .or(resideInAPackage("org.apache.geode.annotations.."))
// allowed implementation class accesses
.or(type(MembershipBuilderImpl.class))
.or(type(MembershipLocatorBuilderImpl.class))
diff --git a/geode-serialization/src/test/java/org/apache/geode/internal/serialization/SerializationDependenciesJUnitTest.java b/geode-serialization/src/test/java/org/apache/geode/internal/serialization/SerializationDependenciesJUnitTest.java
index f10845b..6f66731 100644
--- a/geode-serialization/src/test/java/org/apache/geode/internal/serialization/SerializationDependenciesJUnitTest.java
+++ b/geode-serialization/src/test/java/org/apache/geode/internal/serialization/SerializationDependenciesJUnitTest.java
@@ -42,6 +42,7 @@ public class SerializationDependenciesJUnitTest {
.onlyDependOnClassesThat(
resideInAPackage("org.apache.geode.internal.serialization..")
.or(not(resideInAPackage("org.apache.geode..")))
- .or(resideInAPackage("org.apache.geode.test..")));
+ .or(resideInAPackage("org.apache.geode.test.."))
+ .or(resideInAPackage("org.apache.geode.annotations..")));
}
diff --git a/geode-tcp-server/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java b/geode-tcp-server/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java
index e04ae7f..136d19c 100644
--- a/geode-tcp-server/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java
+++ b/geode-tcp-server/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerDependenciesTest.java
@@ -50,5 +50,6 @@ public class TcpServerDependenciesTest {
.or(resideInAPackage("org.apache.geode.logging.internal.executors.."))
.or(not(resideInAPackage("org.apache.geode..")))
- .or(resideInAPackage("org.apache.geode.test..")));
+ .or(resideInAPackage("org.apache.geode.test.."))
+ .or(resideInAPackage("org.apache.geode.annotations..")));
}