This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/v3 by this push:
new b25e15fae8 post merge fixes (pom, jakarta)
b25e15fae8 is described below
commit b25e15fae8a7ccd65f45e9c4571fe5d95ac4222a
Author: andi-huber <[email protected]>
AuthorDate: Mon Jun 24 08:12:04 2024 +0200
post merge fixes (pom, jakarta)
---
bom/pom.xml | 56 +++++++++++++++-------
extensions/core/titlecache/applib/pom.xml | 2 +-
extensions/core/titlecache/caffeine/pom.xml | 2 +-
.../caffeine/src/main/java/module-info.java | 4 +-
.../caffeine/dom/TitleCacheSubscriber.java | 37 +++++++-------
extensions/core/titlecache/pom.xml | 4 +-
6 files changed, 63 insertions(+), 42 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 408a9c7f4f..3822c48dc9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -984,7 +984,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<scope>compile</scope>
</dependency>
- <!-- org.apache.causeway.extensions (layoutgithub) -->
+ <!-- org.apache.causeway.extensions (layoutloaders) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-layoutloaders</artifactId>
@@ -1000,6 +1000,29 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<scope>compile</scope>
</dependency>
+ <!-- org.apache.causeway.extensions (titlecache) -->
+ <dependency>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-titlecache</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-titlecache-applib</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.causeway.extensions</groupId>
+
<artifactId>causeway-extensions-titlecache-caffeine</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
<!-- org.apache.causeway.extensions (audittrail) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
@@ -1037,7 +1060,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<scope>compile</scope>
</dependency>
- <!-- org.apache.causeway.extensions (secman) -->
+ <!-- org.apache.causeway.extensions (secman) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-secman</artifactId>
@@ -1109,7 +1132,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<scope>compile</scope>
</dependency>
- <!-- org.apache.causeway.extensions (sessionlog) -->
+ <!-- org.apache.causeway.extensions (sessionlog) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-sessionlog</artifactId>
@@ -1146,7 +1169,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<scope>compile</scope>
</dependency>
- <!-- org.apache.causeway.extensions (spring security)
-->
+ <!-- org.apache.causeway.extensions (spring security) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-spring-security-oauth2</artifactId>
@@ -1155,7 +1178,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<scope>compile</scope>
</dependency>
- <!-- org.apache.causeway.extensions (restful objects
viewer) -->
+ <!-- org.apache.causeway.extensions (restful objects viewer) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-cors</artifactId>
@@ -1171,7 +1194,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<scope>compile</scope>
</dependency>
- <!-- org.apache.causeway.extensions (wicket viewer) -->
+ <!-- org.apache.causeway.extensions (wicket viewer) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-tabular</artifactId>
@@ -1307,7 +1330,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
</dependency>
- <!-- org.apache.causeway.valuetypes -->
+ <!-- org.apache.causeway.valuetypes -->
<dependency>
<groupId>org.apache.causeway.valuetypes</groupId>
<artifactId>causeway-valuetypes-jodatime</artifactId>
@@ -1481,7 +1504,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
</dependency>
- <!-- org.apache.causeway.incubator.viewer -->
+ <!-- org.apache.causeway.incubator.viewer -->
<dependency>
<groupId>org.apache.causeway.incubator.viewer</groupId>
<artifactId>causeway-viewer-graphql</artifactId>
@@ -1512,8 +1535,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
</dependency>
-
- <!-- other dependencies -->
+ <!-- other dependencies -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -1627,7 +1649,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<version>${error_prone_annotations.version}</version>
</dependency>
- <!-- provides @Nullable that's required by Spring 5.x
-->
+ <!-- provides @Nullable that's required by Spring 5.x -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
@@ -1740,7 +1762,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<version>${jakarta.servlet-api.version}</version>
</dependency>
- <!-- 3.2 not available yet, instead use
org.datanucleus:javax.jdo
+ <!-- 3.2 not available yet, instead use org.datanucleus:javax.jdo
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
@@ -1754,7 +1776,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<version>${jopt-simple.version}</version>
</dependency>
- <!-- TODO: when used, move exclusions down -->
+ <!-- TODO: when used, move exclusions down -->
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
@@ -1813,7 +1835,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<version>${wicket.version}</version>
</dependency>
- <!-- TODO: when used, move exclusions down -->
+ <!-- TODO: when used, move exclusions down -->
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
@@ -1826,7 +1848,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
</exclusions>
</dependency>
- <!-- TODO: when used, move exclusions down -->
+ <!-- TODO: when used, move exclusions down -->
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
@@ -1845,7 +1867,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<version>${wicket.version}</version>
</dependency>
- <!-- TODO: when used, move exclusions down -->
+ <!-- TODO: when used, move exclusions down -->
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
@@ -1928,7 +1950,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<version>${easymock.version}</version>
</dependency>
- <!-- TODO: when used, move exclusions down -->
+ <!-- TODO: when used, move exclusions down -->
<dependency>
<groupId>org.htmlparser</groupId>
<artifactId>htmlparser</artifactId>
diff --git a/extensions/core/titlecache/applib/pom.xml
b/extensions/core/titlecache/applib/pom.xml
index 311b4cbf12..a9cc0ce8f0 100644
--- a/extensions/core/titlecache/applib/pom.xml
+++ b/extensions/core/titlecache/applib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-titlecache</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>causeway-extensions-titlecache-applib</artifactId>
diff --git a/extensions/core/titlecache/caffeine/pom.xml
b/extensions/core/titlecache/caffeine/pom.xml
index 99fa09afd0..759e8d7cd5 100644
--- a/extensions/core/titlecache/caffeine/pom.xml
+++ b/extensions/core/titlecache/caffeine/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-titlecache</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>causeway-extensions-titlecache-caffeine</artifactId>
diff --git a/extensions/core/titlecache/caffeine/src/main/java/module-info.java
b/extensions/core/titlecache/caffeine/src/main/java/module-info.java
index d546ddae47..773cd92dc5 100644
--- a/extensions/core/titlecache/caffeine/src/main/java/module-info.java
+++ b/extensions/core/titlecache/caffeine/src/main/java/module-info.java
@@ -24,8 +24,8 @@ module org.apache.causeway.extensions.titlecache.caffeine {
requires cache.api;
- requires java.inject;
- requires java.annotation;
+ requires jakarta.inject;
+ requires jakarta.annotation;
requires org.apache.causeway.applib;
requires org.apache.causeway.core.metamodel;
diff --git
a/extensions/core/titlecache/caffeine/src/main/java/org/apache/causeway/extensions/titlecache/caffeine/dom/TitleCacheSubscriber.java
b/extensions/core/titlecache/caffeine/src/main/java/org/apache/causeway/extensions/titlecache/caffeine/dom/TitleCacheSubscriber.java
index d3aac4132e..365433b412 100644
---
a/extensions/core/titlecache/caffeine/src/main/java/org/apache/causeway/extensions/titlecache/caffeine/dom/TitleCacheSubscriber.java
+++
b/extensions/core/titlecache/caffeine/src/main/java/org/apache/causeway/extensions/titlecache/caffeine/dom/TitleCacheSubscriber.java
@@ -18,19 +18,25 @@
*/
package org.apache.causeway.extensions.titlecache.caffeine.dom;
-import lombok.extern.log4j.Log4j2;
-import lombok.val;
-
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.cache.Cache;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Service;
import org.apache.causeway.applib.CausewayModuleApplib;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.core.config.CausewayConfiguration;
@@ -41,15 +47,8 @@ import
org.apache.causeway.extensions.titlecache.applib.event.Cached;
import
org.apache.causeway.extensions.titlecache.applib.event.CachedWithCacheSettings;
import
org.apache.causeway.extensions.titlecache.caffeine.CausewayModuleExtTitlecacheCaffeine;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.cache.Cache;
-import org.springframework.cache.caffeine.CaffeineCacheManager;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-
-import com.github.benmanes.caffeine.cache.Caffeine;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Holds a cache for each entity type that indicates its title should be
cached.
@@ -63,7 +62,7 @@ import com.github.benmanes.caffeine.cache.Caffeine;
*/
@Service
@Named(TitleCacheSubscriber.LOGICAL_TYPE_NAME)
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
@Qualifier("Default")
@Log4j2
public class TitleCacheSubscriber implements EntityTitleSubscriber {
@@ -106,7 +105,7 @@ public class TitleCacheSubscriber implements
EntityTitleSubscriber {
* @param title (untranslated)
*/
@Override
- public void entityTitleIs(Bookmark bookmark, String title) {
+ public void entityTitleIs(final Bookmark bookmark, final String title) {
val cache = cacheByLogicalTypeName.get(bookmark.getLogicalTypeName());
if(cache == null) {
return;
@@ -128,7 +127,7 @@ public class TitleCacheSubscriber implements
EntityTitleSubscriber {
* @param ev
*/
@EventListener(CausewayModuleApplib.TitleUiEvent.class)
- public void on(CausewayModuleApplib.TitleUiEvent<?> ev) {
+ public void on(final CausewayModuleApplib.TitleUiEvent<?> ev) {
val domainObject = ev.getSource();
if(domainObject == null) {
return;
@@ -186,12 +185,12 @@ public class TitleCacheSubscriber implements
EntityTitleSubscriber {
return cacheManager.getCache(cacheName);
}
- private Boolean isCached(Bookmark bookmark,
CausewayModuleApplib.TitleUiEvent<?> ev) {
+ private Boolean isCached(final Bookmark bookmark, final
CausewayModuleApplib.TitleUiEvent<?> ev) {
return isCached(bookmark.getLogicalTypeName(), ev);
}
private Boolean isCached(
- String logicalTypeName, CausewayModuleApplib.TitleUiEvent<?> ev) {
+ final String logicalTypeName, final
CausewayModuleApplib.TitleUiEvent<?> ev) {
return isCachedByLogicalTypeName.computeIfAbsent(logicalTypeName, ltn
-> {
if (!(ev instanceof Cached)) {
return false;
diff --git a/extensions/core/titlecache/pom.xml
b/extensions/core/titlecache/pom.xml
index fc640bf3b5..5f8e5b68cd 100644
--- a/extensions/core/titlecache/pom.xml
+++ b/extensions/core/titlecache/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-titlecache-caffeine</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
