Merge branch 'master' into bugfix/RequestInjectFilterV2

CHANGELOG.md

@@ -19,6 +19,51 @@ This is the fourth milestone release of Helidon 2.0.
 
 ### Backward incompatible changes
 
+#### gRPC: Renamed several annotations and classes
+
+As part of gRPC API cleanup, we have renamed the following annotations and classes:
+
+| Old Name                 | New Name           |
+| ------------------------ | ------------------ |
+| `@RpcService`            | `@Grpc`            |
+| `@RpcMethod`             | `@GrpcMethod`      |
+| `@GrpcServiceProxy`      | `@GrpcProxy`       |
+| `GrpcClientProxyBuilder` | `GrpcProxyBuilder` |
+
+While in general we prefer not to break backwards compatibility by renaming public API
+classes, we felt that in this case the change was warranted and acceptable, for several reasons:
+
+1. gRPC API was marked experimental in Helidon 1.x
+2. While using gRPC in our own applications, we have realized that the code in some cases
+   does not read as well as it should, and that some class and annotation names should be changed
+   to improve both internal API consistency and readability
+
+We apologize for the inconvenience, but we do feel that the impact of the changes is minimal
+and that the changes will be beneficial in the long run.     
+
+#### Internal `helidon-common-metrics` and Related Classes Removed
+Later releases of Helidon 1.x included the `helidon-common-metrics` component and related
+classes which provided a common interface to ease the transition from MicroProfile 
+Metrics 1.x to 2.x. 
+Although intended for use only by Helidon subsystems rather than 
+by developers and users, the component and its contents had to be public so multiple Helidon 
+subsystems could use them. 
+Therefore, user code might have used these elements.
+
+This release removes this common interface and associated classes. 
+Any user code that used these internal classes can use the corresponding supported classes in 
+`io.helidon.metrics:helidon-metrics` and MicroProfile Metrics 2.0 instead. 
+
+|Helidon Artifact |Interfaces/Classes |
+|--------------|----------------|
+|`io.helidon.common:helidon-common-metrics` |Entire artifact, including all `io.helidon.common.metrics...` classes |
+|`io.helidon.metrics:helidon-metrics` |`HelidonMetadata` |
+| |`InternalBridgeImpl` |
+| |`InternalMetadataBuilderImpl` |
+| |`InternalMetadataImpl` |
+| |`InternalMetricIDImpl` |
+
+
 ## [2.0.0-M3]
 
 ### Notes

applications/pom.xml

@@ -47,7 +47,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>2.0.0-M2</version.plugin.helidon>
+        <version.plugin.helidon>2.0.0-RC1</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>
@@ -64,6 +64,11 @@
                 <artifactId>os-maven-plugin</artifactId>
                 <version>${version.plugin.os}</version>
             </extension>
+            <extension>
+                <groupId>io.helidon.build-tools</groupId>
+                <artifactId>helidon-maven-plugin</artifactId>
+                <version>${version.plugin.helidon}</version>
+            </extension>
         </extensions>
         <pluginManagement>
             <plugins>

archetypes/catalog/catalog.xml.mustache

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<archetype-catalog modelVersion="1.0"
+                   name="helidon-archetypes"
+                   groupId="{{project.groupId}}"
+                   version="{{project.version}}">
+
+    <archetype artifactId="helidon-bare-se"
+               name="bare"
+               title="Helidon SE Bare"
+               summary="Minimal Helidon SE application"
+               description="Minimal Helidon SE project suitable to start from scratch"
+               tags="se,rest" />
+    <archetype artifactId="helidon-bare-mp"
+               name="bare"
+               title="Helidon MP Bare"
+               summary="Minimal Helidon MP application"
+               description="Minimal Helidon MP project suitable to start from scratch"
+               tags="mp,rest" />
+</archetype-catalog>

archetypes/mp/bare/pom.xml → archetypes/catalog/pom.xml

@@ -22,9 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.helidon.archetypes</groupId>
-        <artifactId>helidon-archetypes-mp</artifactId>
+        <artifactId>helidon-archetypes-project</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <artifactId>helidon-archetypes-mp-bare</artifactId>
-    <name>Helidon Template Application MP bare</name>
-</project>
+    <packaging>helidon-archetype-catalog</packaging>
+    <artifactId>helidon-archetype-catalog</artifactId>
+    <name>Helidon Archetype Catalog</name>
+</project>

archetypes/mp/pom.xml

@@ -25,11 +25,7 @@
         <artifactId>helidon-archetypes-project</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <artifactId>helidon-archetypes-mp</artifactId>
-    <name>Helidon Template Application Types for MP</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>bare</module>
-    </modules>
+    <packaging>helidon-archetype</packaging>
+    <artifactId>helidon-bare-mp</artifactId>
+    <name>Helidon MP Bare Archetype</name>
 </project>

archetypes/se/bare/src/main/resources/META-INF/helidon-archetype.xml → archetypes/mp/src/main/resources/META-INF/helidon-archetype.xml.mustache

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+    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.
@@ -16,16 +16,16 @@
     limitations under the License.
 
 -->
-<archetype-descriptor>
+<archetype-descriptor modelVersion="1.0" name="helidon-bare-mp">
     <properties>
-        <property id="gradle" description="Gradle based project"/>
-        <property id="maven" description="Maven based project"/>
-        <property id="groupId" description="Project groupId"/>
-        <property id="artifactId" description="Project artifactId"/>
-        <property id="version" description="Project version" default="1.0-SNAPSHOT"/>
-        <property id="name" description="Project name"/>
-        <property id="package" description="Java package name"/>
-        <property id="helidonVersion" description="Version of Helidon to use"/>
+        <property id="groupId" />
+        <property id="artifactId" />
+        <property id="version" value="1.0-SNAPSHOT" />
+        <property id="name" value="myproject" />
+        <property id="package" />
+        <property id="gradle" exported="false" />
+        <property id="maven" exported="false" />
+        <property id="helidonVersion" exported="false" readonly="true" value="{{project.version}}"/>
     </properties>
     <transformations>
         <transformation id="packaged">
