This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
The following commit(s) were added to refs/heads/master by this push:
new db8f200a Support JPMS
db8f200a is described below
commit db8f200a0629854fb2ebfdcae04cc38f2a14a40f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 29 18:18:03 2023 -0400
Support JPMS
- Bump commons-parent from 58 to 59
- Rework some dependencies
- Leave behind comments of old dependencies FTR in this commit
- Above will be removed next
---
commons-jcs-core/pom.xml | 1 +
commons-jcs-jcache-extras/pom.xml | 63 ++++++++++------
.../jcs3/jcache/extras/web/InMemoryResponse.java | 13 ++++
commons-jcs-jcache-openjpa/pom.xml | 31 +++++---
commons-jcs-jcache/pom.xml | 52 +++++++++-----
.../jcs3/jcache/cdi/CDIJCacheHelperTest.java | 1 -
commons-jcs-tck-tests/pom.xml | 62 ++++++++++------
pom.xml | 83 +++++++++++++++-------
8 files changed, 207 insertions(+), 99 deletions(-)
diff --git a/commons-jcs-core/pom.xml b/commons-jcs-core/pom.xml
index 5887c43d..9575c92f 100644
--- a/commons-jcs-core/pom.xml
+++ b/commons-jcs-core/pom.xml
@@ -40,6 +40,7 @@
<properties>
<commons.bc.version>3.1</commons.bc.version>
+ <commons.module.name>org.apache.commons.jcs3.core</commons.module.name>
<!-- generate report even if there are binary incompatible changes -->
<commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
<commons.japicmp.ignoreMissingClasses>false</commons.japicmp.ignoreMissingClasses>
diff --git a/commons-jcs-jcache-extras/pom.xml
b/commons-jcs-jcache-extras/pom.xml
index 23a719d1..3fda33ef 100644
--- a/commons-jcs-jcache-extras/pom.xml
+++ b/commons-jcs-jcache-extras/pom.xml
@@ -36,32 +36,48 @@
</scm>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcache_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <dependency>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jcache_1.0_spec</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>javax.inject</groupId>-->
+<!-- <artifactId>javax.inject</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-atinject_1.0_spec</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jcdi_2.0_spec</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-interceptor_1.2_spec</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>javax.annotation</groupId>-->
+<!-- <artifactId>javax.annotation-api</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-annotation_1.2_spec</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-servlet_3.0_spec</artifactId>-->
+<!-- <version>1.0</version>-->
+<!-- <scope>provided</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>junit</groupId>
@@ -109,6 +125,7 @@
</dependencies>
<properties>
+
<commons.module.name>org.apache.commons.jcs3.jcache.extras</commons.module.name>
<project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
</properties>
</project>
diff --git
a/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
b/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
index c9dbaa1b..f2025024 100644
---
a/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
+++
b/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
@@ -31,6 +31,7 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.CopyOnWriteArraySet;
import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
@@ -204,6 +205,18 @@ public class InMemoryResponse extends
HttpServletResponseWrapper implements Seri
{
buffer.write(b);
}
+
+ @Override
+ public boolean isReady() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {
+ // TODO Auto-generated method stub
+
+ }
};
}
diff --git a/commons-jcs-jcache-openjpa/pom.xml
b/commons-jcs-jcache-openjpa/pom.xml
index b9f542c9..91689fad 100644
--- a/commons-jcs-jcache-openjpa/pom.xml
+++ b/commons-jcs-jcache-openjpa/pom.xml
@@ -36,21 +36,31 @@
</scm>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcache_1.0_spec</artifactId>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jpa_2.0_spec</artifactId>-->
+<!-- <version>1.1</version>-->
+<!-- <scope>provided</scope>-->
+<!-- </dependency>-->
+ <dependency>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jcache_1.0_spec</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.3</version>
+ <version>3.2.2</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -77,6 +87,7 @@
</dependencies>
<properties>
+
<commons.module.name>org.apache.commons.jcs3.jcache.openjpa</commons.module.name>
<project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
</properties>
</project>
diff --git a/commons-jcs-jcache/pom.xml b/commons-jcs-jcache/pom.xml
index 51d3ec32..c7409597 100644
--- a/commons-jcs-jcache/pom.xml
+++ b/commons-jcs-jcache/pom.xml
@@ -38,26 +38,43 @@
</scm>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcache_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <dependency>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
+ <version>1.1.1</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jcache_1.0_spec</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>javax.inject</groupId>-->
+<!-- <artifactId>javax.inject</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-atinject_1.0_spec</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jcdi_2.0_spec</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-interceptor_1.2_spec</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>javax.annotation</groupId>-->
+<!-- <artifactId>javax.annotation-api</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-annotation_1.2_spec</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -127,6 +144,7 @@
</build>
<properties>
+ <commons.module.name>org.apache.commons.jcs3.jcache</commons.module.name>
<project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
</properties>
</project>
diff --git
a/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
b/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
index 16c550d8..b7992d3a 100644
---
a/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
+++
b/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
@@ -70,7 +70,6 @@ public class CDIJCacheHelperTest
}
}
- @Override
public Constructor<?> getConstructor()
{
return null;
diff --git a/commons-jcs-tck-tests/pom.xml b/commons-jcs-tck-tests/pom.xml
index 73a00a2e..20c2dbb2 100644
--- a/commons-jcs-tck-tests/pom.xml
+++ b/commons-jcs-tck-tests/pom.xml
@@ -95,10 +95,14 @@
<artifactId>app-domain</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcache_1.0_spec</artifactId>
+ <dependency>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jcache_1.0_spec</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>javax.cache</groupId>
@@ -112,28 +116,40 @@
<scope>test</scope>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.transaction</groupId>-->
+<!-- <artifactId>jta</artifactId>-->
+<!-- <version>1.1</version>-->
+<!-- </dependency>-->
+
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jcdi_2.0_spec</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>javax.inject</groupId>-->
+<!-- <artifactId>javax.inject</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-atinject_1.0_spec</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-interceptor_1.2_spec</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>javax.annotation</groupId>-->
+<!-- <artifactId>javax.annotation-api</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-annotation_1.2_spec</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
diff --git a/pom.xml b/pom.xml
index 8a494132..0a6971a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>58</version>
+ <version>59</version>
</parent>
<artifactId>commons-jcs3</artifactId>
@@ -367,39 +367,72 @@
<optional>true</optional>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jcdi_2.0_spec</artifactId>-->
+<!-- <version>1.3</version>-->
+<!-- <scope>provided</scope>-->
+<!-- </dependency>-->
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>8.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-interceptor_1.2_spec</artifactId>-->
+<!-- <version>1.2</version>-->
+<!-- <scope>provided</scope>-->
+<!-- </dependency>-->
+
+<!-- <dependency>-->
+<!-- <groupId>javax.inject</groupId>-->
+<!-- <artifactId>javax.inject</artifactId>-->
+<!-- <version>1</version>-->
+<!-- <scope>provided</scope>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-atinject_1.0_spec</artifactId>-->
+<!-- <version>1.2</version>-->
+<!-- <scope>provided</scope>-->
+<!-- </dependency>-->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcache_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
+ <version>1.1.1</version>
<scope>provided</scope>
</dependency>
+<!-- Does not work with JPMS/moditect -->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-jcache_1.0_spec</artifactId>-->
+<!-- <version>1.0-alpha-1</version>-->
+<!-- <scope>provided</scope>-->
+<!-- </dependency>-->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>1.0</version>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
<scope>provided</scope>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.geronimo.specs</groupId>-->
+<!-- <artifactId>geronimo-annotation_1.2_spec</artifactId>-->
+<!-- <version>1.0</version>-->
+<!-- <scope>provided</scope>-->
+<!-- </dependency>-->
+
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
@@ -411,7 +444,7 @@
<groupId>javax.cache</groupId>
<artifactId>test-domain</artifactId>
<version>${jsr107.api.version}</version>
- <!-- should this be scope test? -->
+ <scope>test</scope>
</dependency>
<dependency>
@@ -431,8 +464,8 @@
<groupId>javax.cache</groupId>
<artifactId>cache-tests</artifactId>
<classifier>tests</classifier>
- <scope>test</scope>
<version>${jsr107.api.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
