require jdk11 for the build,

finish transition to jakarta namespace, update build plugins, update dependencies, remove obsolete build profiles Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
jakartaee · Jul 16, 2020 · 3b37428 · 3b37428
1 parent db3113e
commit 3b37428
Show file tree

Hide file tree

Showing 14 changed files with 478 additions and 473 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ script:
   - cd api
   - mvn -U -C -Pstaging,oss-release -Dnon.final=true -Dgpg.skip=true clean verify
   - cd ..
-  - mvn -U -C -Pstaging,oss-release -Dnon.final=true -Dgpg.skip=true clean verify
+  - mvn -U -C -Pstaging,oss-release,all -Dnon.final=true -Dgpg.skip=true clean verify
   - cd tck
   - mvn -U clean install
   - cd ../impl-tck

diff --git a/bundles/ri/pom.xml b/bundles/ri/pom.xml
@@ -38,80 +38,38 @@
             <groupId>org.glassfish</groupId>
             <artifactId>jakarta.json</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+            <classifier>module</classifier>
+        </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jsonp-jaxrs</artifactId>
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <!-- this profile is just for making build running on JDK 8 happy -->
-            <id>default-setup</id>
-            <activation>
-                <jdk>(,9)</jdk>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>make-assembly-jdk8</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <finalName>jakarta.json-ri-jdk8-${impl_version}</finalName>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/archive-jdk8.xml</descriptor>
-                                    </descriptors>
-                                    <appendAssemblyId>false</appendAssemblyId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>jdk9-setup</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>jakarta.json</artifactId>
-                    <classifier>module</classifier>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <finalName>jakarta.json-ri-${impl_version}</finalName>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/archive.xml</descriptor>
-                                    </descriptors>
-                                    <appendAssemblyId>false</appendAssemblyId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>jakarta.json-ri-${impl_version}</finalName>
+                            <descriptors>
+                                <descriptor>src/main/assembly/archive.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/bundles/ri/src/main/assembly/archive-jdk8.xml b/bundles/ri/src/main/assembly/archive-jdk8.xml
diff --git a/demos/pom.xml b/demos/pom.xml
@@ -68,6 +68,28 @@
                 <module>servlet</module>
                 <module>customprovider-jdk9</module>
             </modules>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-jdk9-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>src/main/jdk9</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 </project>
diff --git a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java
@@ -13,7 +13,7 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import jakarta.json.*;
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;

diff --git a/demos/twitter/src/main/jdk9/module-info.java b/demos/twitter/src/main/jdk9/module-info.java
@@ -9,6 +9,6 @@
  */
 
 module org.glassfish.java.json.demos.twitter {
-    requires java.xml.bind;
+    requires jakarta.xml.bind;
     requires org.glassfish.java.json;
 }