From 2abf5dd1bcb02f5d7c80943f653c7fb21e3b87ba Mon Sep 17 00:00:00 2001 From: melloware Date: Tue, 16 Apr 2024 15:43:17 -0400 Subject: [PATCH] PrimeFaces 14.0.0-RC3 --- README.md | 5 ++-- docs/pom.xml | 3 ++- pom.xml | 26 +++++++++---------- .../deployment/pom.xml | 3 ++- .../PrimeFacesExtensionsDevUIProcessor.java | 3 ++- .../integration-tests/pom.xml | 6 +++-- .../extensions/it/InputPhoneController.java | 4 ++- .../extensions/it/LocalizedController.java | 4 ++- quarkus-primefaces-extensions/runtime/pom.xml | 3 ++- quarkus-primefaces/deployment/pom.xml | 3 ++- .../deployment/PrimefacesProcessor.java | 1 - .../devui/PrimeFacesDevUIProcessor.java | 3 ++- quarkus-primefaces/integration-tests/pom.xml | 2 ++ .../quarkiverse/primefaces/it/CarService.java | 4 +-- .../primefaces/it/LazyCarDataModel.java | 7 +++-- .../primefaces/it/PrimeFacesResourceTest.java | 9 ++++--- quarkus-primefaces/runtime/pom.xml | 3 ++- 17 files changed, 53 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 15af553..21b2205 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,9 @@ For example: | Version | Explanation | | --- | --- | -| ![2.x](https://img.shields.io/maven-central/v/io.quarkiverse.primefaces/quarkus-primefaces?versionPrefix=2.&color=cyan) | Quarkus 2 (EE8), PrimeFaces 12 | -| ![3.x](https://img.shields.io/maven-central/v/io.quarkiverse.primefaces/quarkus-primefaces?versionPrefix=3.&color=cyan) | Quarkus 3 (EEE10), PrimeFaces 13 | +| ![2.12.x](https://img.shields.io/maven-central/v/io.quarkiverse.primefaces/quarkus-primefaces?versionPrefix=2.&color=cyan) | Quarkus 2 (EE8), PrimeFaces 12 | +| ![3.13.x](https://img.shields.io/maven-central/v/io.quarkiverse.primefaces/quarkus-primefaces?versionPrefix=3.13&color=cyan) | Quarkus 3 (EEE10), PrimeFaces 13 | +| ![3.14.x](https://img.shields.io/maven-central/v/io.quarkiverse.primefaces/quarkus-primefaces?versionPrefix=3.14&color=cyan) | Quarkus 3 (EEE10), PrimeFaces 14 | > [!IMPORTANT] > FeedReader component is not supported in GraalVM Native Image mode due to complexities with their third party library Rome. diff --git a/docs/pom.xml b/docs/pom.xml index 2da7cdc..91b49fc 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -53,7 +53,8 @@ - + + org.apache.maven.plugins maven-resources-plugin diff --git a/pom.xml b/pom.xml index 953edad..9fba9cd 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,8 @@ 3.8.3 2.0.5 3.0.4 - 13.0.8 - 13.0.8 + 14.0.0-RC3 + 14.0.0-RC3 4.0.2 3.13.0 17 @@ -97,6 +97,17 @@ + + + apache.snapshots + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots/ + + false + + + + @@ -117,15 +128,4 @@ - - - apache.snapshots - Apache Development Snapshot Repository - https://repository.apache.org/content/repositories/snapshots/ - - false - - - - diff --git a/quarkus-primefaces-extensions/deployment/pom.xml b/quarkus-primefaces-extensions/deployment/pom.xml index 27c12d0..b33c83e 100644 --- a/quarkus-primefaces-extensions/deployment/pom.xml +++ b/quarkus-primefaces-extensions/deployment/pom.xml @@ -39,7 +39,8 @@ - + + org.apache.maven.plugins maven-compiler-plugin diff --git a/quarkus-primefaces-extensions/deployment/src/main/java/io/quarkiverse/primefaces/extensions/deployment/devui/PrimeFacesExtensionsDevUIProcessor.java b/quarkus-primefaces-extensions/deployment/src/main/java/io/quarkiverse/primefaces/extensions/deployment/devui/PrimeFacesExtensionsDevUIProcessor.java index 3d51b1e..35e4dde 100644 --- a/quarkus-primefaces-extensions/deployment/src/main/java/io/quarkiverse/primefaces/extensions/deployment/devui/PrimeFacesExtensionsDevUIProcessor.java +++ b/quarkus-primefaces-extensions/deployment/src/main/java/io/quarkiverse/primefaces/extensions/deployment/devui/PrimeFacesExtensionsDevUIProcessor.java @@ -6,6 +6,7 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.devui.spi.page.CardPageBuildItem; +import io.quarkus.devui.spi.page.ExternalPageBuilder; import io.quarkus.devui.spi.page.Page; import io.quarkus.devui.spi.page.PageBuilder; @@ -18,7 +19,7 @@ public class PrimeFacesExtensionsDevUIProcessor { void createCard(BuildProducer cardPageBuildItemBuildProducer) { final CardPageBuildItem card = new CardPageBuildItem(); - final PageBuilder versionPage = Page.externalPageBuilder("Version") + final PageBuilder versionPage = Page.externalPageBuilder("Version") .icon("font-awesome-solid:book") .url("https://primefaces-extensions.github.io/") .doNotEmbed() diff --git a/quarkus-primefaces-extensions/integration-tests/pom.xml b/quarkus-primefaces-extensions/integration-tests/pom.xml index 162cd00..0e12226 100644 --- a/quarkus-primefaces-extensions/integration-tests/pom.xml +++ b/quarkus-primefaces-extensions/integration-tests/pom.xml @@ -55,7 +55,8 @@ - + + org.apache.maven.plugins maven-failsafe-plugin @@ -87,7 +88,8 @@ - + + org.apache.maven.plugins maven-surefire-plugin ${native.surefire.skip} diff --git a/quarkus-primefaces-extensions/integration-tests/src/main/java/io/quarkiverse/primefaces/extensions/it/InputPhoneController.java b/quarkus-primefaces-extensions/integration-tests/src/main/java/io/quarkiverse/primefaces/extensions/it/InputPhoneController.java index 7e00a38..5eb8f3e 100644 --- a/quarkus-primefaces-extensions/integration-tests/src/main/java/io/quarkiverse/primefaces/extensions/it/InputPhoneController.java +++ b/quarkus-primefaces-extensions/integration-tests/src/main/java/io/quarkiverse/primefaces/extensions/it/InputPhoneController.java @@ -16,6 +16,7 @@ */ package io.quarkiverse.primefaces.extensions.it; +import java.io.Serial; import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -38,6 +39,7 @@ @ViewScoped public class InputPhoneController implements Serializable { + @Serial private static final long serialVersionUID = 1L; private String phoneNumber; private Map localizedCountries; @@ -67,4 +69,4 @@ public void submit() { log.info(submitted); } -} +} \ No newline at end of file diff --git a/quarkus-primefaces-extensions/integration-tests/src/main/java/io/quarkiverse/primefaces/extensions/it/LocalizedController.java b/quarkus-primefaces-extensions/integration-tests/src/main/java/io/quarkiverse/primefaces/extensions/it/LocalizedController.java index 53b3822..cd40761 100644 --- a/quarkus-primefaces-extensions/integration-tests/src/main/java/io/quarkiverse/primefaces/extensions/it/LocalizedController.java +++ b/quarkus-primefaces-extensions/integration-tests/src/main/java/io/quarkiverse/primefaces/extensions/it/LocalizedController.java @@ -16,6 +16,7 @@ */ package io.quarkiverse.primefaces.extensions.it; +import java.io.Serial; import java.io.Serializable; import jakarta.annotation.PostConstruct; @@ -31,6 +32,7 @@ @ViewScoped public class LocalizedController implements Serializable { + @Serial private static final long serialVersionUID = 1L; private String test; @@ -39,4 +41,4 @@ protected void init() { log.info("LocalizedController postConstruct()"); test = "Localized Test"; } -} +} \ No newline at end of file diff --git a/quarkus-primefaces-extensions/runtime/pom.xml b/quarkus-primefaces-extensions/runtime/pom.xml index ffa0572..a45a11a 100644 --- a/quarkus-primefaces-extensions/runtime/pom.xml +++ b/quarkus-primefaces-extensions/runtime/pom.xml @@ -86,7 +86,8 @@ - + + org.apache.maven.plugins maven-compiler-plugin diff --git a/quarkus-primefaces/deployment/pom.xml b/quarkus-primefaces/deployment/pom.xml index 935c556..761d4f7 100644 --- a/quarkus-primefaces/deployment/pom.xml +++ b/quarkus-primefaces/deployment/pom.xml @@ -44,7 +44,8 @@ - + + org.apache.maven.plugins maven-compiler-plugin diff --git a/quarkus-primefaces/deployment/src/main/java/io/quarkiverse/primefaces/deployment/PrimefacesProcessor.java b/quarkus-primefaces/deployment/src/main/java/io/quarkiverse/primefaces/deployment/PrimefacesProcessor.java index 9f3c8de..bb141e2 100644 --- a/quarkus-primefaces/deployment/src/main/java/io/quarkiverse/primefaces/deployment/PrimefacesProcessor.java +++ b/quarkus-primefaces/deployment/src/main/java/io/quarkiverse/primefaces/deployment/PrimefacesProcessor.java @@ -104,7 +104,6 @@ void registerForReflection(PrimeFacesRecorder recorder, BuildProducer classNames = new ArrayList<>(List.of( org.primefaces.expression.SearchExpressionUtils.class.getName(), - org.primefaces.expression.SearchExpressionFacade.class.getName(), org.primefaces.clientwindow.PrimeClientWindowUtils.class.getName(), org.primefaces.renderkit.RendererUtils.class.getName(), org.primefaces.seo.JsonLD.class.getName(), diff --git a/quarkus-primefaces/deployment/src/main/java/io/quarkiverse/primefaces/deployment/devui/PrimeFacesDevUIProcessor.java b/quarkus-primefaces/deployment/src/main/java/io/quarkiverse/primefaces/deployment/devui/PrimeFacesDevUIProcessor.java index 1a8545a..6601dd1 100644 --- a/quarkus-primefaces/deployment/src/main/java/io/quarkiverse/primefaces/deployment/devui/PrimeFacesDevUIProcessor.java +++ b/quarkus-primefaces/deployment/src/main/java/io/quarkiverse/primefaces/deployment/devui/PrimeFacesDevUIProcessor.java @@ -6,6 +6,7 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.devui.spi.page.CardPageBuildItem; +import io.quarkus.devui.spi.page.ExternalPageBuilder; import io.quarkus.devui.spi.page.Page; import io.quarkus.devui.spi.page.PageBuilder; @@ -18,7 +19,7 @@ public class PrimeFacesDevUIProcessor { void createCard(BuildProducer cardPageBuildItemBuildProducer) { final CardPageBuildItem card = new CardPageBuildItem(); - final PageBuilder versionPage = Page.externalPageBuilder("Version") + final PageBuilder versionPage = Page.externalPageBuilder("Version") .icon("font-awesome-solid:book") .url("https://www.primefaces.org/showcase/") .doNotEmbed() diff --git a/quarkus-primefaces/integration-tests/pom.xml b/quarkus-primefaces/integration-tests/pom.xml index b9d06e7..c7caedc 100644 --- a/quarkus-primefaces/integration-tests/pom.xml +++ b/quarkus-primefaces/integration-tests/pom.xml @@ -56,6 +56,7 @@ + org.apache.maven.plugins maven-failsafe-plugin @@ -88,6 +89,7 @@ + org.apache.maven.plugins maven-surefire-plugin ${native.surefire.skip} diff --git a/quarkus-primefaces/integration-tests/src/main/java/io/quarkiverse/primefaces/it/CarService.java b/quarkus-primefaces/integration-tests/src/main/java/io/quarkiverse/primefaces/it/CarService.java index 824041e..9e202af 100644 --- a/quarkus-primefaces/integration-tests/src/main/java/io/quarkiverse/primefaces/it/CarService.java +++ b/quarkus-primefaces/integration-tests/src/main/java/io/quarkiverse/primefaces/it/CarService.java @@ -61,7 +61,7 @@ public class CarService { } public List createCars(int size) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int i = 0; i < size; i++) { list.add(new Car(getRandomId(), getRandomBrand(), getRandomYear(), getRandomColor(), getRandomPrice(), getRandomSoldState())); @@ -101,4 +101,4 @@ public List getColors() { public List getBrands() { return Arrays.asList(BRANDS); } -} +} \ No newline at end of file diff --git a/quarkus-primefaces/integration-tests/src/main/java/io/quarkiverse/primefaces/it/LazyCarDataModel.java b/quarkus-primefaces/integration-tests/src/main/java/io/quarkiverse/primefaces/it/LazyCarDataModel.java index 5e6afb1..b98ba71 100644 --- a/quarkus-primefaces/integration-tests/src/main/java/io/quarkiverse/primefaces/it/LazyCarDataModel.java +++ b/quarkus-primefaces/integration-tests/src/main/java/io/quarkiverse/primefaces/it/LazyCarDataModel.java @@ -19,7 +19,6 @@ package io.quarkiverse.primefaces.it; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -57,7 +56,7 @@ public String getRowKey(Car car) { @Override public List load(int first, int pageSize, Map sortMeta, Map filterMeta) { - List data = new ArrayList(); + List data = new ArrayList<>(); //filter for (Car car : datasource) { @@ -90,7 +89,7 @@ public List load(int first, int pageSize, Map sortMeta, M //sort if (sortMeta != null) { for (SortMeta current : sortMeta.values()) { - Collections.sort(data, new LazySorter(current.getField(), current.getOrder())); + data.sort(new LazySorter(current.getField(), current.getOrder())); } } @@ -114,4 +113,4 @@ public List load(int first, int pageSize, Map sortMeta, M public int count(Map map) { return 0; } -} \ No newline at end of file +} diff --git a/quarkus-primefaces/integration-tests/src/test/java/io/quarkiverse/primefaces/it/PrimeFacesResourceTest.java b/quarkus-primefaces/integration-tests/src/test/java/io/quarkiverse/primefaces/it/PrimeFacesResourceTest.java index c8f421f..c24aec5 100644 --- a/quarkus-primefaces/integration-tests/src/test/java/io/quarkiverse/primefaces/it/PrimeFacesResourceTest.java +++ b/quarkus-primefaces/integration-tests/src/test/java/io/quarkiverse/primefaces/it/PrimeFacesResourceTest.java @@ -4,6 +4,7 @@ import java.net.URL; +import lombok.extern.jbosslog.JBossLog; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -17,6 +18,7 @@ import io.quarkus.test.common.http.TestHTTPResource; import io.quarkus.test.junit.QuarkusTest; +@JBossLog @QuarkusTest @WithPlaywright public class PrimeFacesResourceTest { @@ -31,9 +33,10 @@ public class PrimeFacesResourceTest { URL accessibility; @Test - public void shouldOpenIndexPage() throws Exception { + public void shouldOpenIndexPage() { final Page page = context.newPage(); Response response = page.navigate(index.toString()); + log.infof("Response: %s", response.text()); Assertions.assertEquals("OK", response.statusText()); page.waitForLoadState(); @@ -49,7 +52,7 @@ public void shouldOpenIndexPage() throws Exception { } @Test - public void shouldAllowTemplate() throws Exception { + public void shouldAllowTemplate() { final Page page = context.newPage(); Response response = page.navigate(accessibility.toString()); Assertions.assertEquals("OK", response.statusText()); @@ -58,4 +61,4 @@ public void shouldAllowTemplate() throws Exception { String title = page.title(); Assertions.assertEquals("Accessibility", title); } -} +} \ No newline at end of file diff --git a/quarkus-primefaces/runtime/pom.xml b/quarkus-primefaces/runtime/pom.xml index 59a0fb8..7ab22bd 100644 --- a/quarkus-primefaces/runtime/pom.xml +++ b/quarkus-primefaces/runtime/pom.xml @@ -74,7 +74,8 @@ - + + org.apache.maven.plugins maven-compiler-plugin