From a6ecd80285dac6eb45f17a8f4e821565d9bf7771 Mon Sep 17 00:00:00 2001 From: "h.vanwerkhoven" Date: Tue, 15 Oct 2024 14:41:14 +0200 Subject: [PATCH 1/2] [aps-1000]update to bloomreach 16 --- focuspoints-client-core-servlet/pom.xml | 6 +- .../servlet/FocusPointsInitalizer.java | 8 +- .../pom.xml | 2 +- focuspoints-client-core-spring/pom.xml | 2 +- focuspoints-client-core/pom.xml | 7 +- .../FocusPointsConfigurationProperties.java | 3 +- focuspoints-client-taglib/pom.xml | 7 +- .../taglib/support/ImageOperationTag.java | 8 +- .../io/focuspoints/client/util/TagUtils.java | 19 ++-- focuspoints-client-thymeleaf/pom.xml | 2 +- pom.xml | 87 +++++++++++-------- 11 files changed, 85 insertions(+), 66 deletions(-) diff --git a/focuspoints-client-core-servlet/pom.xml b/focuspoints-client-core-servlet/pom.xml index 6cd5fb4..3d2145f 100644 --- a/focuspoints-client-core-servlet/pom.xml +++ b/focuspoints-client-core-servlet/pom.xml @@ -5,7 +5,7 @@ io.focuspoints focuspoints-client - 1.0.1 + 2.0.0 focuspoints-client-core-servlet @@ -20,8 +20,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api \ No newline at end of file diff --git a/focuspoints-client-core-servlet/src/main/java/io/focuspoints/servlet/FocusPointsInitalizer.java b/focuspoints-client-core-servlet/src/main/java/io/focuspoints/servlet/FocusPointsInitalizer.java index c515cc7..34bfb6f 100644 --- a/focuspoints-client-core-servlet/src/main/java/io/focuspoints/servlet/FocusPointsInitalizer.java +++ b/focuspoints-client-core-servlet/src/main/java/io/focuspoints/servlet/FocusPointsInitalizer.java @@ -5,10 +5,10 @@ import io.focuspoints.client.UrlCreator; import java.util.function.Consumer; import java.util.function.Function; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import org.apache.commons.lang3.StringUtils; @WebListener diff --git a/focuspoints-client-core-spring-boot-starter/pom.xml b/focuspoints-client-core-spring-boot-starter/pom.xml index c255e40..0ab5dfd 100644 --- a/focuspoints-client-core-spring-boot-starter/pom.xml +++ b/focuspoints-client-core-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ io.focuspoints focuspoints-client - 1.0.1 + 2.0.0 focuspoints-client-core-spring-boot-starter diff --git a/focuspoints-client-core-spring/pom.xml b/focuspoints-client-core-spring/pom.xml index e9a8d83..1d784d9 100644 --- a/focuspoints-client-core-spring/pom.xml +++ b/focuspoints-client-core-spring/pom.xml @@ -5,7 +5,7 @@ io.focuspoints focuspoints-client - 1.0.1 + 2.0.0 focuspoints-client-core-spring diff --git a/focuspoints-client-core/pom.xml b/focuspoints-client-core/pom.xml index 66df263..22763e4 100644 --- a/focuspoints-client-core/pom.xml +++ b/focuspoints-client-core/pom.xml @@ -5,7 +5,7 @@ io.focuspoints focuspoints-client - 1.0.1 + 2.0.0 focuspoints-client-core @@ -23,6 +23,11 @@ com.auth0 java-jwt + + + jakarta.annotation + jakarta.annotation-api + io.mikael diff --git a/focuspoints-client-core/src/main/java/io/focuspoints/client/FocusPointsConfigurationProperties.java b/focuspoints-client-core/src/main/java/io/focuspoints/client/FocusPointsConfigurationProperties.java index 4f54e82..8a6bf63 100644 --- a/focuspoints-client-core/src/main/java/io/focuspoints/client/FocusPointsConfigurationProperties.java +++ b/focuspoints-client-core/src/main/java/io/focuspoints/client/FocusPointsConfigurationProperties.java @@ -1,6 +1,7 @@ package io.focuspoints.client; -import javax.annotation.PostConstruct; + +import jakarta.annotation.PostConstruct; import lombok.Data; import org.apache.commons.lang3.Validate; diff --git a/focuspoints-client-taglib/pom.xml b/focuspoints-client-taglib/pom.xml index 6f92626..09e4315 100644 --- a/focuspoints-client-taglib/pom.xml +++ b/focuspoints-client-taglib/pom.xml @@ -5,7 +5,7 @@ io.focuspoints focuspoints-client - 1.0.1 + 2.0.0 focuspoints-client-taglib @@ -20,9 +20,10 @@ - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api + org.projectlombok diff --git a/focuspoints-client-taglib/src/main/java/io/focuspoints/client/taglib/support/ImageOperationTag.java b/focuspoints-client-taglib/src/main/java/io/focuspoints/client/taglib/support/ImageOperationTag.java index 8ba6f61..514ee51 100644 --- a/focuspoints-client-taglib/src/main/java/io/focuspoints/client/taglib/support/ImageOperationTag.java +++ b/focuspoints-client-taglib/src/main/java/io/focuspoints/client/taglib/support/ImageOperationTag.java @@ -7,9 +7,9 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.TagSupport; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -67,7 +67,7 @@ protected URL getImageUrl() { } } - protected String getValue() throws JspException { + protected String getValue() { if(!this.getConfiguration().isEnabled()) { return this.getImageUrl().toExternalForm(); } diff --git a/focuspoints-client-taglib/src/main/java/io/focuspoints/client/util/TagUtils.java b/focuspoints-client-taglib/src/main/java/io/focuspoints/client/util/TagUtils.java index 6e3c3cc..4e28318 100644 --- a/focuspoints-client-taglib/src/main/java/io/focuspoints/client/util/TagUtils.java +++ b/focuspoints-client-taglib/src/main/java/io/focuspoints/client/util/TagUtils.java @@ -1,6 +1,6 @@ package io.focuspoints.client.util; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.PageContext; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -13,16 +13,11 @@ public class TagUtils { public static final String SCOPE_APPLICATION = "application"; public static int getScope(String scope) { - switch (scope) { - default: - case SCOPE_PAGE: - return PageContext.PAGE_SCOPE; - case SCOPE_REQUEST: - return PageContext.REQUEST_SCOPE; - case SCOPE_SESSION: - return PageContext.SESSION_SCOPE; - case SCOPE_APPLICATION: - return PageContext.APPLICATION_SCOPE; - } + return switch (scope) { + case SCOPE_REQUEST -> PageContext.REQUEST_SCOPE; + case SCOPE_SESSION -> PageContext.SESSION_SCOPE; + case SCOPE_APPLICATION -> PageContext.APPLICATION_SCOPE; + default -> PageContext.PAGE_SCOPE; + }; } } diff --git a/focuspoints-client-thymeleaf/pom.xml b/focuspoints-client-thymeleaf/pom.xml index 8818c74..bd276f3 100644 --- a/focuspoints-client-thymeleaf/pom.xml +++ b/focuspoints-client-thymeleaf/pom.xml @@ -5,7 +5,7 @@ io.focuspoints focuspoints-client - 1.0.1 + 2.0.0 focuspoints-client-thymeleaf diff --git a/pom.xml b/pom.xml index 867810b..7d84bcc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.focuspoints focuspoints-client - 1.0.1 + 2.0.0 pom @@ -35,41 +35,53 @@ https://tfe.nl/ - + - 1.8 - + + 17 + ${java.version} ${java.version} - - utf-8 - utf-8 - - 3.10 - 3.10.2 + + UTF-8 + UTF-8 + + + 3.13.0 + 4.4.0 2.0.9 - 5.2.4.RELEASE - 2.2.5.RELEASE - 4.0.1 - 2.3.3 - 3.0.11.RELEASE - 1.18.12 - - 1.5.2 - 5.6.0 - 3.3.3 - - 0.8.5 - 2.8.2 - 2.5.3 - 1.11.2 - 2.22.2 + + + 6.1.8 + 3.3.0 + + + 6.0.0 + 2.1.1 + 3.0.0 + + + 3.1.1.RELEASE + + + 1.18.30 + + 1.9.2 + 5.9.2 + 5.4.0 + + + 0.8.10 + 3.0.0-M1 + 3.0.0 + 1.12.0 + 3.1.2 3.2.1 - 3.2.0 - 1.6 - 1.6.8 + 3.5.0 + 3.0.1 + 1.6.13 - + focuspoints-client-core focuspoints-client-core-spring @@ -126,15 +138,15 @@ - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet-api.version} provided - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api ${jsp-api.version} provided @@ -171,6 +183,11 @@ ${mockito.version} test + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.version} + From 4d65986a355329a77dc2aefd9bc4f202093e4159 Mon Sep 17 00:00:00 2001 From: wruitenbeek Date: Mon, 20 Jan 2025 17:19:01 +0100 Subject: [PATCH 2/2] Updated functions so javax is not used --- .../client/AbstractImageTokenBuilderTest.java | 12 ++++++------ focuspoints-client-taglib/pom.xml | 15 ++++++++++----- pom.xml | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/focuspoints-client-core/src/test/java/io/focuspoints/client/AbstractImageTokenBuilderTest.java b/focuspoints-client-core/src/test/java/io/focuspoints/client/AbstractImageTokenBuilderTest.java index 7373d34..8f02723 100644 --- a/focuspoints-client-core/src/test/java/io/focuspoints/client/AbstractImageTokenBuilderTest.java +++ b/focuspoints-client-core/src/test/java/io/focuspoints/client/AbstractImageTokenBuilderTest.java @@ -44,21 +44,21 @@ public void testConstructorWithBlankSecret() { () -> new TestTokenBuilder(this.issuer, "") ); } - + @Test public void testBuild() { String expectedToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJ0ZXN0SXNzdWVyIiwiYWN0aW9uIjoidGVzdEFjdGlvbiJ9.qME7SDyRb3U-VxktQjK8E63V_eXcs4-KVMJmeCo9NP2I0LJZzGcKzYPXGLsKNLqemQ9Wu5h6iW_Qx6e9upxjEw"; - + TestTokenBuilder builder = spy(new TestTokenBuilder(this.issuer, this.secret)); - + String token = builder.build(); - + verify(builder).getAction(); verify(builder).buildInternal(notNull()); - + assertEquals(expectedToken, token); } - + private static class TestTokenBuilder extends AbstractImageTokenBuilder { diff --git a/focuspoints-client-taglib/pom.xml b/focuspoints-client-taglib/pom.xml index 09e4315..61dbd2f 100644 --- a/focuspoints-client-taglib/pom.xml +++ b/focuspoints-client-taglib/pom.xml @@ -1,13 +1,13 @@ - + 4.0.0 - + io.focuspoints focuspoints-client 2.0.0 - + focuspoints-client-taglib FocusPoints Client Taglib @@ -18,13 +18,18 @@ io.focuspoints focuspoints-client-core - + + + jakarta.servlet + jakarta.servlet-api + + jakarta.servlet.jsp jakarta.servlet.jsp-api - + org.projectlombok lombok diff --git a/pom.xml b/pom.xml index 7d84bcc..c3a812d 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 6.0.0 2.1.1 - 3.0.0 + 4.0.0 3.1.1.RELEASE