Merge pull request #1 from romain-grecourt/doc_updates_1628_intro_HMP

Doc updates 1628 intro hmp
helidon-io · May 8, 2020 · e6144f1 · e6144f1
2 parents dd3c032 + fae936a
commit e6144f1
Show file tree

Hide file tree

Showing 1,018 changed files with 28,512 additions and 18,384 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ We welcome your contributions! There are multiple ways to contribute.
 
 ## Discussion
 
-Join us at [#helidon-users](https://join.slack.com/t/helidon/shared_invite/enQtNDM1NjU3MjkyNDg2LTFkZTM4NmI3OWUyNjUxYWQ5Njc0NGNiMzY3MTZiZmMwNzAxYmI4YzUzOWNkNzNlZTEwNDRkZGU4YzMzZjhkNTE) and participate in discussions.
+Join us at [#helidon-users](http://slack.helidon.io) and participate in discussions.
 
 ## Issues
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+pipeline {
+  agent {
+    label "linux"
+  }
+  options {
+    parallelsAlwaysFailFast()
+  }
+  environment {
+    NPM_CONFIG_REGISTRY = credentials('npm-registry')
+  }
+  stages {
+    stage('default') {
+      parallel {
+        stage('build'){
+          steps {
+            script {
+              try {
+                sh './etc/scripts/build.sh'
+              } finally {
+                archiveArtifacts artifacts: "**/target/surefire-reports/*.txt, **/target/failsafe-reports/*.txt"
+                junit testResults: '**/target/surefire-reports/*.xml,**/target/failsafe-reports/*.xml'
+              }
+            }
+          }
+        }
+        stage('copyright'){
+          steps {
+            sh './etc/scripts/copyright.sh'
+          }
+        }
+        stage('checkstyle'){
+          steps {
+            sh './etc/scripts/checkstyle.sh'
+          }
+        }
+      }
+    }
+    stage('release') {
+      when {
+        branch '**/release-*'
+      }
+      environment {
+        GITHUB_SSH_KEY = credentials('helidonrobot-github-ssh-private-key')
+        MAVEN_SETTINGS_FILE = credentials('helidonrobot-maven-settings-ossrh')
+        GPG_PUBLIC_KEY = credentials('helidon-gpg-public-key')
+        GPG_PRIVATE_KEY = credentials('helidon-gpg-private-key')
+        GPG_PASSPHRASE = credentials('helidon-gpg-passphrase')
+      }
+      steps {
+        sh './etc/scripts/release.sh release_build'
+      }
+    }
+  }
+}
diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
@@ -59,13 +59,13 @@
                     <version>${version.plugin.eclipselink}</version>
                     <dependencies>
                         <dependency>
-                            <groupId>javax.annotation</groupId>
-                            <artifactId>javax.annotation-api</artifactId>
+                            <groupId>jakarta.annotation</groupId>
+                            <artifactId>jakarta.annotation-api</artifactId>
                             <version>${version.lib.annotation-api}</version>
                         </dependency>
                         <dependency>
-                            <groupId>javax.xml.bind</groupId>
-                            <artifactId>jaxb-api</artifactId>
+                            <groupId>jakarta.xml.bind</groupId>
+                            <artifactId>jakarta.xml.bind-api</artifactId>
                             <version>${version.lib.jaxb-api}</version>
                         </dependency>
                     </dependencies>

diff --git a/archetypes/mp/src/main/resources/archetype-resources/pom.xml b/archetypes/mp/src/main/resources/archetype-resources/pom.xml
@@ -32,11 +32,6 @@
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
-            <scope>runtime</scope>
-        </dependency>
 #if( $unitTest.matches("y|yes|true") )
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -68,6 +68,11 @@
                 <artifactId>helidon-webserver-tyrus</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.webserver</groupId>
+                <artifactId>helidon-webserver-cors</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <!-- Helidon Jersey -->
             <dependency>
                 <groupId>io.helidon.jersey</groupId>
@@ -161,6 +166,11 @@
                 <artifactId>helidon-microprofile-grpc-client</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.microprofile</groupId>
+                <artifactId>helidon-microprofile-cors</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <!-- media -->
             <dependency>
                 <groupId>io.helidon.media</groupId>
@@ -238,6 +248,11 @@
                 <artifactId>helidon-config-object-mapping</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.config</groupId>
+                <artifactId>helidon-config-mp</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <!-- security -->
             <dependency>
                 <groupId>io.helidon.security</groupId>
@@ -415,6 +430,13 @@
                 <groupId>io.helidon.microprofile.weld</groupId>
                 <artifactId>weld-se-core</artifactId>
                 <version>${helidon.version}</version>
+                <exclusions>
+                    <!-- need to exclude javax APIs - we have moved to Jakarta -->
+                    <exclusion>
+                        <groupId>javax.enterprise</groupId>
+                        <artifactId>cdi-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.helidon.microprofile.cdi</groupId>
@@ -618,6 +640,12 @@
                 <artifactId>helidon-tracing-jaeger</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <!-- to add TracerResolver support -->
+                <groupId>io.helidon.tracing</groupId>
+                <artifactId>helidon-tracing-tracer-resolver</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <dependency>
                 <!-- Client support -->
                 <groupId>io.helidon.tracing</groupId>
@@ -795,6 +823,18 @@
                 <artifactId>helidon-microprofile-openapi</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <!-- CORS support -->
+            <dependency>
+                <groupId>io.helidon.webserver.cors</groupId>
+                <artifactId>helidon-cors</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
+            <!-- Messaging -->
+            <dependency>
+                <groupId>io.helidon.messaging.connectors.kafka</groupId>
+                <artifactId>helidon-messaging-connectors-kafka</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/bundles/config/pom.xml b/bundles/config/pom.xml
@@ -56,8 +56,8 @@
             <artifactId>helidon-config-yaml</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/common/http/src/main/java/io/helidon/common/http/DataChunk.java b/common/http/src/main/java/io/helidon/common/http/DataChunk.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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.
@@ -248,7 +248,8 @@ default boolean flush() {
      */
     default DataChunk duplicate() {
         byte[] bytes = new byte[data().limit()];
-        DataChunk dup = DataChunk.create(data().get(bytes));
+        data().get(bytes);
+        DataChunk dup = DataChunk.create(bytes);
         dup.data().position(0);
         return dup;
     }

diff --git a/common/mapper/src/main/java/io/helidon/common/mapper/Mapper.java b/common/mapper/src/main/java/io/helidon/common/mapper/Mapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package io.helidon.common.mapper;
 
+import java.util.function.Function;
+
 /**
  * A generic and general approach to mapping two types.
  * A mapper is unidirectional - from {@code SOURCE} to {@code TARGET}.
@@ -23,12 +25,17 @@
  * @param <TARGET> type of the supported target
  */
 @FunctionalInterface
-public interface Mapper<SOURCE, TARGET> {
+public interface Mapper<SOURCE, TARGET> extends Function<SOURCE, TARGET> {
     /**
      * Map an instance of source type to an instance of target type.
      *
      * @param source object to map
      * @return result of the mapping
      */
     TARGET map(SOURCE source);
+
+    @Override
+    default TARGET apply(SOURCE source){
+        return map(source);
+    }
 }
diff --git a/common/metrics/pom.xml b/common/metrics/pom.xml
@@ -39,14 +39,7 @@
         <dependency>
             <groupId>org.eclipse.microprofile.metrics</groupId>
             <artifactId>microprofile-metrics-api</artifactId>
-            <version>${version.lib.microprofile-metrics-api}</version>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.annotation.versioning</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 </project>