Fixes piranhacloud#3760 - Move Eclipse Parsson into its own Piranha E…

…xtension (piranhacloud#3761)
mnriem · Jun 15, 2024 · 244fd9a · 244fd9a
1 parent 041f7f0
commit 244fd9a
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 28 deletions.
diff --git a/COMPONENTS.md b/COMPONENTS.md
@@ -15,6 +15,7 @@ for more information about each of them.
 | Eclipse JAXB              | 4.0.5         |
 | Eclipse JSTL              | 3.0.1         |
 | Eclipse Mojarra           | 4.0.7         |
+| Eclipse Parsson           | 1.1.5         |
 | Eclipse Yasson            | 3.0.3         |
 | Netty                     | 4.1.108.Final |
 | Project CRaC              | 0.1.3         |

diff --git a/extension/eclipse-parsson/pom.xml b/extension/eclipse-parsson/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cloud.piranha.extension</groupId>
+        <artifactId>project</artifactId>
+        <version>24.6.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>piranha-extension-eclipse-parsson</artifactId>
+    <packaging>jar</packaging>
+    <name>Piranha - Extension - Eclipse Parsson</name>
+    <properties>
+        <parsson.version>1.1.5</parsson.version>
+    </properties>
+    <dependencies>
+        <!-- compile -->
+        <dependency>
+            <groupId>cloud.piranha.core</groupId>
+            <artifactId>piranha-core-api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- provided -->
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-scinitializer</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- runtime -->
+        <dependency>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
+            <version>${parsson.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...nsion/eclipse-parsson/src/main/java/cloud/piranha/extension/parsson/ParssonExtension.java b/...nsion/eclipse-parsson/src/main/java/cloud/piranha/extension/parsson/ParssonExtension.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the name of the copyright holder nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package cloud.piranha.extension.parsson;
+
+import cloud.piranha.core.api.WebApplication;
+import cloud.piranha.core.api.WebApplicationExtension;
+import java.lang.System.Logger;
+import static java.lang.System.Logger.Level.TRACE;
+
+/**
+ * The extension that delivers Eclipse Parsson to Piranha.
+ *
+ * @author Manfred Riem ([email protected])
+ */
+public class ParssonExtension implements WebApplicationExtension {
+
+    /**
+     * Stores the logger.
+     */
+    private static final Logger LOGGER = System.getLogger(ParssonExtension.class.getName());
+
+    /**
+     * Configure the extension.
+     * 
+     * @param webApplication the web application.
+     */
+    @Override
+    public void configure(WebApplication webApplication) {
+        LOGGER.log(TRACE, "Configuring Eclipse Parsson extension");
+    }
+}
diff --git a/extension/eclipse-parsson/src/main/java/module-info.java b/extension/eclipse-parsson/src/main/java/module-info.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the name of the copyright holder nor the names of its
+ *      contributors may be used to endorse or promote products derived from
+ *      this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * This module delivers the Eclipse Parsson integration extension.
+ *
+ * <p>
+ *  This extension integrates Eclipse Parsson into Piranha.
+ * </p>
+ * 
+ * @author Manfred Riem ([email protected])
+ */
+module cloud.piranha.extension.parsson {
+
+    requires cloud.piranha.core.api;
+    requires static cloud.piranha.extension.scinitializer;
+}
diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml
@@ -86,6 +86,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-eclipse-parsson</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency> 
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-eclipse-yasson</artifactId>
@@ -152,20 +158,6 @@
         </dependency>
 
         <!-- runtime -->
-
-        <!-- Jakarta JSON Processing API -->
-        <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-api</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- Eclipse JSON Processing implementation -->
-        <dependency>
-            <groupId>org.eclipse.parsson</groupId>
-            <artifactId>parsson</artifactId>
-            <scope>runtime</scope>
-        </dependency>
 
         <!-- Jakarta JSON Binding API -->
         <dependency>

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -32,6 +32,7 @@
         <module>eclipse-jersey</module>
         <module>eclipse-jstl</module>
         <module>eclipse-mojarra</module>
+        <module>eclipse-parsson</module>
         <module>eclipse-soteria</module>
         <module>eclipse-yasson</module>
         <module>eclipse-wasp</module>

diff --git a/pom.xml b/pom.xml
@@ -94,7 +94,6 @@
         <omniservices.version>0.4</omniservices.version>
         <omniutils.version>0.13</omniutils.version>
         <omni-mp-config.version>3.0.0</omni-mp-config.version>
-        <parsson.version>1.1.5</parsson.version>
         <shrinkwrap-impl-base.version>2.0.0-beta-1</shrinkwrap-impl-base.version>
         <shrinkwrap-descriptors-api-base.version>2.0.0</shrinkwrap-descriptors-api-base.version>
         <shrinkwrap-resolver.version>3.3.0</shrinkwrap-resolver.version>
@@ -164,13 +163,6 @@
                 <version>${maven-plugin-tools-annotations.version}</version>
             </dependency>
 
-            <!-- Eclipse Parsson -->
-            <dependency>
-                <groupId>org.eclipse.parsson</groupId>
-                <artifactId>parsson</artifactId>
-                <version>${parsson.version}</version>
-            </dependency>
-
             <!-- Eclipse Tyrus -->
             <dependency>
                 <groupId>org.glassfish.tyrus</groupId>

diff --git a/test/debug/pom.xml b/test/debug/pom.xml
@@ -409,12 +409,6 @@
             <artifactId>maven-plugin-annotations</artifactId>
         </dependency>
 
-        <!-- Eclipse Parsson -->
-        <dependency>
-            <groupId>org.eclipse.parsson</groupId>
-            <artifactId>parsson</artifactId>
-        </dependency>
-
         <!-- Eclipse Tyrus -->
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>