Merge branch 'alpha'

* alpha: fix(deps): upgrade dependencies fix: bump hazelcast and snake yml dependencies fix: remove enforced INFO level for license fix: avoid spring loading issue with vertx and k8s client fix: update kubernetes client dependency feat: bump gravitee-plugin version to 1.25.0 feat: move to bom v4 and vertx 4.3.8 fix(api): load the right property source for /configuration feat: bump reporter api version
gravitee-io · Mar 17, 2023 · 307906d · 307906d
2 parents c756ee5 + c60db5a
commit 307906d
Show file tree

Hide file tree

Showing 29 changed files with 263 additions and 104 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,59 @@
+# [3.0.0-alpha.4](https://github.com/gravitee-io/gravitee-node/compare/3.0.0-alpha.3...3.0.0-alpha.4) (2023-03-16)
+
+
+### Bug Fixes
+
+* bump hazelcast and snake yml dependencies ([b297a0e](https://github.com/gravitee-io/gravitee-node/commit/b297a0ef2cf02d54a37eb4a1093e834d0fcadbf7))
+* remove enforced INFO level for license ([8681528](https://github.com/gravitee-io/gravitee-node/commit/8681528c2dcf376f03197339b4bfc9967b89e565))
+
+# [3.0.0-alpha.4](https://github.com/gravitee-io/gravitee-node/compare/3.0.0-alpha.3...3.0.0-alpha.4) (2023-03-09)
+
+
+### Bug Fixes
+
+* remove enforced INFO level for license ([8681528](https://github.com/gravitee-io/gravitee-node/commit/8681528c2dcf376f03197339b4bfc9967b89e565))
+
+# [3.0.0-alpha.3](https://github.com/gravitee-io/gravitee-node/compare/3.0.0-alpha.2...3.0.0-alpha.3) (2023-03-07)
+
+
+### Bug Fixes
+
+* avoid spring loading issue with vertx and k8s client ([a46a05d](https://github.com/gravitee-io/gravitee-node/commit/a46a05d8c9a306071fdcca1f8aad2925cb8dd959))
+
+# [3.0.0-alpha.2](https://github.com/gravitee-io/gravitee-node/compare/3.0.0-alpha.1...3.0.0-alpha.2) (2023-02-22)
+
+
+### Bug Fixes
+
+* update kubernetes client dependency ([bc5d835](https://github.com/gravitee-io/gravitee-node/commit/bc5d835c3c7060d5091c70453d89c4886c7249ec))
+
+# [3.0.0-alpha.1](https://github.com/gravitee-io/gravitee-node/compare/2.1.0-alpha.2...3.0.0-alpha.1) (2023-02-16)
+
+
+### Features
+
+* bump gravitee-plugin version to 1.25.0 ([88b4ac0](https://github.com/gravitee-io/gravitee-node/commit/88b4ac0c097e4bd72a37893b832dde9634094206))
+* move to bom v4 and vertx 4.3.8 ([29f3796](https://github.com/gravitee-io/gravitee-node/commit/29f3796259f4f0e8f248c7997fbd2bd30a6c2642))
+
+
+### BREAKING CHANGES
+
+* requires vertx 4.3.8
+
+# [2.1.0-alpha.2](https://github.com/gravitee-io/gravitee-node/compare/2.1.0-alpha.1...2.1.0-alpha.2) (2023-02-16)
+
+
+### Bug Fixes
+
+* **api:** load the right property source for /configuration ([a896204](https://github.com/gravitee-io/gravitee-node/commit/a896204ed1ccc8ea6b77378b10f2f6f4fb27b46b))
+
+# [2.1.0-alpha.1](https://github.com/gravitee-io/gravitee-node/compare/2.0.2...2.1.0-alpha.1) (2023-02-10)
+
+
+### Features
+
+* bump reporter api version ([c2493b7](https://github.com/gravitee-io/gravitee-node/commit/c2493b75a04b5e38671bf68425e7a6a3915c61f8))
+
 ## [2.0.5](https://github.com/gravitee-io/gravitee-node/compare/2.0.4...2.0.5) (2023-03-13)
 
 

diff --git a/gravitee-node-api/pom.xml b/gravitee-node-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-api</artifactId>

diff --git a/gravitee-node-cache/pom.xml b/gravitee-node-cache/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-cache</artifactId>

diff --git a/gravitee-node-certificates/pom.xml b/gravitee-node-certificates/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-certificates</artifactId>
@@ -38,12 +38,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
         <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/...de-certificates/src/test/java/io/gravitee/node/certificates/ReloadableKeyManagerTest.java b/...de-certificates/src/test/java/io/gravitee/node/certificates/ReloadableKeyManagerTest.java
@@ -17,6 +17,7 @@
 
 import static io.gravitee.node.api.certificate.KeyStoreLoader.CERTIFICATE_FORMAT_PKCS12;
 import static io.gravitee.node.certificates.ReloadableKeyManager.MAX_SNI_DOMAINS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
@@ -109,6 +110,38 @@ public void shouldFallbackToDefaultAliasIfNoServerName() {
         assertEquals("localhost", cut.chooseEngineServerAlias("void", null, sslEngine));
     }
 
+    @Test
+    public void shouldGetPrivateKey() {
+        final KeyStore keyStore = KeyStoreUtils.initFromPath(CERTIFICATE_FORMAT_PKCS12, getPath("all-in-one.p12"), "secret");
+        cut.load("localhost", keyStore, "secret", true);
+
+        assertThat(cut.getPrivateKey("localhost")).isNotNull();
+    }
+
+    @Test
+    public void shouldGetNullPrivateKeyWhenAliasIsUnknown() {
+        final KeyStore keyStore = KeyStoreUtils.initFromPath(CERTIFICATE_FORMAT_PKCS12, getPath("all-in-one.p12"), "secret");
+        cut.load("localhost", keyStore, "secret", true);
+
+        assertThat(cut.getPrivateKey("unknown")).isNull();
+    }
+
+    @Test
+    public void shouldGetCertificateChain() {
+        final KeyStore keyStore = KeyStoreUtils.initFromPath(CERTIFICATE_FORMAT_PKCS12, getPath("all-in-one.p12"), "secret");
+        cut.load("localhost", keyStore, "secret", true);
+
+        assertThat(cut.getCertificateChain("localhost")).isNotNull();
+    }
+
+    @Test
+    public void shouldGetNullCertificateChainWhenAliasIsUnknown() {
+        final KeyStore keyStore = KeyStoreUtils.initFromPath(CERTIFICATE_FORMAT_PKCS12, getPath("all-in-one.p12"), "secret");
+        cut.load("localhost", keyStore, "secret", true);
+
+        assertThat(cut.getCertificateChain(null)).isNull();
+    }
+
     @Test
     public void shouldStopCacheWhenCacheIsFull() {
         final KeyStore keyStore = KeyStoreUtils.initFromPath(CERTIFICATE_FORMAT_PKCS12, getPath("all-in-one.p12"), "secret");

diff --git a/gravitee-node-cluster/pom.xml b/gravitee-node-cluster/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-cluster</artifactId>
@@ -74,10 +74,6 @@
         </dependency>
 
         <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/gravitee-node-container/pom.xml b/gravitee-node-container/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-container</artifactId>
@@ -86,10 +86,6 @@
         </dependency>
 
         <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/gravitee-node-jetty/pom.xml b/gravitee-node-jetty/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-jetty</artifactId>

diff --git a/gravitee-node-kubernetes/pom.xml b/gravitee-node-kubernetes/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-kubernetes</artifactId>
@@ -50,10 +50,6 @@
         </dependency>
 
         <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/gravitee-node-license/pom.xml b/gravitee-node-license/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-license</artifactId>
@@ -53,20 +53,6 @@
             <artifactId>license3j</artifactId>
         </dependency>
 
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
-
         <!-- Spring dependencies -->
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/gravitee-node-license/src/main/java/io/gravitee/node/license/LicenseService.java b/gravitee-node-license/src/main/java/io/gravitee/node/license/LicenseService.java
@@ -15,7 +15,6 @@
  */
 package io.gravitee.node.license;
 
-import ch.qos.logback.classic.Level;
 import io.gravitee.common.service.AbstractService;
 import io.gravitee.node.api.Node;
 import io.gravitee.node.license.license3j.License3JLicense;
@@ -119,9 +118,6 @@ public io.gravitee.node.api.license.License getLicense() {
     protected void doStart() throws Exception {
         super.doStart();
 
-        // Ensure log level for license module to INFO
-        ((ch.qos.logback.classic.Logger) logger).setLevel(Level.INFO);
-
         this.loadLicense();
         this.startLicenseChecker();
         this.startLicenseWatcher();

diff --git a/gravitee-node-management/pom.xml b/gravitee-node-management/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-management</artifactId>
@@ -50,12 +50,6 @@
             <artifactId>vertx-web</artifactId>
         </dependency>
 
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
         <!-- Jackson dependencies -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/gravitee-node-monitoring/pom.xml b/gravitee-node-monitoring/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-monitoring</artifactId>

diff --git a/...-node-monitoring/src/test/java/io/gravitee/node/monitoring/NodeMonitoringServiceTest.java b/...-node-monitoring/src/test/java/io/gravitee/node/monitoring/NodeMonitoringServiceTest.java
@@ -15,7 +15,7 @@
  */
 package io.gravitee.node.monitoring;
 
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import io.gravitee.node.api.Monitoring;
@@ -99,7 +99,7 @@ public void shouldNotCreateOrUpdateIfNotRepository() throws InterruptedException
         obs.await();
         obs.assertValue(monitoring);
 
-        verifyZeroInteractions(repository);
+        verifyNoInteractions(repository);
     }
 
     @Test

diff --git a/gravitee-node-notifier/pom.xml b/gravitee-node-notifier/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gravitee-node</artifactId>
         <groupId>io.gravitee.node</groupId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -74,4 +74,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node-plugins</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-plugins-service</artifactId>

diff --git a/gravitee-node-plugins/pom.xml b/gravitee-node-plugins/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-plugins</artifactId>
@@ -42,12 +42,6 @@
             <artifactId>gravitee-common</artifactId>
         </dependency>
 
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
         <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/gravitee-node-reporter/pom.xml b/gravitee-node-reporter/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.gravitee.node</groupId>
         <artifactId>gravitee-node</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.0-alpha.4</version>
     </parent>
 
     <artifactId>gravitee-node-reporter</artifactId>
@@ -54,12 +54,6 @@
             <artifactId>gravitee-reporter-api</artifactId>
         </dependency>
 
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
         <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>