From 79dddd295d80fd021ee6b7f8460bec8d4da480ca Mon Sep 17 00:00:00 2001
From: Tomas Langer <tomas.langer@oracle.com>
Date: Thu, 5 Dec 2019 15:28:23 +0000
Subject: [PATCH 1/2] Java 11 as the minimal version

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
---
 applications/pom.xml                          |  3 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 config/config/pom.xml                         | 11 ++-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 jersey/client/pom.xml                         |  4 +
 .../src/main/{java9 => java}/module-info.java |  2 +
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 jersey/server/pom.xml                         |  4 +
 .../src/main/{java9 => java}/module-info.java |  2 +
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  5 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 microprofile/fault-tolerance/pom.xml          |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 microprofile/metrics/pom.xml                  | 10 +--
 .../src/main/{java9 => java}/module-info.java |  1 +
 microprofile/metrics2/pom.xml                 |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 microprofile/tracing/pom.xml                  |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 pom.xml                                       | 77 +++----------------
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  2 +-
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/main/{java9 => java}/module-info.java |  0
 .../webserver/SendHeadersFirstPublisher.java  |  5 +-
 .../src/main/{java9 => java}/module-info.java |  0
 124 files changed, 77 insertions(+), 117 deletions(-)
 rename bundles/config/src/main/{java9 => java}/module-info.java (92%)
 rename bundles/jersey/src/main/{java9 => java}/module-info.java (100%)
 rename bundles/security/src/main/{java9 => java}/module-info.java (100%)
 rename bundles/webserver/src/main/{java9 => java}/module-info.java (100%)
 rename common/common/src/main/{java9 => java}/module-info.java (91%)
 rename common/configurable/src/main/{java9 => java}/module-info.java (100%)
 rename common/context/src/main/{java9 => java}/module-info.java (100%)
 rename common/http/src/main/{java9 => java}/module-info.java (100%)
 rename common/key-util/src/main/{java9 => java}/module-info.java (91%)
 rename common/mapper/src/main/{java9 => java}/module-info.java (100%)
 rename common/media-type/src/main/{java9 => java}/module-info.java (100%)
 rename common/metrics/src/main/{java9 => java}/module-info.java (100%)
 rename common/reactive/src/main/{java9 => java}/module-info.java (100%)
 rename common/service-loader/src/main/{java9 => java}/module-info.java (100%)
 rename config/config/src/main/{java9 => java}/module-info.java (100%)
 rename config/encryption/src/main/{java9 => java}/module-info.java (100%)
 rename config/etcd/src/main/{java9 => java}/module-info.java (100%)
 rename config/git/src/main/{java9 => java}/module-info.java (100%)
 rename config/hocon/src/main/{java9 => java}/module-info.java (94%)
 rename config/object-mapping/src/main/{java9 => java}/module-info.java (93%)
 rename config/test-infrastructure/src/main/{java9 => java}/module-info.java (89%)
 rename config/testing/src/main/{java9 => java}/module-info.java (90%)
 rename config/tests/module-mappers-1-base/src/main/{java9 => java}/module-info.java (94%)
 rename config/tests/module-mappers-2-override/src/main/{java9 => java}/module-info.java (95%)
 rename config/tests/module-parsers-1-override/src/main/{java9 => java}/module-info.java (94%)
 rename config/tests/test-bundle/src/main/{java9 => java}/module-info.java (91%)
 rename config/tests/test-mappers-1-common/src/main/{java9 => java}/module-info.java (91%)
 rename config/tests/test-mappers-2-complex/src/main/{java9 => java}/module-info.java (91%)
 rename config/tests/test-parsers-1-complex/src/main/{java9 => java}/module-info.java (91%)
 rename config/yaml/src/main/{java9 => java}/module-info.java (100%)
 rename examples/security/attribute-based-access-control/src/main/{java9 => java}/module-info.java (100%)
 rename grpc/client/src/main/{java9 => java}/module-info.java (100%)
 rename grpc/core/src/main/{java9 => java}/module-info.java (100%)
 rename grpc/io.grpc/src/main/{java9 => java}/module-info.java (100%)
 rename grpc/metrics/src/main/{java9 => java}/module-info.java (100%)
 rename grpc/server/src/main/{java9 => java}/module-info.java (100%)
 rename health/common/src/main/{java9 => java}/module-info.java (100%)
 rename health/health-checks/src/main/{java9 => java}/module-info.java (100%)
 rename health/health/src/main/{java9 => java}/module-info.java (100%)
 rename jersey/client/src/main/{java9 => java}/module-info.java (96%)
 rename jersey/common/src/main/{java9 => java}/module-info.java (100%)
 rename jersey/jsonp/src/main/{java9 => java}/module-info.java (100%)
 rename jersey/server/src/main/{java9 => java}/module-info.java (97%)
 rename media/common/src/main/{java9 => java}/module-info.java (100%)
 rename media/jackson/common/src/main/{java9 => java}/module-info.java (100%)
 rename media/jackson/server/src/main/{java9 => java}/module-info.java (100%)
 rename media/jsonb/common/src/main/{java9 => java}/module-info.java (100%)
 rename media/jsonb/server/src/main/{java9 => java}/module-info.java (100%)
 rename media/jsonp/common/src/main/{java9 => java}/module-info.java (100%)
 rename media/jsonp/server/src/main/{java9 => java}/module-info.java (100%)
 rename metrics/metrics/src/main/{java9 => java}/module-info.java (96%)
 rename metrics/prometheus/src/main/{java9 => java}/module-info.java (90%)
 rename metrics2/metrics2/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/access-log/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/bundles/helidon-microprofile-1.0/src/main/{java9 => java}/module-info.java (90%)
 rename microprofile/bundles/helidon-microprofile-1.1/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/bundles/helidon-microprofile-1.2/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/bundles/helidon-microprofile-2.2/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/bundles/helidon-microprofile-3.0/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/bundles/helidon-microprofile-3.1/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/bundles/helidon-microprofile-core/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/bundles/helidon-microprofile/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/config/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/fault-tolerance/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/grpc/client/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/grpc/core/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/grpc/metrics/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/grpc/server/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/health/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/jwt-auth/jwt-auth-cdi/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/jwt-auth/jwt-auth/src/main/{java9 => java}/module-info.java (93%)
 rename microprofile/metrics/src/main/{java9 => java}/module-info.java (97%)
 rename microprofile/metrics2/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/oidc/src/main/{java9 => java}/module-info.java (92%)
 rename microprofile/openapi/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/rest-client/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/security/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/server/src/main/{java9 => java}/module-info.java (100%)
 rename microprofile/tracing/src/main/{java9 => java}/module-info.java (100%)
 rename openapi/src/main/{java9 => java}/module-info.java (100%)
 rename security/abac/policy-el/src/main/{java9 => java}/module-info.java (93%)
 rename security/abac/policy/src/main/{java9 => java}/module-info.java (92%)
 rename security/abac/role/src/main/{java9 => java}/module-info.java (100%)
 rename security/abac/scope/src/main/{java9 => java}/module-info.java (91%)
 rename security/abac/time/src/main/{java9 => java}/module-info.java (91%)
 rename security/annotations/src/main/{java9 => java}/module-info.java (90%)
 rename security/integration/common/src/main/{java9 => java}/module-info.java (100%)
 rename security/integration/grpc/src/main/{java9 => java}/module-info.java (100%)
 rename security/integration/jersey-client/src/main/{java9 => java}/module-info.java (100%)
 rename security/integration/jersey/src/main/{java9 => java}/module-info.java (100%)
 rename security/integration/webserver/src/main/{java9 => java}/module-info.java (100%)
 rename security/jwt/src/main/{java9 => java}/module-info.java (100%)
 rename security/providers/abac/src/main/{java9 => java}/module-info.java (93%)
 rename security/providers/common/src/main/{java9 => java}/module-info.java (100%)
 rename security/providers/google-login/src/main/{java9 => java}/module-info.java (93%)
 rename security/providers/header/src/main/{java9 => java}/module-info.java (92%)
 rename security/providers/http-auth/src/main/{java9 => java}/module-info.java (100%)
 rename security/providers/http-sign/src/main/{java9 => java}/module-info.java (93%)
 rename security/providers/idcs-mapper/src/main/{java9 => java}/module-info.java (100%)
 rename security/providers/jwt/src/main/{java9 => java}/module-info.java (93%)
 rename security/providers/oidc-common/src/main/{java9 => java}/module-info.java (92%)
 rename security/providers/oidc/src/main/{java9 => java}/module-info.java (94%)
 rename security/security/src/main/{java9 => java}/module-info.java (100%)
 rename security/util/src/main/{java9 => java}/module-info.java (91%)
 rename tracing/config/src/main/{java9 => java}/module-info.java (100%)
 rename tracing/jaeger/src/main/{java9 => java}/module-info.java (100%)
 rename tracing/jersey-client/src/main/{java9 => java}/module-info.java (100%)
 rename tracing/jersey/src/main/{java9 => java}/module-info.java (100%)
 rename tracing/tracing/src/main/{java9 => java}/module-info.java (100%)
 rename tracing/zipkin/src/main/{java9 => java}/module-info.java (93%)
 rename webclient/jaxrs/src/main/{java9 => java}/module-info.java (100%)
 rename webserver/access-log/src/main/{java9 => java}/module-info.java (100%)
 rename webserver/jersey/src/main/{java9 => java}/module-info.java (100%)
 rename webserver/webserver/src/main/{java9 => java}/module-info.java (100%)

