Helidon MP revamped for native-image

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

Work around issues with the reduced pom created by maven-shade-plugin.
See https://issues.apache.org/jira/browse/MNG-5899

Inline the reduced dependencies in the original pom.
Turn-off reduced pom generation.

Update microprofile/weld/pom.xml

Build fixes after repackaging weld.

Build fix - spotbugs exclude missing.

Simplify build and runtime events.

Using predefined priorities.

Validations for all modules in test.

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

Author: tomas-langer

CHANGELOG.md

@@ -5,26 +5,6 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 2.0.0
-### Backward incompatible changes
-#### Common
-- Removed `io.helidon.reactive.Flow`, please use `java.util.concurrent.Flow`
-- Removed `io.helidon.common.CollectionsHelper`, please use factory methods of `Set`, `Map` and `List`
-- Removed `io.helidon.common.OptionalHelper`, please use methods of `java.util.Optional`
-- Removed `io.helidon.common.StackWalker`, please use `java.lang.StackWalker`
-- Removed `io.helidon.common.InputStreamHelper`, please use `java.io.InputStream` methods
-
-#### Tracing
-- We have upgraded to OpenTracing version 0.33.0 that is not backward compatible, the following breaking changes exist
-    (these are OpenTracing changes, not Helidon changes):
-    1. `TextMapExtractAdapter` and `TextMapInjectAdapter` are now `TextMapAdapter`
-    2. module name changed from `opentracing.api` to `io.opentracing.api` (same for `noop` and `util`)
-    3. `SpanBuilder` no longer has `startActive` method, you need to use `Tracer.activateSpan(Span)`
-    4. `ScopeManager.activate(Span, boolean)` is replaced by `ScopeManager.activate(Span)` - second parameter is now always 
-            `false`
-    5. `Scope ScopeManager.active()` is removed - replaced by `Span Tracer.activeSpan()`
-- If you use the `TracerBuilder` abstraction in Helidon and have no custom Spans, there is no change required    
-
 ## [1.4.0] 
 
 ### Notes

CHANGELOG_2.0.md

@@ -0,0 +1,107 @@
+
+# Changelog of Helidon 2.x
+
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased] 
+
+### Notes
+
+This is a major release of Helidon. 
+
+### Backward incompatible changes
+
+#### Common
+- Removed `io.helidon.reactive.Flow`, please use `java.util.concurrent.Flow`
+- Removed `io.helidon.common.CollectionsHelper`, please use factory methods of `Set`, `Map` and `List`
+- Removed `io.helidon.common.OptionalHelper`, please use methods of `java.util.Optional`
+- Removed `io.helidon.common.StackWalker`, please use `java.lang.StackWalker`
+- Removed `io.helidon.common.InputStreamHelper`, please use `java.io.InputStream` methods
+
+#### Tracing
+- We have upgraded to OpenTracing version 0.33.0 that is not backward compatible, the following breaking changes exist
+    (these are OpenTracing changes, not Helidon changes):
+    1. `TextMapExtractAdapter` and `TextMapInjectAdapter` are now `TextMapAdapter`
+    2. module name changed from `opentracing.api` to `io.opentracing.api` (same for `noop` and `util`)
+    3. `SpanBuilder` no longer has `startActive` method, you need to use `Tracer.activateSpan(Span)`
+    4. `ScopeManager.activate(Span, boolean)` is replaced by `ScopeManager.activate(Span)` - second parameter is now always 
+            `false`
+    5. `Scope ScopeManager.active()` is removed - replaced by `Span Tracer.activeSpan()`
+- If you use the `TracerBuilder` abstraction in Helidon and have no custom Spans, there is no change required    
+
+#### Config
+Meta configuration has been refactored to be done through `ServiceLoader` services. If you created
+a custom `ConfigSource`, `PollingStrategy` or `RetryPolicy`, please have a look at the new documentation.
+
+Config now implements MicroProfile config (not explicitly, you can cast between MP Config and Helidon Config).
+There is a very small behavior change between MP methods and SE methods of config related to system
+property handling:
+
+    The MP TCK require that system properties are fully mutable (e.g. as soon as the property is changed, it
+    must be used), so MP Config methods work in this manner (with a certain performance overhead).
+    Helidon Config treats System properties as a mutable config source, with a time based polling strategy. So
+    the change is reflected as well, though not immediately (this is only relevant if you use change notifications). 
+
+#### Metrics
+Helidon now supports only MicroProfile Metrics 2.x. Modules for Metrics 1.x were removed, and 
+modules for 2.x were renamed from `metrics2` to `metrics`.
+
+
+#### Microprofile Bundles
+We have removed all versioned MP bundles.
+You can use the following:
+
+- `io.helidon.microprofile.bundles:helidon-microprofile-core` - contains MP Server and Config, allows you to add only 
+        specifications needed by your application 
+- `io.helidon.microprofile.bundles:helidon-microprofile` - contains the latest MP version implemented by Helidon
+
+#### Helidon CDI and MicroProfile Server
+
+- You cannot start CDI container yourself (this change is required so we can 
+      support GraalVM `native-image`)
+    - You can only run a single instance of Server in a JVM
+    - If you use `SeContainerInitializer` you would get an exception
+        - this can be worked around by configuration property `mp.initializer.allow=true`, and warning can be removed
+            using `mp.initializer.no-warn=true`
+        - once `SeContainerInitializer` is used, you can no longer use MP with `native-image` 
+- You can no longer provide a `Context` instance, root context is now built-in
+- `MpService` and `MpServiceContext` have been removed
+    - methods from context have been moved to `JaxRsCdiExtension` and `ServerCdiExtension` that can be accessed
+        from CDI extension through `BeanManager.getExtension`.
+    - methods `register` can be used on current `io.helidon.context.Context`
+    - `MpService` equivalent is a CDI extension. All Helidon services were refactored to CDI extension 
+        (you can use these for reference)
+- `Server.cdiContainer` is removed, use `CDI.current()` instead
+
+#### Startup
+New recommended option to start Helidon MP:
+1. Use class `io.helidon.microprofile.cdi.Main`
+2. Use meta configuration option when advanced configuration of config is required (e.g. `meta-config.yaml`)
+3. Put `logging.properties` on the classpath or in the current directory to be automatically picked up to configure 
+    Java util logging
+    
+`io.helidon.microprofile.server.Main` is still available, just calls `io.helidon.microprofile.cdi.Main` and is deprecated.
+`io.helidon.microprofile.server.Server` is still available, though the features are much reduced
+
+
+### Improvements
+
+- JAX-RS applications now work similar to how they work in application servers
+    - if there is an `Application` subclass that returns anything from `getClasses` or `getSingletons`, it is used as is
+    - if there is an `Application` subclass that returns empty sets from these methods, all available resource classes will be 
+            part of such an application
+    - if there is no `Application` subclass, a synthetic application will be created with all available resource classes
+    - `Application` subclasses MUST be annotated with `@ApplicationScoped`, otherwise they are ignored
+
+### Fixes
+
+### Deprecations
+
+## Experimental
+
+The following enhancements are experimental. They should be considered unstable and subject
+to change.
+
+## Thanks!

