This is an automated email from the ASF dual-hosted git repository.
tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit c8cac6bfb42978625a81cbc412a60d0983a7b745
Author: Thomas Vandahl <t...@apache.org>
AuthorDate: Wed Aug 23 21:57:12 2023 +0200
Update dependencies. Require Java 17
---
commons-jcs3-core/pom.xml | 2 +-
commons-jcs3-jcache-openjpa/pom.xml | 10 ----
.../jcache/openjpa/OpenJPAJCacheDataCacheTest.java | 35 +++++------
commons-jcs3-jcache-tck/pom.xml | 35 +----------
commons-jcs3-jcache/pom.xml | 39 ++-----------
pom.xml | 68 ++++------------------
src/changes/changes.xml | 22 ++++++-
7 files changed, 54 insertions(+), 157 deletions(-)
diff --git a/commons-jcs3-core/pom.xml b/commons-jcs3-core/pom.xml
index 9575c92f..1f347a22 100644
--- a/commons-jcs3-core/pom.xml
+++ b/commons-jcs3-core/pom.xml
@@ -112,7 +112,7 @@
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/commons-jcs3-jcache-openjpa/pom.xml
b/commons-jcs3-jcache-openjpa/pom.xml
index 91689fad..79ce3a36 100644
--- a/commons-jcs3-jcache-openjpa/pom.xml
+++ b/commons-jcs3-jcache-openjpa/pom.xml
@@ -36,20 +36,10 @@
</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>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>
diff --git
a/commons-jcs3-jcache-openjpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
b/commons-jcs3-jcache-openjpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
index a0a3d54f..c1104eda 100644
---
a/commons-jcs3-jcache-openjpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
+++
b/commons-jcs3-jcache-openjpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
@@ -18,12 +18,14 @@
*/
package org.apache.commons.jcs3.jcache.openjpa;
-import org.apache.derby.jdbc.EmbeddedDriver;
-import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.datacache.QueryKey;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.junit.Test;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+import java.util.Properties;
import javax.persistence.Entity;
import javax.persistence.EntityManager;
@@ -32,15 +34,13 @@ import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Persistence;
import javax.persistence.Query;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import org.apache.derby.jdbc.EmbeddedDriver;
+import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.datacache.QueryKey;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.junit.Test;
public class OpenJPAJCacheDataCacheTest
{
@@ -78,7 +78,6 @@ public class OpenJPAJCacheDataCacheTest
assertTrue(conf.getDataCacheManagerInstance().getDataCache("default").contains(JPAFacadeHelper.toOpenJPAObjectId(conf.getMetaDataRepositoryInstance().getCachedMetaData(MyEntity.class),
entity.getId())));
em.close();
-
emf.close();
}
@@ -103,15 +102,11 @@ public class OpenJPAJCacheDataCacheTest
assertThat(conf.getDataCacheManagerInstance().getDataCache("default"),
instanceOf(OpenJPAJCacheDataCache.class));
assertTrue(conf.getDataCacheManagerInstance().getDataCache("default").contains(JPAFacadeHelper.toOpenJPAObjectId(conf.getMetaDataRepositoryInstance().getCachedMetaData(MyEntity.class),
entity.getId())));
- final Map<Object, Object> args = new HashMap<Object, Object>()
- {{
- put("id", entity.getId());
- }};
+ final Map<Object, Object> args = Map.of("id", entity.getId());
final QueryKey qk =
QueryKey.newInstance(query.unwrap(org.apache.openjpa.kernel.Query.class), args);
assertNotNull(conf.getDataCacheManagerInstance().getSystemQueryCache().get(qk));
em.close();
-
emf.close();
}
diff --git a/commons-jcs3-jcache-tck/pom.xml b/commons-jcs3-jcache-tck/pom.xml
index 20c2dbb2..f5c655ea 100644
--- a/commons-jcs3-jcache-tck/pom.xml
+++ b/commons-jcs3-jcache-tck/pom.xml
@@ -99,10 +99,6 @@
<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>
@@ -116,40 +112,11 @@
<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</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/commons-jcs3-jcache/pom.xml b/commons-jcs3-jcache/pom.xml
index c7409597..cf204a11 100644
--- a/commons-jcs3-jcache/pom.xml
+++ b/commons-jcs3-jcache/pom.xml
@@ -41,40 +41,11 @@
<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>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>
@@ -93,11 +64,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 318e858e..3205434e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,18 +362,11 @@
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
<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>javax</groupId>
<artifactId>javaee-api</artifactId>
@@ -385,86 +378,46 @@
</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>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>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>
- <version>1.7.6</version>
+ <version>2.0.27</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>javax.cache</groupId>
<artifactId>test-domain</artifactId>
<version>${jsr107.api.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>javax.cache</groupId>
<artifactId>app-domain</artifactId>
<version>${jsr107.api.version}</version>
</dependency>
-
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-tests</artifactId>
- <version>${jsr107.api.version}</version>
+ <version>1.1.1</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-tests</artifactId>
<classifier>tests</classifier>
- <version>${jsr107.api.version}</version>
+ <version>1.1.1</version>
<scope>test</scope>
</dependency>
@@ -478,7 +431,7 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>${commons.pmd.version}</version>
<configuration>
- <targetJdk>1.8</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
</plugin>
<plugin>
@@ -576,15 +529,16 @@
<!-- Default configuration for compiler source and target JVM -->
<maven.compiler.sourceEncoding>UTF-8</maven.compiler.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ <commons.compiler.release>17</commons.compiler.release>
<commons.componentid>jcs</commons.componentid>
<commons.osgi.symbolicName>org.apache.commons.${project.artifactId}</commons.osgi.symbolicName>
<commons.module.name>org.apache.commons.jcs3</commons.module.name>
<commons.release.version>3.2</commons.release.version>
<commons.release.name>commons-jcs3-dist-3.2</commons.release.name>
- <commons.release.desc>(Java 8+)</commons.release.desc>
+ <commons.release.desc>(Java 17+)</commons.release.desc>
<commons.releaseManagerName>tv</commons.releaseManagerName>
<commons.releaseManagerKey>88817402</commons.releaseManagerKey>
<!-- The RC version used in the staging repository URL. -->
@@ -599,7 +553,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<commons.encoding>UTF-8</commons.encoding>
-
<commons.javadoc.java.link>https://docs.oracle.com/javase/8/docs/api/</commons.javadoc.java.link>
+
<commons.javadoc.java.link>https://docs.oracle.com/javase/17/docs/api/</commons.javadoc.java.link>
<jsr107.api.version>1.0.1</jsr107.api.version>
<commons.collections.version>4.4</commons.collections.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a31fab00..273f3b7f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,7 +21,27 @@
<author email="d...@commons.apache.org">Apache Commons
Developers</author>
</properties>
<body>
- <release version="3.1.1" date="TBD">
+ <release version="3.2.1" date="TBD">
+ <action dev="tv" type="update">
+ Update dependency servlet-api 2.5 to java.servlet-api 3.1.0
+ </action>
+ <action dev="tv" type="update">
+ Update dependency openwebbeans-impl 1.7.6 to 2.0.27
+ </action>
+ <action dev="tv" type="update">
+ Update dependency cache-tests 1.0.1 to 1.1.1
+ </action>
+ <action dev="tv" type="update">
+ Update Tomcat libraries 7.0.22 to 9.0.79
+ </action>
+ <action dev="tv" type="update">
+ From this release on we require Java 17
+ </action>
+ </release>
+ <release version="3.2" date="2023-08-22">
+ <action dev="tv" type="fix" issue="JCS-234" due-to="Chris Lake">
+ Fix OSGi manifest
+ </action>
<action dev="tv" type="fix" issue="JCS-232" due-to="Jeremy Long">
Handle ServiceConfigurationError when using a different logging
framework
</action>