diff --git a/applications/pom.xml b/applications/pom.xml
index 086d80b89cd..0b474cb28f8 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -40,8 +40,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
+        <maven.compiler.release>${maven.compiler.source}</maven.compiler.release>
         <version.plugin.compiler>3.8.1</version.plugin.compiler>
         <version.plugin.dependency>3.0.0</version.plugin.dependency>
         <version.plugin.exec>1.6.0</version.plugin.exec>
diff --git a/bundles/config/src/main/java9/module-info.java b/bundles/config/src/main/java/module-info.java
similarity index 92%
rename from bundles/config/src/main/java9/module-info.java
rename to bundles/config/src/main/java/module-info.java
index 36ac7d9726a..90f87bf4f30 100644
--- a/bundles/config/src/main/java9/module-info.java
+++ b/bundles/config/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/bundles/jersey/src/main/java9/module-info.java b/bundles/jersey/src/main/java/module-info.java
similarity index 100%
rename from bundles/jersey/src/main/java9/module-info.java
rename to bundles/jersey/src/main/java/module-info.java
diff --git a/bundles/security/src/main/java9/module-info.java b/bundles/security/src/main/java/module-info.java
similarity index 100%
rename from bundles/security/src/main/java9/module-info.java
rename to bundles/security/src/main/java/module-info.java
diff --git a/bundles/webserver/src/main/java9/module-info.java b/bundles/webserver/src/main/java/module-info.java
similarity index 100%
rename from bundles/webserver/src/main/java9/module-info.java
rename to bundles/webserver/src/main/java/module-info.java
diff --git a/common/common/src/main/java9/module-info.java b/common/common/src/main/java/module-info.java
similarity index 91%
rename from common/common/src/main/java9/module-info.java
rename to common/common/src/main/java/module-info.java
index 8fdf5f66e49..9f0cab4be9d 100644
--- a/common/common/src/main/java9/module-info.java
+++ b/common/common/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/common/configurable/src/main/java9/module-info.java b/common/configurable/src/main/java/module-info.java
similarity index 100%
rename from common/configurable/src/main/java9/module-info.java
rename to common/configurable/src/main/java/module-info.java
diff --git a/common/context/src/main/java9/module-info.java b/common/context/src/main/java/module-info.java
similarity index 100%
rename from common/context/src/main/java9/module-info.java
rename to common/context/src/main/java/module-info.java
diff --git a/common/http/src/main/java9/module-info.java b/common/http/src/main/java/module-info.java
similarity index 100%
rename from common/http/src/main/java9/module-info.java
rename to common/http/src/main/java/module-info.java
diff --git a/common/key-util/src/main/java9/module-info.java b/common/key-util/src/main/java/module-info.java
similarity index 91%
rename from common/key-util/src/main/java9/module-info.java
rename to common/key-util/src/main/java/module-info.java
index e2a01783cf4..e129a318725 100644
--- a/common/key-util/src/main/java9/module-info.java
+++ b/common/key-util/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/common/mapper/src/main/java9/module-info.java b/common/mapper/src/main/java/module-info.java
similarity index 100%
rename from common/mapper/src/main/java9/module-info.java
rename to common/mapper/src/main/java/module-info.java
diff --git a/common/media-type/src/main/java9/module-info.java b/common/media-type/src/main/java/module-info.java
similarity index 100%
rename from common/media-type/src/main/java9/module-info.java
rename to common/media-type/src/main/java/module-info.java
diff --git a/common/metrics/src/main/java9/module-info.java b/common/metrics/src/main/java/module-info.java
similarity index 100%
rename from common/metrics/src/main/java9/module-info.java
rename to common/metrics/src/main/java/module-info.java
diff --git a/common/reactive/src/main/java9/module-info.java b/common/reactive/src/main/java/module-info.java
similarity index 100%
rename from common/reactive/src/main/java9/module-info.java
rename to common/reactive/src/main/java/module-info.java
diff --git a/common/service-loader/src/main/java9/module-info.java b/common/service-loader/src/main/java/module-info.java
similarity index 100%
rename from common/service-loader/src/main/java9/module-info.java
rename to common/service-loader/src/main/java/module-info.java
diff --git a/config/config/pom.xml b/config/config/pom.xml
index daa589cb607..6e34914ce31 100644
--- a/config/config/pom.xml
+++ b/config/config/pom.xml
@@ -122,10 +122,9 @@
 
     <profiles>
         <profile>
