Move the implementation to a different groupId and package namespace (#283)

Signed-off-by: Lukas Jungmann <[email protected]>

Author: lukasj

.travis.yml

@@ -4,7 +4,7 @@ language: java
 
 jdk:
   - openjdk11
-  - openjdk14
+  - openjdk15
 
 cache:
   directories:
@@ -15,9 +15,9 @@ install: true
 
 script:
   - cd api
-  - mvn -U -C -Pstaging,oss-release -Dnon.final=true -Dgpg.skip=true clean verify
+  - mvn -U -C -Pstaging,oss-release -Dnon.final=true -Dgpg.skip=true clean install
   - cd ..
-  - mvn -U -C -Pstaging,oss-release,all -Dnon.final=true -Dgpg.skip=true clean verify
+  - mvn -U -C -Pstaging,oss-release,all -Dnon.final=true -Dgpg.skip=true clean install
   - cd tck
   - mvn -U clean install
   - cd ../impl-tck

api/src/main/java/jakarta/json/spi/JsonProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -48,7 +48,7 @@ public abstract class JsonProvider {
      * {@code JsonProvider} implementation class.
      */
     private static final String DEFAULT_PROVIDER
-            = "org.glassfish.json.JsonProviderImpl";
+            = "org.eclipse.jsonp.JsonProviderImpl";
 
     protected JsonProvider() {
     }

bundles/pom.xml

@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish</groupId>
+        <groupId>org.eclipse.jsonp</groupId>
         <artifactId>json</artifactId>
         <version>2.0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.glassfish</groupId>
+    <groupId>org.eclipse.jsonp</groupId>
     <artifactId>json-bundles</artifactId>
     <packaging>pom</packaging>
     <name>Jakarta JSON Processing bundles</name>

bundles/ri/pom.xml

@@ -20,7 +20,7 @@
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish</groupId>
+        <groupId>org.eclipse.jsonp</groupId>
         <artifactId>json-bundles</artifactId>
         <version>2.0.2-SNAPSHOT</version>
     </parent>
@@ -35,16 +35,16 @@
             <artifactId>jakarta.json-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
+            <groupId>org.eclipse.jsonp</groupId>
             <artifactId>jakarta.json</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
+            <groupId>org.eclipse.jsonp</groupId>
             <artifactId>jakarta.json</artifactId>
             <classifier>module</classifier>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
+            <groupId>org.eclipse.jsonp</groupId>
             <artifactId>jsonp-jaxrs</artifactId>
         </dependency>
     </dependencies>

bundles/ri/src/main/assembly/archive.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,24 +38,24 @@
             <outputDirectory>mods</outputDirectory>
             <includes>
                 <include>jakarta.json:jakarta.json-api:*</include>
-                <include>org.glassfish:jakarta.json:jar:module:*</include>
+                <include>org.eclipse.jsonp:jakarta.json:jar:module:*</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>standalone</outputDirectory>
             <includes>
-                <include>org.glassfish:jakarta.json</include>
+                <include>org.eclipse.jsonp:jakarta.json</include>
             </includes>
             <excludes>
-                <exclude>org.glassfish:jakarta.json:jar:module:*</exclude>
+                <exclude>org.eclipse.jsonp:jakarta.json:jar:module:*</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>jaxrs</outputDirectory>
             <includes>
-                <include>org.glassfish:jsonp-jaxrs*</include>
+                <include>org.eclipse.jsonp:jsonp-jaxrs*</include>
             </includes>
         </dependencySet>
     </dependencySets>

bundles/ri/src/main/resources/README.txt

@@ -17,7 +17,7 @@ IMPORTANT NOTE: module names are not yet final and may change in the future rele
 
 for standalone reference implementation which includes APIs and implementation classes:
   <dependency>
-      <groupId>org.glassfish</groupId>
+      <groupId>org.eclipse.jsonp</groupId>
       <artifactId>jakarta.json</artifactId>
       <version>${project.version}</version>
   </dependency>
@@ -31,15 +31,15 @@ for APIs:
 
 for implementation only:
   <dependency>
-      <groupId>org.glassfish</groupId>
+      <groupId>org.eclipse.jsonp</groupId>
       <artifactId>jakarta.json</artifactId>
       <classifier>module</classifier>
       <version>${project.version}</version>
   </dependency>
 
 for Jakarta RESTful Web Services integration module:
   <dependency>
-      <groupId>org.glassfish</groupId>
+      <groupId>org.eclipse.jsonp</groupId>
       <artifactId>jsonp-jaxrs</artifactId>
       <version>${project.version}</version>
   </dependency>

demos/customprovider-jdk9/pom.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -14,7 +14,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.jsonp</groupId>
+        <groupId>org.eclipse.jsonp</groupId>
         <artifactId>demos</artifactId>
         <version>2.0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -63,7 +63,7 @@
                 <configuration>
                     <argLine>
                         --module-path ${project.build.directory}/classes:${mod.dir}:${project.build.directory}/test-classes
-                        --add-modules org.glassfish.jakarta.json.demos.customprovider
+                        --add-modules org.eclipse.jsonp.demos.customprovider
                     </argLine>
                 </configuration>
             </plugin>

demos/customprovider-jdk9/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-module org.glassfish.jakarta.json.demos.customprovider {
+module org.eclipse.jsonp.demos.customprovider {
     requires transitive jakarta.json;
-    exports org.glassfish.json.customprovider;
-    provides jakarta.json.spi.JsonProvider with org.glassfish.json.customprovider.TestProvider;
+    exports org.eclipse.jsonp.demos.customprovider;
+    provides jakarta.json.spi.JsonProvider with org.eclipse.jsonp.demos.customprovider.TestProvider;
 }

demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java renamed to demos/customprovider-jdk9/src/main/java/org/eclipse/jsonp/demos/customprovider/TestGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-package org.glassfish.json.customprovider;
+package org.eclipse.jsonp.demos.customprovider;
 
 import jakarta.json.JsonException;
 import jakarta.json.JsonValue;

demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java renamed to demos/customprovider-jdk9/src/main/java/org/eclipse/jsonp/demos/customprovider/TestProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-package org.glassfish.json.customprovider;
+package org.eclipse.jsonp.demos.customprovider;
 
 import jakarta.json.spi.JsonProvider;
 import jakarta.json.stream.JsonGenerator;