@@ -94,4 +94,4 @@
         <input property="version" text="Project version" default="${version}"/>
         <input property="package" text="Java package name" default="${package}"/>
     </input-flow>
-</archetype-descriptor>
+</archetype-descriptor>

integrations/cdi/jpa-weld/src/test/resources/META-INF/microprofile-config.properties → archetypes/mp/src/test/resources/projects/it1/archetype.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+# 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.
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-mp.initializer.allow=true
-mp.initializer.no-warn=true
+package=io.helidon.archetypes.tests
+version=0.1-SNAPSHOT
+groupId=io.helidon.archetypes.tests
+artifactId=mp-it1

archetypes/mp/src/test/resources/projects/it1/goal.txt

@@ -0,0 +1 @@
+package

archetypes/pom.xml

@@ -27,16 +27,13 @@
     </parent>
     <groupId>io.helidon.archetypes</groupId>
     <artifactId>helidon-archetypes-project</artifactId>
-    <name>Helidon Template Application Types used by CLI</name>
+    <name>Helidon Archetypes</name>
     <packaging>pom</packaging>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <modules>
         <module>se</module>
         <module>mp</module>
+        <module>catalog</module>
     </modules>
 
     <build>
@@ -50,3 +47,4 @@
         </plugins>
     </build>
 </project>
+

archetypes/se/pom.xml

@@ -25,11 +25,7 @@
         <artifactId>helidon-archetypes-project</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <artifactId>helidon-archetypes-se</artifactId>
-    <name>Helidon Template Application Types for SE</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>bare</module>
-    </modules>
+    <packaging>helidon-archetype</packaging>
+    <artifactId>helidon-bare-se</artifactId>
+    <name>Helidon SE Bare Archetype</name>
 </project>

archetypes/mp/bare/src/main/resources/META-INF/helidon-archetype.xml → archetypes/se/src/main/resources/META-INF/helidon-archetype.xml.mustache

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+    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.
@@ -16,16 +16,16 @@
     limitations under the License.
 
 -->
-<archetype-descriptor>
+<archetype-descriptor modelVersion="1.0" name="helidon-bare-se">
     <properties>
-        <property id="gradle" description="Gradle based project"/>
-        <property id="maven" description="Maven based project"/>
-        <property id="groupId" description="Project groupId"/>
-        <property id="artifactId" description="Project artifactId"/>
-        <property id="version" description="Project version" default="1.0-SNAPSHOT"/>
-        <property id="name" description="Project name"/>
-        <property id="package" description="Java package name"/>
-        <property id="helidonVersion" description="Version of Helidon to use"/>
+        <property id="groupId" />
+        <property id="artifactId" />
+        <property id="version" value="1.0-SNAPSHOT" />
+        <property id="name" value="myproject" />
+        <property id="package" />
+        <property id="gradle" exported="false" />
+        <property id="maven" exported="false" />
+        <property id="helidonVersion" exported="false" readonly="true" value="{{project.version}}"/>
     </properties>
     <transformations>
         <transformation id="packaged">
@@ -94,4 +94,4 @@
         <input property="version" text="Project version" default="${version}"/>
         <input property="package" text="Java package name" default="${package}"/>
     </input-flow>
-</archetype-descriptor>
+</archetype-descriptor>

archetypes/se/bare/src/main/resources/pom.xml.mustache → archetypes/se/src/main/resources/pom.xml.mustache

@@ -23,8 +23,8 @@
             <artifactId>helidon-webserver</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.media.jsonp</groupId>
-            <artifactId>helidon-media-jsonp-common</artifactId>
+            <groupId>io.helidon.media</groupId>
+            <artifactId>helidon-media-jsonp</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.config</groupId>

archetypes/se/bare/src/main/resources/src/main/java/__pkg__/Main.java.mustache → archetypes/se/src/main/resources/src/main/java/__pkg__/Main.java.mustache

@@ -8,7 +8,7 @@ import java.util.logging.LogManager;
 import io.helidon.config.Config;
 import io.helidon.health.HealthSupport;
 import io.helidon.health.checks.HealthChecks;
-import io.helidon.media.jsonp.common.JsonpSupport;
+import io.helidon.media.jsonp.JsonpSupport;
 import io.helidon.metrics.MetricsSupport;
 import io.helidon.webserver.Routing;
 import io.helidon.webserver.ServerConfiguration;

archetypes/se/bare/src/main/resources/src/test/java/__pkg__/MainTest.java.mustache → archetypes/se/src/main/resources/src/test/java/__pkg__/MainTest.java.mustache

@@ -8,7 +8,7 @@ import javax.json.Json;
 import javax.json.JsonBuilderFactory;
 import javax.json.JsonObject;
 
-import io.helidon.media.jsonp.common.JsonpSupport;
+import io.helidon.media.jsonp.JsonpSupport;
 import io.helidon.webclient.WebClient;
 import io.helidon.webserver.WebServer;;
 

archetypes/se/src/test/resources/projects/it1/archetype.properties

@@ -0,0 +1,19 @@
+#
+# 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.
+#
+package=io.helidon.archetypes.tests
+version=0.1-SNAPSHOT
+groupId=io.helidon.archetypes.tests
+artifactId=se-it1

archetypes/se/src/test/resources/projects/it1/goal.txt

@@ -0,0 +1 @@
+package