-            <id>jdk9+</id>
+            <id>unsupported-module-tests</id>
             <activation>
-                <jdk>[9,)</jdk>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <build>
                 <plugins>
@@ -136,9 +135,9 @@
                             <execution>
                                 <id>default-testCompile</id>
                                 <configuration>
-                                    <release>9</release>
-                                    <source>1.8</source>
-                                    <target>1.8</target>
+                                    <release>11</release>
+                                    <source>11</source>
+                                    <target>11</target>
                                     <compilerArgs>
                                         <arg>--add-modules</arg>
                                         <arg>jdk.unsupported</arg>
diff --git a/config/config/src/main/java9/module-info.java b/config/config/src/main/java/module-info.java
similarity index 100%
rename from config/config/src/main/java9/module-info.java
rename to config/config/src/main/java/module-info.java
diff --git a/config/encryption/src/main/java9/module-info.java b/config/encryption/src/main/java/module-info.java
similarity index 100%
rename from config/encryption/src/main/java9/module-info.java
rename to config/encryption/src/main/java/module-info.java
diff --git a/config/etcd/src/main/java9/module-info.java b/config/etcd/src/main/java/module-info.java
similarity index 100%
rename from config/etcd/src/main/java9/module-info.java
rename to config/etcd/src/main/java/module-info.java
diff --git a/config/git/src/main/java9/module-info.java b/config/git/src/main/java/module-info.java
similarity index 100%
rename from config/git/src/main/java9/module-info.java
rename to config/git/src/main/java/module-info.java
diff --git a/config/hocon/src/main/java9/module-info.java b/config/hocon/src/main/java/module-info.java
similarity index 94%
rename from config/hocon/src/main/java9/module-info.java
rename to config/hocon/src/main/java/module-info.java
index 3814b7e3922..df0033ff804 100644
--- a/config/hocon/src/main/java9/module-info.java
+++ b/config/hocon/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/config/object-mapping/src/main/java9/module-info.java b/config/object-mapping/src/main/java/module-info.java
similarity index 93%
rename from config/object-mapping/src/main/java9/module-info.java
rename to config/object-mapping/src/main/java/module-info.java
index b076722436f..ad239c580b8 100644
--- a/config/object-mapping/src/main/java9/module-info.java
+++ b/config/object-mapping/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/config/test-infrastructure/src/main/java9/module-info.java b/config/test-infrastructure/src/main/java/module-info.java
similarity index 89%
rename from config/test-infrastructure/src/main/java9/module-info.java
rename to config/test-infrastructure/src/main/java/module-info.java
index 788b1b4f35a..4481e30c7f9 100644
--- a/config/test-infrastructure/src/main/java9/module-info.java
+++ b/config/test-infrastructure/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/config/testing/src/main/java9/module-info.java b/config/testing/src/main/java/module-info.java
similarity index 90%
rename from config/testing/src/main/java9/module-info.java
rename to config/testing/src/main/java/module-info.java
index 0994695ba43..7fe5f420564 100644
--- a/config/testing/src/main/java9/module-info.java
+++ b/config/testing/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/config/tests/module-mappers-1-base/src/main/java9/module-info.java b/config/tests/module-mappers-1-base/src/main/java/module-info.java
similarity index 94%
rename from config/tests/module-mappers-1-base/src/main/java9/module-info.java
rename to config/tests/module-mappers-1-base/src/main/java/module-info.java
index 4d039828bc1..b390e35cac3 100644
--- a/config/tests/module-mappers-1-base/src/main/java9/module-info.java
+++ b/config/tests/module-mappers-1-base/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/config/tests/module-mappers-2-override/src/main/java9/module-info.java b/config/tests/module-mappers-2-override/src/main/java/module-info.java
similarity index 95%
rename from config/tests/module-mappers-2-override/src/main/java9/module-info.java
rename to config/tests/module-mappers-2-override/src/main/java/module-info.java
index 62ef77827c2..c6815e70e63 100644
--- a/config/tests/module-mappers-2-override/src/main/java9/module-info.java
+++ b/config/tests/module-mappers-2-override/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/config/tests/module-parsers-1-override/src/main/java9/module-info.java b/config/tests/module-parsers-1-override/src/main/java/module-info.java
similarity index 94%
rename from config/tests/module-parsers-1-override/src/main/java9/module-info.java
rename to config/tests/module-parsers-1-override/src/main/java/module-info.java
index fbf07f97a3b..35daf73dc7e 100644
--- a/config/tests/module-parsers-1-override/src/main/java9/module-info.java
+++ b/config/tests/module-parsers-1-override/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/config/tests/test-bundle/src/main/java9/module-info.java b/config/tests/test-bundle/src/main/java/module-info.java
similarity index 91%
rename from config/tests/test-bundle/src/main/java9/module-info.java
rename to config/tests/test-bundle/src/main/java/module-info.java
index 082cc108ad2..3f57e89c6de 100644
--- a/config/tests/test-bundle/src/main/java9/module-info.java
+++ b/config/tests/test-bundle/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/config/tests/test-mappers-1-common/src/main/java9/module-info.java b/config/tests/test-mappers-1-common/src/main/java/module-info.java
similarity index 91%
rename from config/tests/test-mappers-1-common/src/main/java9/module-info.java
rename to config/tests/test-mappers-1-common/src/main/java/module-info.java
index 87dae32e4a0..99779ebe5be 100644
--- a/config/tests/test-mappers-1-common/src/main/java9/module-info.java
+++ b/config/tests/test-mappers-1-common/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/config/tests/test-mappers-2-complex/src/main/java9/module-info.java b/config/tests/test-mappers-2-complex/src/main/java/module-info.java
similarity index 91%
rename from config/tests/test-mappers-2-complex/src/main/java9/module-info.java
rename to config/tests/test-mappers-2-complex/src/main/java/module-info.java
index 159b0a653c6..2fc294de7bf 100644
--- a/config/tests/test-mappers-2-complex/src/main/java9/module-info.java
+++ b/config/tests/test-mappers-2-complex/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/config/tests/test-parsers-1-complex/src/main/java9/module-info.java b/config/tests/test-parsers-1-complex/src/main/java/module-info.java
similarity index 91%
rename from config/tests/test-parsers-1-complex/src/main/java9/module-info.java
rename to config/tests/test-parsers-1-complex/src/main/java/module-info.java
index 437d2cd0565..ffcd1b6f03c 100644
--- a/config/tests/test-parsers-1-complex/src/main/java9/module-info.java
+++ b/config/tests/test-parsers-1-complex/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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.
diff --git a/config/yaml/src/main/java9/module-info.java b/config/yaml/src/main/java/module-info.java
similarity index 100%
rename from config/yaml/src/main/java9/module-info.java
rename to config/yaml/src/main/java/module-info.java
diff --git a/examples/security/attribute-based-access-control/src/main/java9/module-info.java b/examples/security/attribute-based-access-control/src/main/java/module-info.java
similarity index 100%
rename from examples/security/attribute-based-access-control/src/main/java9/module-info.java
rename to examples/security/attribute-based-access-control/src/main/java/module-info.java
diff --git a/grpc/client/src/main/java9/module-info.java b/grpc/client/src/main/java/module-info.java
similarity index 100%
rename from grpc/client/src/main/java9/module-info.java
rename to grpc/client/src/main/java/module-info.java
diff --git a/grpc/core/src/main/java9/module-info.java b/grpc/core/src/main/java/module-info.java
similarity index 100%
rename from grpc/core/src/main/java9/module-info.java
rename to grpc/core/src/main/java/module-info.java
diff --git a/grpc/io.grpc/src/main/java9/module-info.java b/grpc/io.grpc/src/main/java/module-info.java
similarity index 100%
rename from grpc/io.grpc/src/main/java9/module-info.java
rename to grpc/io.grpc/src/main/java/module-info.java
diff --git a/grpc/metrics/src/main/java9/module-info.java b/grpc/metrics/src/main/java/module-info.java
similarity index 100%
rename from grpc/metrics/src/main/java9/module-info.java
rename to grpc/metrics/src/main/java/module-info.java
diff --git a/grpc/server/src/main/java9/module-info.java b/grpc/server/src/main/java/module-info.java
similarity index 100%
rename from grpc/server/src/main/java9/module-info.java
rename to grpc/server/src/main/java/module-info.java
diff --git a/health/common/src/main/java9/module-info.java b/health/common/src/main/java/module-info.java
similarity index 100%
rename from health/common/src/main/java9/module-info.java
rename to health/common/src/main/java/module-info.java
diff --git a/health/health-checks/src/main/java9/module-info.java b/health/health-checks/src/main/java/module-info.java
similarity index 100%
rename from health/health-checks/src/main/java9/module-info.java
rename to health/health-checks/src/main/java/module-info.java
diff --git a/health/health/src/main/java9/module-info.java b/health/health/src/main/java/module-info.java
similarity index 100%
rename from health/health/src/main/java9/module-info.java
rename to health/health/src/main/java/module-info.java
diff --git a/jersey/client/pom.xml b/jersey/client/pom.xml
index db003023a65..6c2c60057fd 100644
--- a/jersey/client/pom.xml
+++ b/jersey/client/pom.xml
@@ -62,6 +62,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>javax.activation-api</artifactId>
diff --git a/jersey/client/src/main/java9/module-info.java b/jersey/client/src/main/java/module-info.java
similarity index 96%
rename from jersey/client/src/main/java9/module-info.java
rename to jersey/client/src/main/java/module-info.java
index cf55555ab52..477c5e57140 100644
--- a/jersey/client/src/main/java9/module-info.java
+++ b/jersey/client/src/main/java/module-info.java
@@ -24,4 +24,6 @@
 
     requires transitive java.annotation;
     requires transitive javax.inject;
