From 7f1fa215582d8dcdbba51fdabf0fa9d002bcac99 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Wed, 25 Sep 2024 18:05:11 -0500 Subject: [PATCH] Fixes #4016 - Cleanup POMs and document correct versions of components (#4017) --- COMPONENTS.md => VERSIONS.md | 21 ++++++++++--------- cli/pom.xml | 2 -- extension/eclipse-epicyro/pom.xml | 4 ---- .../src/main/java/module-info.java | 1 + extension/eclipse-exousia/pom.xml | 4 ---- extension/eclipse-expressly/pom.xml | 4 ---- extension/eclipse-soteria/pom.xml | 4 ---- extension/eclipse-wasp/pom.xml | 4 ---- .../wrappers/EntityManagerWrapper.java | 1 - extension/redhat-weld/pom.xml | 3 --- external/tck/el/pom.xml | 3 +++ external/tck/wasp/pom.xml | 3 +++ test/embedded/jersey/pom.xml | 5 ----- .../springboot-virtualthreads/pom.xml | 1 - 14 files changed, 18 insertions(+), 42 deletions(-) rename COMPONENTS.md => VERSIONS.md (62%) diff --git a/COMPONENTS.md b/VERSIONS.md similarity index 62% rename from COMPONENTS.md rename to VERSIONS.md index e5677daa0c..daf5760525 100644 --- a/COMPONENTS.md +++ b/VERSIONS.md @@ -1,31 +1,32 @@ -# Components +# Versions -The table below lists all the 3rd party components that are used by Piranha to -deliver various bits and pieces of functionality. +The table below lists all the versions of the 3rd party components that are +used by Piranha to deliver various bits and pieces of functionality. | Name | Version | |---------------------------|---------------| | Apache Commons FileUpload | 2.0.0-M2 | | Apache Commons IO | 2.15.1 | +| Arquillian | 1.8.0.Final | | Eclipse Angus Activation | 2.0.2 | | Eclipse Angus Mail | 2.0.3 | | Eclipse Grizzly | 4.0.2 | | Eclipse Grizzly NPN | 2.0.0 | | Eclipse JAXB | 4.0.5 | -| Eclipse Jersey | 3.1.7 | +| Eclipse Jersey | 3.1.8 | | Eclipse JSTL | 3.0.1 | | Eclipse Mojarra | 4.0.7 | | Eclipse Parsson | 1.1.6 | +| Eclipse Soteria | 3.0.3 | | Eclipse Tyrus | 2.1.5 | -| Eclipse Yasson | 3.0.3 | -| EclipseLink | 4.0.3 | +| Eclipse Yasson | 3.0.4 | +| EclipseLink | 4.0.4 | | Hazelcast | 5.4.0 | -| Netty | 4.1.111.Final | +| Netty | 4.1.112.Final | | OmniFaces Services | 0.4 | | OmniFish OmniBeans | 0.3 | | OmniFish Transact | 1.0.1 | | Project CRaC | 0.1.3 | -| RedHat Undertow | 2.3.14.Final | -| RedHat Weld | 5.1.2.Final | | Spring Boot | 3.3.0 | - +| Undertow | 2.3.14.Final | +| Weld | 5.1.3.Final | diff --git a/cli/pom.xml b/cli/pom.xml index 6d726f6116..72e2fe9ad4 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,13 +2,11 @@ 4.0.0 - cloud.piranha project 24.10.0-SNAPSHOT - cloud.piranha.cli project pom diff --git a/extension/eclipse-epicyro/pom.xml b/extension/eclipse-epicyro/pom.xml index 12560d0c88..0d41aab9f0 100644 --- a/extension/eclipse-epicyro/pom.xml +++ b/extension/eclipse-epicyro/pom.xml @@ -2,18 +2,14 @@ 4.0.0 - cloud.piranha.extension project 24.10.0-SNAPSHOT - piranha-extension-eclipse-epicyro jar - Piranha - Extension - Eclipse Epicyro - diff --git a/extension/eclipse-epicyro/src/main/java/module-info.java b/extension/eclipse-epicyro/src/main/java/module-info.java index 2ca4b54d1a..f760f65ced 100644 --- a/extension/eclipse-epicyro/src/main/java/module-info.java +++ b/extension/eclipse-epicyro/src/main/java/module-info.java @@ -30,6 +30,7 @@ * This module delivers the Eclipse Epicyro integration extension. * *

+ * This extension integrates Eclipse Epicyro into Piranha. See * https://github.com/eclipse-ee4j/epicyro for more information about its project. *