applications/mp/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 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.
@@ -33,7 +33,7 @@
     <properties>
         <version.plugin.jandex>1.0.6</version.plugin.jandex>
         <version.plugin.eclipselink>2.7.1.1</version.plugin.eclipselink>
-        <mainClass>io.helidon.microprofile.server.Main</mainClass>
+        <mainClass>io.helidon.microprofile.cdi.Main</mainClass>
     </properties>
 
     <build>
@@ -73,4 +73,31 @@
             </plugins>
         </pluginManagement>
     </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.helidon.build-tools</groupId>
+                        <artifactId>helidon-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>native-image</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>io.helidon.integrations.graal</groupId>
+                    <artifactId>helidon-mp-graal-native-image-extension</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

archetypes/se/src/main/resources/archetype-resources/pom.xml

@@ -49,7 +49,7 @@
 #if( $metricsSupport.matches("y|yes|true") )
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics2</artifactId>
+            <artifactId>helidon-metrics</artifactId>
         </dependency>
 #end
 #if( $unitTest.matches("y|yes|true") )

bom/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 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.
@@ -356,31 +356,6 @@
                 <version>${helidon.version}</version>
             </dependency>
             <!-- microprofile -->
-            <dependency>
-                <groupId>io.helidon.microprofile.bundles</groupId>
-                <artifactId>helidon-microprofile-1.1</artifactId>
-                <version>${helidon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.helidon.microprofile.bundles</groupId>
-                <artifactId>helidon-microprofile-1.2</artifactId>
-                <version>${helidon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.helidon.microprofile.bundles</groupId>
-                <artifactId>helidon-microprofile-2.2</artifactId>
-                <version>${helidon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.helidon.microprofile.bundles</groupId>
-                <artifactId>helidon-microprofile-3.0</artifactId>
-                <version>${helidon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.helidon.microprofile.bundles</groupId>
-                <artifactId>helidon-microprofile-3.1</artifactId>
-                <version>${helidon.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.helidon.microprofile.bundles</groupId>
                 <artifactId>helidon-microprofile-core</artifactId>
@@ -412,8 +387,13 @@
                 <version>${helidon.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.microprofile.metrics</groupId>
-                <artifactId>helidon-microprofile-metrics2</artifactId>
+                <groupId>io.helidon.microprofile</groupId>
+                <artifactId>weld-se-core</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.helidon.microprofile.cdi</groupId>
+                <artifactId>helidon-microprofile-cdi</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
             <dependency>
@@ -447,11 +427,7 @@
                 <artifactId>helidon-metrics</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.helidon.metrics</groupId>
-                <artifactId>helidon-metrics2</artifactId>
-                <version>${helidon.version}</version>
-            </dependency>
+
             <!-- health checks -->
             <dependency>
                 <groupId>io.helidon.health</groupId>
@@ -705,6 +681,11 @@
                 <artifactId>helidon-graal-native-image-extension</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.integrations.graal</groupId>
+                <artifactId>helidon-mp-graal-native-image-extension</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <!-- OpenAPI support -->
             <dependency>
                 <groupId>io.helidon.openapi</groupId>

common/common/src/main/java/io/helidon/common/HelidonFeatures.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2019, 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.
+ * 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.common;
+
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Logger;
+
+/**
+ * A java service loader interface defining a Helidon feature.
+ */
+public final class HelidonFeatures {
+    private static final Logger LOGGER = Logger.getLogger(HelidonFeatures.class.getName());
+
+    private static final Map<HelidonFlavor, Set<String>> FEATURES = new EnumMap<>(HelidonFlavor.class);
+    private static final AtomicReference<HelidonFlavor> CURRENT_FLAVOR = new AtomicReference<>();
+    private static final AtomicBoolean PRINTED = new AtomicBoolean();
+
+    private HelidonFeatures() {
+    }
+
+    /**
+     * Register a feature for a flavor.
+     * This should be called from a static initializer of a feature
+     * class. In SE this would be one of the *Support classes or similar,
+     * in MP most likely a CDI extension class.
+     *
+     * @param flavor flavor to register a feature for
+     * @param name name of the feature
+     */
+    public static void register(HelidonFlavor flavor, String name) {
+        FEATURES.computeIfAbsent(flavor, key -> new HashSet<>())
+                .add(name);
+    }
+
+    /**
+     * Print features for the current flavor.
+     * If {@link #flavor(HelidonFlavor)} is called, this method
+     * would only print the list if it matches the flavor provided.
+     * This is to make sure we do not print SE flavors in MP, and at the
+     * same time can have this method used from Web Server.
+     * This method only prints feature the first time it is called.
+     * @param flavor flavor to print features for
+     */
+    public static void print(HelidonFlavor flavor) {
+        CURRENT_FLAVOR.compareAndSet(null, HelidonFlavor.SE);
+
+        HelidonFlavor currentFlavor = CURRENT_FLAVOR.get();
+
+        if (currentFlavor != flavor) {
+            return;
+        }
+
+        if (PRINTED.compareAndSet(false, true)) {
+            Set<String> strings = FEATURES.get(currentFlavor);
+            if (null == strings) {
+                LOGGER.info("Helidon " + currentFlavor + " " + Version.VERSION + " has no registered features");
+            } else {
+                LOGGER.info("Helidon " + currentFlavor + " " + Version.VERSION + " features: " + strings);
+            }
+        }
+    }
+
+    /**
+     * Set the current Helidon flavor. Features will only be printed for the
+     * flavor configured.
+     *
+     * @param flavor current flavor
+     */
+    public static void flavor(HelidonFlavor flavor) {
+        CURRENT_FLAVOR.compareAndSet(null, flavor);
+    }
+}

…ofile-1.1/src/main/java/module-info.java …ava/io/helidon/common/HelidonFlavor.javamicroprofile/bundles/helidon-microprofile-1.1/src/main/java/module-info.java renamed to common/common/src/main/java/io/helidon/common/HelidonFlavor.java microprofile/bundles/helidon-microprofile-1.1/src/main/java/module-info.java renamed to common/common/src/main/java/io/helidon/common/HelidonFlavor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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.
@@ -14,10 +14,18 @@
  * limitations under the License.
  */
 
+package io.helidon.common;
+
 /**
- * Aggregator module for microprofile 1.1.
+ * Flavors of Helidon.
  */
-module io.helidon.microprofile.v1_1 {
-    requires transitive io.helidon.microprofile.config;
-    requires transitive io.helidon.microprofile.server;
+public enum HelidonFlavor {
+    /**
+     * The "standard edition" flavor.
+     */
+    SE,
+    /**
+     * The "MicroProfile" flavor.
+     */
+    MP
 }