+
+    requires java.xml.bind;
 }
diff --git a/jersey/common/src/main/java9/module-info.java b/jersey/common/src/main/java/module-info.java
similarity index 100%
rename from jersey/common/src/main/java9/module-info.java
rename to jersey/common/src/main/java/module-info.java
diff --git a/jersey/jsonp/src/main/java9/module-info.java b/jersey/jsonp/src/main/java/module-info.java
similarity index 100%
rename from jersey/jsonp/src/main/java9/module-info.java
rename to jersey/jsonp/src/main/java/module-info.java
diff --git a/jersey/server/pom.xml b/jersey/server/pom.xml
index 0a54287131d..692c1d96692 100644
--- a/jersey/server/pom.xml
+++ b/jersey/server/pom.xml
@@ -74,6 +74,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>javax.activation-api</artifactId>
diff --git a/jersey/server/src/main/java9/module-info.java b/jersey/server/src/main/java/module-info.java
similarity index 97%
rename from jersey/server/src/main/java9/module-info.java
rename to jersey/server/src/main/java/module-info.java
index 8caca5a9266..cc6b4309320 100644
--- a/jersey/server/src/main/java9/module-info.java
+++ b/jersey/server/src/main/java/module-info.java
@@ -25,4 +25,6 @@
     requires transitive javax.inject;
     requires transitive java.activation;
     requires transitive java.annotation;
+
+    requires java.xml.bind;
 }
\ No newline at end of file
diff --git a/media/common/src/main/java9/module-info.java b/media/common/src/main/java/module-info.java
similarity index 100%
rename from media/common/src/main/java9/module-info.java
rename to media/common/src/main/java/module-info.java
diff --git a/media/jackson/common/src/main/java9/module-info.java b/media/jackson/common/src/main/java/module-info.java
similarity index 100%
rename from media/jackson/common/src/main/java9/module-info.java
rename to media/jackson/common/src/main/java/module-info.java
diff --git a/media/jackson/server/src/main/java9/module-info.java b/media/jackson/server/src/main/java/module-info.java
similarity index 100%
rename from media/jackson/server/src/main/java9/module-info.java
rename to media/jackson/server/src/main/java/module-info.java
diff --git a/media/jsonb/common/src/main/java9/module-info.java b/media/jsonb/common/src/main/java/module-info.java
similarity index 100%
rename from media/jsonb/common/src/main/java9/module-info.java
rename to media/jsonb/common/src/main/java/module-info.java
diff --git a/media/jsonb/server/src/main/java9/module-info.java b/media/jsonb/server/src/main/java/module-info.java
similarity index 100%
rename from media/jsonb/server/src/main/java9/module-info.java
rename to media/jsonb/server/src/main/java/module-info.java
diff --git a/media/jsonp/common/src/main/java9/module-info.java b/media/jsonp/common/src/main/java/module-info.java
similarity index 100%
rename from media/jsonp/common/src/main/java9/module-info.java
rename to media/jsonp/common/src/main/java/module-info.java
diff --git a/media/jsonp/server/src/main/java9/module-info.java b/media/jsonp/server/src/main/java/module-info.java
similarity index 100%
rename from media/jsonp/server/src/main/java9/module-info.java
rename to media/jsonp/server/src/main/java/module-info.java
diff --git a/metrics/metrics/src/main/java9/module-info.java b/metrics/metrics/src/main/java/module-info.java
similarity index 96%
rename from metrics/metrics/src/main/java9/module-info.java
rename to metrics/metrics/src/main/java/module-info.java
index bc534654896..04c44ad3811 100644
--- a/metrics/metrics/src/main/java9/module-info.java
+++ b/metrics/metrics/src/main/java/module-info.java
@@ -15,13 +15,14 @@
  */
 
 /**
- * Microprofile configuration module.
+ * Helidon Metrics implementation.
  */
 module io.helidon.metrics {
     requires java.logging;
 
     requires io.helidon.common;
     requires io.helidon.common.metrics;
+
     requires transitive microprofile.metrics.api;
     requires java.management;
     requires io.helidon.webserver;
@@ -30,6 +31,6 @@
 
     provides io.helidon.common.metrics.InternalBridge
             with io.helidon.metrics.InternalBridgeImpl;
-    
+
     exports io.helidon.metrics;
 }