diff --git a/extension/eclipse-exousia/pom.xml b/extension/eclipse-exousia/pom.xml index d5dbe4dbec..3a7d275641 100644 --- a/extension/eclipse-exousia/pom.xml +++ b/extension/eclipse-exousia/pom.xml @@ -2,18 +2,14 @@ 4.0.0 - cloud.piranha.extension project 24.10.0-SNAPSHOT - piranha-extension-eclipse-exousia jar - Piranha - Extension - Eclipse Exousia - diff --git a/extension/eclipse-expressly/pom.xml b/extension/eclipse-expressly/pom.xml index 39dd1bd62e..74fd669a09 100644 --- a/extension/eclipse-expressly/pom.xml +++ b/extension/eclipse-expressly/pom.xml @@ -2,18 +2,14 @@ 4.0.0 - cloud.piranha.extension project 24.10.0-SNAPSHOT - piranha-extension-eclipse-expressly jar - Piranha - Extension - Eclipse Expressly - cloud.piranha.core diff --git a/extension/eclipse-soteria/pom.xml b/extension/eclipse-soteria/pom.xml index b784f7e73a..0612315d30 100644 --- a/extension/eclipse-soteria/pom.xml +++ b/extension/eclipse-soteria/pom.xml @@ -2,18 +2,14 @@ 4.0.0 - cloud.piranha.extension project 24.10.0-SNAPSHOT - piranha-extension-eclipse-soteria jar - Piranha - Extension - Eclipse Soteria - diff --git a/extension/eclipse-wasp/pom.xml b/extension/eclipse-wasp/pom.xml index 30386183f4..f175623267 100644 --- a/extension/eclipse-wasp/pom.xml +++ b/extension/eclipse-wasp/pom.xml @@ -2,18 +2,14 @@ 4.0.0 - cloud.piranha.extension project 24.10.0-SNAPSHOT - piranha-extension-eclipse-wasp jar - Piranha - Extension - Eclipse WaSP - diff --git a/extension/eclipselink/src/main/java/cloud/piranha/extension/eclipselink/wrappers/EntityManagerWrapper.java b/extension/eclipselink/src/main/java/cloud/piranha/extension/eclipselink/wrappers/EntityManagerWrapper.java index 1530693ebe..d39aeefb39 100644 --- a/extension/eclipselink/src/main/java/cloud/piranha/extension/eclipselink/wrappers/EntityManagerWrapper.java +++ b/extension/eclipselink/src/main/java/cloud/piranha/extension/eclipselink/wrappers/EntityManagerWrapper.java @@ -25,7 +25,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - package cloud.piranha.extension.eclipselink.wrappers; import java.util.List; diff --git a/extension/redhat-weld/pom.xml b/extension/redhat-weld/pom.xml index c466b5ad5c..202c672f6c 100644 --- a/extension/redhat-weld/pom.xml +++ b/extension/redhat-weld/pom.xml @@ -2,20 +2,17 @@ 4.0.0 - cloud.piranha.extension project 24.10.0-SNAPSHOT - piranha-extension-redhat-weld jar Piranha - Extension - RedHat Weld - UTF-8 diff --git a/external/tck/el/pom.xml b/external/tck/el/pom.xml index 8927136539..66d5acde66 100644 --- a/external/tck/el/pom.xml +++ b/external/tck/el/pom.xml @@ -2,13 +2,16 @@ 4.0.0 + cloud.piranha.external.tck project 24.10.0-SNAPSHOT + piranha-external-tck-expression-language pom + Piranha - External - TCK - Expression Language ${project.build.directory}/ant diff --git a/external/tck/wasp/pom.xml b/external/tck/wasp/pom.xml index d7d4225b24..a8ae81288e 100644 --- a/external/tck/wasp/pom.xml +++ b/external/tck/wasp/pom.xml @@ -2,13 +2,16 @@ 4.0.0 + cloud.piranha.external.tck project 24.10.0-SNAPSHOT + piranha-external-tck-wasp pom + Piranha - External - TCK - WaSP ${project.build.directory}/ant diff --git a/test/embedded/jersey/pom.xml b/test/embedded/jersey/pom.xml index 4dc2c26507..25440ea324 100644 --- a/test/embedded/jersey/pom.xml +++ b/test/embedded/jersey/pom.xml @@ -2,22 +2,17 @@ 4.0.0 - cloud.piranha.test.embedded project 24.10.0-SNAPSHOT - piranha-test-embedded-jersey war - Piranha - Test - Embedded - Jersey - UTF-8 - diff --git a/test/embedded/springboot-virtualthreads/pom.xml b/test/embedded/springboot-virtualthreads/pom.xml index b99661c202..1ce94aad27 100644 --- a/test/embedded/springboot-virtualthreads/pom.xml +++ b/test/embedded/springboot-virtualthreads/pom.xml @@ -12,7 +12,6 @@ cloud.piranha.test.embedded piranha-test-embedded-springboot-virtualthreads 24.10.0-SNAPSHOT - Piranha - Test - Embedded - Spring Boot Virtual Threads