Remove jlink-image support and revert to helidon-maven-plugin:1.0.10. (…

…#1451)
helidon-io · Feb 27, 2020 · 590e8fd · 590e8fd
1 parent 3d76fd9
commit 590e8fd
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 455 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,12 +32,6 @@ This is a bug fix release of Helidon.
 - Upgrade H2, HikariCP, Jedis Client, OCI Client [1270](https://github.com/oracle/helidon/pull/1270)
 - Upgrade shrinkwrap used by arquillian to support https [1308](https://github.com/oracle/helidon/pull/1308)
 
-### Experimental
-
-The following enhancements are experimental. They should be considered unstable and subject
-to change.
-
-- Add jlink-image support [1423](https://github.com/oracle/helidon/pull/1423)
 
 ## [1.4.1]
 

diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
@@ -73,25 +73,4 @@
             </plugins>
         </pluginManagement>
     </build>
-    <profiles>
-        <profile>
-            <id>jlink-image</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.helidon.build-tools</groupId>
-                        <artifactId>helidon-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>jlink-image</id>
-                                <goals>
-                                    <goal>jlink-image</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/applications/pom.xml b/applications/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2020 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@
         <version.plugin.dependency>3.0.0</version.plugin.dependency>
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>2.19.1</version.plugin.failsafe>
-        <version.plugin.helidon>1.1.1</version.plugin.helidon>
+        <version.plugin.helidon>1.0.10</version.plugin.helidon>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
         <version.plugin.protobuf>0.5.1</version.plugin.protobuf>

diff --git a/applications/se/pom.xml b/applications/se/pom.xml
@@ -18,7 +18,7 @@
 -->
 
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+        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>io.helidon.applications</groupId>
@@ -40,7 +40,6 @@
                         <artifactId>helidon-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>native-image</id>
                                 <goals>
                                     <goal>native-image</goal>
                                 </goals>
@@ -56,24 +55,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>jlink-image</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.helidon.build-tools</groupId>
-                        <artifactId>helidon-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>jlink-image</id>
-                                <goals>
-                                    <goal>jlink-image</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/examples/quickstarts/helidon-quickstart-mp/Dockerfile.jlink b/examples/quickstarts/helidon-quickstart-mp/Dockerfile.jlink
diff --git a/examples/quickstarts/helidon-quickstart-mp/README.md b/examples/quickstarts/helidon-quickstart-mp/README.md
@@ -61,57 +61,8 @@ Exercise the application as described above
 ## Deploy the application to Kubernetes
 
 ```
-kubectl cluster-info                       # Verify which cluster
-kubectl get pods                           # Verify connectivity to cluster
-kubectl create -f app.yaml                 # Deploy application
+kubectl cluster-info                         # Verify which cluster
+kubectl get pods                             # Verify connectivity to cluster
+kubectl create -f app.yaml               # Deploy application
 kubectl get service helidon-quickstart-mp  # Verify deployed service
 ```
-
-## Build a Java Runtime Image using jlink
-
-You can build a custom Java Runtime Image (JRI) containing the application jars and the JDK modules 
-on which they depend. This image also:
-
-* Enables Class Data Sharing by default to reduce startup time. 
-* Contains a customized `start` script to simplify CDS usage and support debug and test modes. 
-
-You can build a custom JRI in two different ways:
-* Local
-* Using Docker
-
-
-### Local build
-
-```
-# build the JRI
-mvn package -Pjlink-image
-```
-
-See https://github.com/oracle/helidon-build-tools/tree/master/helidon-maven-plugin#goal-jlink-image
- for more information.
-
-Start the application:
-
-```
-./target/helidon-quickstart-se/bin/start
-```
-
-### Multi-stage Docker build
-
-Build the "jlink" Docker Image
-
-```
-docker build -t helidon-quickstart-se-jlink -f Dockerfile.jlink .
-```
-
-Start the application:
-
-```
-docker run --rm -p 8080:8080 helidon-quickstart-se-jlink:latest
-```
-
-See the start script help:
-
-```
-docker run --rm helidon-quickstart-se-jlink:latest --help
-```
diff --git a/examples/quickstarts/helidon-quickstart-se/Dockerfile.jlink b/examples/quickstarts/helidon-quickstart-se/Dockerfile.jlink
diff --git a/examples/quickstarts/helidon-quickstart-se/README.md b/examples/quickstarts/helidon-quickstart-se/README.md
@@ -67,7 +67,7 @@ kubectl create -f app.yaml   # Deply application
 kubectl get service helidon-quickstart-se  # Get service info
 ```
 
-## Build a native image with GraalVM
+## Native image with GraalVM
 
 GraalVM allows you to compile your programs ahead-of-time into a native
  executable. See https://www.graalvm.org/docs/reference-manual/aot-compilation/
@@ -114,52 +114,3 @@ Start the application:
 ```
 docker run --rm -p 8080:8080 helidon-quickstart-se-native:latest
 ```
-
-## Build a Java Runtime Image using jlink
-
-You can build a custom Java Runtime Image (JRI) containing the application jars and the JDK modules 
-on which they depend. This image also:
-
-* Enables Class Data Sharing by default to reduce startup time. 
-* Contains a customized `start` script to simplify CDS usage and support debug and test modes. 
-
-You can build a custom JRI in two different ways:
-* Local
-* Using Docker
-
-
-### Local build
-
-```
-# build the JRI
-mvn package -Pjlink-image
-```
-
-See https://github.com/oracle/helidon-build-tools/tree/master/helidon-maven-plugin#goal-jlink-image
- for more information.
-
-Start the application:
-
-```
-./target/helidon-quickstart-se/bin/start
-```
-
-### Multi-stage Docker build
-
-Build the "jlink" Docker Image
-
-```
-docker build -t helidon-quickstart-se-jlink -f Dockerfile.jlink .
-```
-
-Start the application:
-
-```
-docker run --rm -p 8080:8080 helidon-quickstart-se-jlink:latest
-```
-
-See the start script help:
-
-```
-docker run --rm helidon-quickstart-se-jlink:latest --help
-```
diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.jlink b/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.jlink
diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/README.md b/examples/quickstarts/helidon-standalone-quickstart-mp/README.md
@@ -67,51 +67,3 @@ kubectl get pods                             # Verify connectivity to cluster
 kubectl create -f app.yaml               # Deploy application
 kubectl get service helidon-standalone-quickstart-mp  # Verify deployed service
 ```
-## Build a Java Runtime Image using jlink
-
-You can build a custom Java Runtime Image (JRI) containing the application jars and the JDK modules 
-on which they depend. This image also:
-
-* Enables Class Data Sharing by default to reduce startup time. 
-* Contains a customized `start` script to simplify CDS usage and support debug and test modes. 
-
-You can build a custom JRI in two different ways:
-* Local
-* Using Docker
-
-
-### Local build
-
-```
-# build the JRI
-mvn package -Pjlink-image
-```
-
-See https://github.com/oracle/helidon-build-tools/tree/master/helidon-maven-plugin#goal-jlink-image
- for more information.
-
-Start the application:
-
-```
-./target/helidon-quickstart-se/bin/start
-```
-
-### Multi-stage Docker build
-
-Build the "jlink" Docker Image
-
-```
-docker build -t helidon-quickstart-se-jlink -f Dockerfile.jlink .
-```
-
-Start the application:
-
-```
-docker run --rm -p 8080:8080 helidon-quickstart-se-jlink:latest
-```
-
-See the start script help:
-
-```
-docker run --rm helidon-quickstart-se-jlink:latest --help
-```