diff --git a/metrics/prometheus/src/main/java9/module-info.java b/metrics/prometheus/src/main/java/module-info.java
similarity index 90%
rename from metrics/prometheus/src/main/java9/module-info.java
rename to metrics/prometheus/src/main/java/module-info.java
index b39cee0894a..93d500a3b04 100644
--- a/metrics/prometheus/src/main/java9/module-info.java
+++ b/metrics/prometheus/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/metrics2/metrics2/src/main/java9/module-info.java b/metrics2/metrics2/src/main/java/module-info.java
similarity index 100%
rename from metrics2/metrics2/src/main/java9/module-info.java
rename to metrics2/metrics2/src/main/java/module-info.java
diff --git a/microprofile/access-log/src/main/java9/module-info.java b/microprofile/access-log/src/main/java/module-info.java
similarity index 100%
rename from microprofile/access-log/src/main/java9/module-info.java
rename to microprofile/access-log/src/main/java/module-info.java
diff --git a/microprofile/bundles/helidon-microprofile-1.0/src/main/java9/module-info.java b/microprofile/bundles/helidon-microprofile-1.0/src/main/java/module-info.java
similarity index 90%
rename from microprofile/bundles/helidon-microprofile-1.0/src/main/java9/module-info.java
rename to microprofile/bundles/helidon-microprofile-1.0/src/main/java/module-info.java
index db465752aaa..bd62e1fb492 100644
--- a/microprofile/bundles/helidon-microprofile-1.0/src/main/java9/module-info.java
+++ b/microprofile/bundles/helidon-microprofile-1.0/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/microprofile/bundles/helidon-microprofile-1.1/src/main/java9/module-info.java b/microprofile/bundles/helidon-microprofile-1.1/src/main/java/module-info.java
similarity index 100%
rename from microprofile/bundles/helidon-microprofile-1.1/src/main/java9/module-info.java
rename to microprofile/bundles/helidon-microprofile-1.1/src/main/java/module-info.java
diff --git a/microprofile/bundles/helidon-microprofile-1.2/src/main/java9/module-info.java b/microprofile/bundles/helidon-microprofile-1.2/src/main/java/module-info.java
similarity index 100%
rename from microprofile/bundles/helidon-microprofile-1.2/src/main/java9/module-info.java
rename to microprofile/bundles/helidon-microprofile-1.2/src/main/java/module-info.java
diff --git a/microprofile/bundles/helidon-microprofile-2.2/src/main/java9/module-info.java b/microprofile/bundles/helidon-microprofile-2.2/src/main/java/module-info.java
similarity index 100%
rename from microprofile/bundles/helidon-microprofile-2.2/src/main/java9/module-info.java
rename to microprofile/bundles/helidon-microprofile-2.2/src/main/java/module-info.java
diff --git a/microprofile/bundles/helidon-microprofile-3.0/src/main/java9/module-info.java b/microprofile/bundles/helidon-microprofile-3.0/src/main/java/module-info.java
similarity index 100%
rename from microprofile/bundles/helidon-microprofile-3.0/src/main/java9/module-info.java
rename to microprofile/bundles/helidon-microprofile-3.0/src/main/java/module-info.java
diff --git a/microprofile/bundles/helidon-microprofile-3.1/src/main/java9/module-info.java b/microprofile/bundles/helidon-microprofile-3.1/src/main/java/module-info.java
similarity index 100%
rename from microprofile/bundles/helidon-microprofile-3.1/src/main/java9/module-info.java
rename to microprofile/bundles/helidon-microprofile-3.1/src/main/java/module-info.java
diff --git a/microprofile/bundles/helidon-microprofile-core/src/main/java9/module-info.java b/microprofile/bundles/helidon-microprofile-core/src/main/java/module-info.java
similarity index 100%
rename from microprofile/bundles/helidon-microprofile-core/src/main/java9/module-info.java
rename to microprofile/bundles/helidon-microprofile-core/src/main/java/module-info.java
diff --git a/microprofile/bundles/helidon-microprofile/src/main/java9/module-info.java b/microprofile/bundles/helidon-microprofile/src/main/java/module-info.java
similarity index 100%
rename from microprofile/bundles/helidon-microprofile/src/main/java9/module-info.java
rename to microprofile/bundles/helidon-microprofile/src/main/java/module-info.java
diff --git a/microprofile/config/src/main/java9/module-info.java b/microprofile/config/src/main/java/module-info.java
similarity index 100%
rename from microprofile/config/src/main/java9/module-info.java
rename to microprofile/config/src/main/java/module-info.java
diff --git a/microprofile/fault-tolerance/pom.xml b/microprofile/fault-tolerance/pom.xml
index 9eeb2357072..0784c35dde1 100644
--- a/microprofile/fault-tolerance/pom.xml
+++ b/microprofile/fault-tolerance/pom.xml
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>javax.activation-api</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.metrics</groupId>
diff --git a/microprofile/fault-tolerance/src/main/java9/module-info.java b/microprofile/fault-tolerance/src/main/java/module-info.java
similarity index 100%
rename from microprofile/fault-tolerance/src/main/java9/module-info.java
rename to microprofile/fault-tolerance/src/main/java/module-info.java
diff --git a/microprofile/grpc/client/src/main/java9/module-info.java b/microprofile/grpc/client/src/main/java/module-info.java
similarity index 100%
rename from microprofile/grpc/client/src/main/java9/module-info.java
rename to microprofile/grpc/client/src/main/java/module-info.java
diff --git a/microprofile/grpc/core/src/main/java9/module-info.java b/microprofile/grpc/core/src/main/java/module-info.java
similarity index 100%
rename from microprofile/grpc/core/src/main/java9/module-info.java
rename to microprofile/grpc/core/src/main/java/module-info.java
diff --git a/microprofile/grpc/metrics/src/main/java9/module-info.java b/microprofile/grpc/metrics/src/main/java/module-info.java
similarity index 100%
rename from microprofile/grpc/metrics/src/main/java9/module-info.java
rename to microprofile/grpc/metrics/src/main/java/module-info.java
diff --git a/microprofile/grpc/server/src/main/java9/module-info.java b/microprofile/grpc/server/src/main/java/module-info.java
similarity index 100%
rename from microprofile/grpc/server/src/main/java9/module-info.java
rename to microprofile/grpc/server/src/main/java/module-info.java
diff --git a/microprofile/health/src/main/java9/module-info.java b/microprofile/health/src/main/java/module-info.java
similarity index 100%
rename from microprofile/health/src/main/java9/module-info.java
rename to microprofile/health/src/main/java/module-info.java
diff --git a/microprofile/jwt-auth/jwt-auth-cdi/src/main/java9/module-info.java b/microprofile/jwt-auth/jwt-auth-cdi/src/main/java/module-info.java
similarity index 100%
rename from microprofile/jwt-auth/jwt-auth-cdi/src/main/java9/module-info.java
rename to microprofile/jwt-auth/jwt-auth-cdi/src/main/java/module-info.java
diff --git a/microprofile/jwt-auth/jwt-auth/src/main/java9/module-info.java b/microprofile/jwt-auth/jwt-auth/src/main/java/module-info.java
similarity index 93%
rename from microprofile/jwt-auth/jwt-auth/src/main/java9/module-info.java
rename to microprofile/jwt-auth/jwt-auth/src/main/java/module-info.java
index dfa330c757b..c17dfe4a25e 100644
--- a/microprofile/jwt-auth/jwt-auth/src/main/java9/module-info.java
+++ b/microprofile/jwt-auth/jwt-auth/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/microprofile/metrics/pom.xml b/microprofile/metrics/pom.xml
index 8b4c358807d..763eb986c47 100644
--- a/microprofile/metrics/pom.xml
+++ b/microprofile/metrics/pom.xml
@@ -40,6 +40,11 @@
             <artifactId>cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.server</groupId>
             <artifactId>helidon-microprofile-server</artifactId>
@@ -61,10 +66,5 @@
             <artifactId>internal-test-libs</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/microprofile/metrics/src/main/java9/module-info.java b/microprofile/metrics/src/main/java/module-info.java
similarity index 97%
rename from microprofile/metrics/src/main/java9/module-info.java
rename to microprofile/metrics/src/main/java/module-info.java
index c6fa22c7e4e..467419355a2 100644
--- a/microprofile/metrics/src/main/java9/module-info.java
+++ b/microprofile/metrics/src/main/java/module-info.java
@@ -24,6 +24,7 @@
     requires static javax.inject;
     requires static javax.interceptor.api;
     requires static java.annotation;
+    requires static java.activation;
 
     requires io.helidon.microprofile.server;
     requires transitive io.helidon.metrics;
diff --git a/microprofile/metrics2/pom.xml b/microprofile/metrics2/pom.xml
index dbb1e9c12f0..27d3c8f9c26 100644
--- a/microprofile/metrics2/pom.xml
+++ b/microprofile/metrics2/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>javax.activation-api</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/microprofile/metrics2/src/main/java9/module-info.java b/microprofile/metrics2/src/main/java/module-info.java
similarity index 100%
rename from microprofile/metrics2/src/main/java9/module-info.java
rename to microprofile/metrics2/src/main/java/module-info.java
diff --git a/microprofile/oidc/src/main/java9/module-info.java b/microprofile/oidc/src/main/java/module-info.java
similarity index 92%
rename from microprofile/oidc/src/main/java9/module-info.java
rename to microprofile/oidc/src/main/java/module-info.java
index 97aa18f75e9..a31adda189c 100644
--- a/microprofile/oidc/src/main/java9/module-info.java
+++ b/microprofile/oidc/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/microprofile/openapi/src/main/java9/module-info.java b/microprofile/openapi/src/main/java/module-info.java
similarity index 100%
rename from microprofile/openapi/src/main/java9/module-info.java
rename to microprofile/openapi/src/main/java/module-info.java
diff --git a/microprofile/rest-client/src/main/java9/module-info.java b/microprofile/rest-client/src/main/java/module-info.java
similarity index 100%
rename from microprofile/rest-client/src/main/java9/module-info.java
rename to microprofile/rest-client/src/main/java/module-info.java
diff --git a/microprofile/security/src/main/java9/module-info.java b/microprofile/security/src/main/java/module-info.java
similarity index 100%
rename from microprofile/security/src/main/java9/module-info.java
rename to microprofile/security/src/main/java/module-info.java
diff --git a/microprofile/server/src/main/java9/module-info.java b/microprofile/server/src/main/java/module-info.java
similarity index 100%
rename from microprofile/server/src/main/java9/module-info.java
rename to microprofile/server/src/main/java/module-info.java
diff --git a/microprofile/tracing/pom.xml b/microprofile/tracing/pom.xml
index 67eea7196b3..1db0d94c6aa 100644
--- a/microprofile/tracing/pom.xml
+++ b/microprofile/tracing/pom.xml
@@ -64,7 +64,7 @@
             <!-- Jersey on java 9 -->
             <groupId>javax.activation</groupId>
             <artifactId>javax.activation-api</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>
diff --git a/microprofile/tracing/src/main/java9/module-info.java b/microprofile/tracing/src/main/java/module-info.java
similarity index 100%
rename from microprofile/tracing/src/main/java9/module-info.java
rename to microprofile/tracing/src/main/java/module-info.java
diff --git a/openapi/src/main/java9/module-info.java b/openapi/src/main/java/module-info.java
similarity index 100%
rename from openapi/src/main/java9/module-info.java
rename to openapi/src/main/java/module-info.java
diff --git a/pom.xml b/pom.xml
index df4c9250a32..234717844ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,8 +181,9 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${version.plugin.compiler}</version>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>11</source>
+                        <target>11</target>
+                        <release>11</release>
                         <compilerArgs>
                             <arg>-Xlint:unchecked</arg>
                         </compilerArgs>
@@ -193,9 +194,12 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>${version.plugin.javadoc}</version>
                     <configuration>
-                        <source>8</source>
+                        <source>11</source>
+                        <release>11</release>
                         <!-- we are not interested in each file that is generated -->
                         <quiet>true</quiet>
+                        <!--<verbose>true</verbose>-->
+                        <isOffline>true</isOffline>
                         <offlineLinks>
                             <offlineLink>
                                 <url>${javadoc.link.jackson-annotations}</url>
@@ -307,13 +311,13 @@
                             </offlineLink>
                         </offlineLinks>
                         <additionalJOptions combine.children="append">
-                            <JOption>-J-Dhttp.agent=maven-javadoc-plugin</JOption>
+                            <additionalJOption>-J-Dhttp.agent=maven-javadoc-plugin</additionalJOption>
+                            <!--<additionalJOption>- -frames</additionalJOption>-->
                         </additionalJOptions>
                         <additionalOptions>
-                            <option>--add-stylesheet ${top.parent.basedir}/etc/helidon-javadoc.css</option>
+                            <additionalOption>--add-stylesheet ${top.parent.basedir}/etc/helidon-javadoc.css</additionalOption>
                         </additionalOptions>
                         <sourceFileExcludes>
-                            <sourceFileExclude>**/module-info.java</sourceFileExclude>
                             <sourceFileExclude>target/**/*.java</sourceFileExclude>
                         </sourceFileExcludes>
                     </configuration>
@@ -902,67 +906,6 @@
                 </pluginManagement>
             </build>
         </profile>
-        <profile>
-            <id>jdk9+</id>
-            <activation>
-                <jdk>[9,)</jdk>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-compiler-plugin</artifactId>
-                            <executions>
-                                <!-- first pass, compile everything for java9 -->
-                                <execution>
-                                    <id>default-compile</id>
-                                    <configuration>
-                                        <source>9</source>
-                                        <target>9</target>
-                                        <release>9</release>
-                                        <compileSourceRoots>
-                                            <compileSourceRoot>${project.basedir}/src/main/java</compileSourceRoot>
-                                            <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
-                                            <compileSourceRoot>${project.basedir}/target/generated-sources</compileSourceRoot>
-                                        </compileSourceRoots>
-                                    </configuration>
-                                </execution>
-                                <!-- 2nd pass, re-compile for java8 -->
-                                <execution>
-                                    <id>base-compile</id>
-                                    <goals>
-                                        <goal>compile</goal>
-                                    </goals>
-                                    <configuration>
-                                        <release>8</release>
-                                    </configuration>
-                                </execution>
-                                <execution>
-                                    <id>default-testCompile</id>
-                                    <goals>
-                                        <goal>testCompile</goal>
-                                    </goals>
-                                    <configuration>
-                                        <release>8</release>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                        <plugin>
-                          <groupId>org.apache.maven.plugins</groupId>
-                          <artifactId>maven-javadoc-plugin</artifactId>
-                          <configuration>
-                              <additionalJOptions combine.children="append">
-                                  <additionalJOption>--frames</additionalJOption>
-                              </additionalJOptions>
-                          </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
         <profile>
             <id>sources</id>
             <build>
diff --git a/security/abac/policy-el/src/main/java9/module-info.java b/security/abac/policy-el/src/main/java/module-info.java
similarity index 93%
rename from security/abac/policy-el/src/main/java9/module-info.java
rename to security/abac/policy-el/src/main/java/module-info.java
index f40a18a9e2c..9e31eda7da0 100644
--- a/security/abac/policy-el/src/main/java9/module-info.java
+++ b/security/abac/policy-el/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/abac/policy/src/main/java9/module-info.java b/security/abac/policy/src/main/java/module-info.java
similarity index 92%
rename from security/abac/policy/src/main/java9/module-info.java
rename to security/abac/policy/src/main/java/module-info.java
index 939baf551fd..91c96964818 100644
--- a/security/abac/policy/src/main/java9/module-info.java
+++ b/security/abac/policy/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/abac/role/src/main/java9/module-info.java b/security/abac/role/src/main/java/module-info.java
similarity index 100%
rename from security/abac/role/src/main/java9/module-info.java
rename to security/abac/role/src/main/java/module-info.java
diff --git a/security/abac/scope/src/main/java9/module-info.java b/security/abac/scope/src/main/java/module-info.java
similarity index 91%
rename from security/abac/scope/src/main/java9/module-info.java
rename to security/abac/scope/src/main/java/module-info.java
index f24ac000beb..e1fb78a746a 100644
--- a/security/abac/scope/src/main/java9/module-info.java
+++ b/security/abac/scope/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/abac/time/src/main/java9/module-info.java b/security/abac/time/src/main/java/module-info.java
similarity index 91%
rename from security/abac/time/src/main/java9/module-info.java
rename to security/abac/time/src/main/java/module-info.java
index 467849e772e..c9d91a0cc36 100644
--- a/security/abac/time/src/main/java9/module-info.java
+++ b/security/abac/time/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/annotations/src/main/java9/module-info.java b/security/annotations/src/main/java/module-info.java
similarity index 90%
rename from security/annotations/src/main/java9/module-info.java
rename to security/annotations/src/main/java/module-info.java
index b586cdfc7b5..9eb26c0965d 100644
--- a/security/annotations/src/main/java9/module-info.java
+++ b/security/annotations/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/integration/common/src/main/java9/module-info.java b/security/integration/common/src/main/java/module-info.java
similarity index 100%
rename from security/integration/common/src/main/java9/module-info.java
rename to security/integration/common/src/main/java/module-info.java
diff --git a/security/integration/grpc/src/main/java9/module-info.java b/security/integration/grpc/src/main/java/module-info.java
similarity index 100%
rename from security/integration/grpc/src/main/java9/module-info.java
rename to security/integration/grpc/src/main/java/module-info.java
diff --git a/security/integration/jersey-client/src/main/java9/module-info.java b/security/integration/jersey-client/src/main/java/module-info.java
similarity index 100%
rename from security/integration/jersey-client/src/main/java9/module-info.java
rename to security/integration/jersey-client/src/main/java/module-info.java
diff --git a/security/integration/jersey/src/main/java9/module-info.java b/security/integration/jersey/src/main/java/module-info.java
similarity index 100%
rename from security/integration/jersey/src/main/java9/module-info.java
rename to security/integration/jersey/src/main/java/module-info.java
diff --git a/security/integration/webserver/src/main/java9/module-info.java b/security/integration/webserver/src/main/java/module-info.java
similarity index 100%
rename from security/integration/webserver/src/main/java9/module-info.java
rename to security/integration/webserver/src/main/java/module-info.java
diff --git a/security/jwt/src/main/java9/module-info.java b/security/jwt/src/main/java/module-info.java
similarity index 100%
rename from security/jwt/src/main/java9/module-info.java
rename to security/jwt/src/main/java/module-info.java
diff --git a/security/providers/abac/src/main/java9/module-info.java b/security/providers/abac/src/main/java/module-info.java
similarity index 93%
rename from security/providers/abac/src/main/java9/module-info.java
rename to security/providers/abac/src/main/java/module-info.java
index dc170488517..3e7e67cb11a 100644
--- a/security/providers/abac/src/main/java9/module-info.java
+++ b/security/providers/abac/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/providers/common/src/main/java9/module-info.java b/security/providers/common/src/main/java/module-info.java
similarity index 100%
rename from security/providers/common/src/main/java9/module-info.java
rename to security/providers/common/src/main/java/module-info.java
diff --git a/security/providers/google-login/src/main/java9/module-info.java b/security/providers/google-login/src/main/java/module-info.java
similarity index 93%
rename from security/providers/google-login/src/main/java9/module-info.java
rename to security/providers/google-login/src/main/java/module-info.java
index 4b7525680a9..f195ec0cb64 100644
--- a/security/providers/google-login/src/main/java9/module-info.java
+++ b/security/providers/google-login/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/providers/header/src/main/java9/module-info.java b/security/providers/header/src/main/java/module-info.java
similarity index 92%
rename from security/providers/header/src/main/java9/module-info.java
rename to security/providers/header/src/main/java/module-info.java
index f00d0d23055..4f7606e5047 100644
--- a/security/providers/header/src/main/java9/module-info.java
+++ b/security/providers/header/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/providers/http-auth/src/main/java9/module-info.java b/security/providers/http-auth/src/main/java/module-info.java
similarity index 100%
rename from security/providers/http-auth/src/main/java9/module-info.java
rename to security/providers/http-auth/src/main/java/module-info.java
diff --git a/security/providers/http-sign/src/main/java9/module-info.java b/security/providers/http-sign/src/main/java/module-info.java
similarity index 93%
rename from security/providers/http-sign/src/main/java9/module-info.java
rename to security/providers/http-sign/src/main/java/module-info.java
index b00569b8722..2cc91482eb7 100644
--- a/security/providers/http-sign/src/main/java9/module-info.java
+++ b/security/providers/http-sign/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/providers/idcs-mapper/src/main/java9/module-info.java b/security/providers/idcs-mapper/src/main/java/module-info.java
similarity index 100%
rename from security/providers/idcs-mapper/src/main/java9/module-info.java
rename to security/providers/idcs-mapper/src/main/java/module-info.java
diff --git a/security/providers/jwt/src/main/java9/module-info.java b/security/providers/jwt/src/main/java/module-info.java
similarity index 93%
rename from security/providers/jwt/src/main/java9/module-info.java
rename to security/providers/jwt/src/main/java/module-info.java
index 62ce1979899..27c81a8f760 100644
--- a/security/providers/jwt/src/main/java9/module-info.java
+++ b/security/providers/jwt/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/providers/oidc-common/src/main/java9/module-info.java b/security/providers/oidc-common/src/main/java/module-info.java
similarity index 92%
rename from security/providers/oidc-common/src/main/java9/module-info.java
rename to security/providers/oidc-common/src/main/java/module-info.java
index d74c0b7e751..279c504aa22 100644
--- a/security/providers/oidc-common/src/main/java9/module-info.java
+++ b/security/providers/oidc-common/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/providers/oidc/src/main/java9/module-info.java b/security/providers/oidc/src/main/java/module-info.java
similarity index 94%
rename from security/providers/oidc/src/main/java9/module-info.java
rename to security/providers/oidc/src/main/java/module-info.java
index 7837879cad1..785243de5db 100644
--- a/security/providers/oidc/src/main/java9/module-info.java
+++ b/security/providers/oidc/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/security/security/src/main/java9/module-info.java b/security/security/src/main/java/module-info.java
similarity index 100%
rename from security/security/src/main/java9/module-info.java
rename to security/security/src/main/java/module-info.java
diff --git a/security/util/src/main/java9/module-info.java b/security/util/src/main/java/module-info.java
similarity index 91%
rename from security/util/src/main/java9/module-info.java
rename to security/util/src/main/java/module-info.java
index dfd5943e640..24f1f40bfc8 100644
--- a/security/util/src/main/java9/module-info.java
+++ b/security/util/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/tracing/config/src/main/java9/module-info.java b/tracing/config/src/main/java/module-info.java
similarity index 100%
rename from tracing/config/src/main/java9/module-info.java
rename to tracing/config/src/main/java/module-info.java
diff --git a/tracing/jaeger/src/main/java9/module-info.java b/tracing/jaeger/src/main/java/module-info.java
similarity index 100%
rename from tracing/jaeger/src/main/java9/module-info.java
rename to tracing/jaeger/src/main/java/module-info.java
diff --git a/tracing/jersey-client/src/main/java9/module-info.java b/tracing/jersey-client/src/main/java/module-info.java
similarity index 100%
rename from tracing/jersey-client/src/main/java9/module-info.java
rename to tracing/jersey-client/src/main/java/module-info.java
diff --git a/tracing/jersey/src/main/java9/module-info.java b/tracing/jersey/src/main/java/module-info.java
similarity index 100%
rename from tracing/jersey/src/main/java9/module-info.java
rename to tracing/jersey/src/main/java/module-info.java
diff --git a/tracing/tracing/src/main/java9/module-info.java b/tracing/tracing/src/main/java/module-info.java
similarity index 100%
rename from tracing/tracing/src/main/java9/module-info.java
rename to tracing/tracing/src/main/java/module-info.java
diff --git a/tracing/zipkin/src/main/java9/module-info.java b/tracing/zipkin/src/main/java/module-info.java
similarity index 93%
rename from tracing/zipkin/src/main/java9/module-info.java
rename to tracing/zipkin/src/main/java/module-info.java
index 68ae2dfd7b9..40357ceb441 100644
--- a/tracing/zipkin/src/main/java9/module-info.java
+++ b/tracing/zipkin/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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.
diff --git a/webclient/jaxrs/src/main/java9/module-info.java b/webclient/jaxrs/src/main/java/module-info.java
similarity index 100%
rename from webclient/jaxrs/src/main/java9/module-info.java
rename to webclient/jaxrs/src/main/java/module-info.java
diff --git a/webserver/access-log/src/main/java9/module-info.java b/webserver/access-log/src/main/java/module-info.java
similarity index 100%
rename from webserver/access-log/src/main/java9/module-info.java
rename to webserver/access-log/src/main/java/module-info.java
diff --git a/webserver/jersey/src/main/java9/module-info.java b/webserver/jersey/src/main/java/module-info.java
similarity index 100%
rename from webserver/jersey/src/main/java9/module-info.java
rename to webserver/jersey/src/main/java/module-info.java
diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/SendHeadersFirstPublisher.java b/webserver/webserver/src/main/java/io/helidon/webserver/SendHeadersFirstPublisher.java
index 694dae52414..f1f215ce8bd 100644
--- a/webserver/webserver/src/main/java/io/helidon/webserver/SendHeadersFirstPublisher.java
+++ b/webserver/webserver/src/main/java/io/helidon/webserver/SendHeadersFirstPublisher.java
@@ -104,7 +104,10 @@ public void onNext(T item) {
         private void sendHeadersIfNeeded() {
             if (headers != null && !sent && !sentVolatile) {
                 synchronized (this) {
-                    if (!sent && !sentVolatile) {
+                    // no longer re-checking sent - reported by spotbugs as a "double check"
+                    // also it must be sufficient to check the volatile field, as it has the
+                    // same value
+                    if (!sentVolatile) {
                         sent = true;
                         sentVolatile = true;
                         headers.send();
diff --git a/webserver/webserver/src/main/java9/module-info.java b/webserver/webserver/src/main/java/module-info.java
similarity index 100%
rename from webserver/webserver/src/main/java9/module-info.java
rename to webserver/webserver/src/main/java/module-info.java

From 2a65b2c66d92a626a2504d26eedc6fafa2619da0 Mon Sep 17 00:00:00 2001
From: Tomas Langer <tomas.langer@oracle.com>
Date: Mon, 9 Dec 2019 21:24:02 +0100
Subject: [PATCH 2/2] Use release 8 for javadoc.

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 234717844ea..62554d6c98a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,8 +194,8 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>${version.plugin.javadoc}</version>
                     <configuration>
-                        <source>11</source>
-                        <release>11</release>
+                        <source>8</source>
+                        <release>8</release>
                         <!-- we are not interested in each file that is generated -->
                         <quiet>true</quiet>
                         <!--<verbose>true</verbose>-->
@@ -318,6 +318,7 @@
                             <additionalOption>--add-stylesheet ${top.parent.basedir}/etc/helidon-javadoc.css</additionalOption>
                         </additionalOptions>
                         <sourceFileExcludes>
+                            <sourceFileExclude>**/module-info.java</sourceFileExclude>
                             <sourceFileExclude>target/**/*.java</sourceFileExclude>
                         </sourceFileExcludes>
                     </configuration>