Merge branch 'master' into 2386-micronaut-integration

helidon-io · Nov 25, 2020 · 4ecda43 · 4ecda43
2 parents f40e241 + 552d033
commit 4ecda43
Show file tree

Hide file tree

Showing 16 changed files with 1,165 additions and 79 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -81,7 +81,6 @@
         <version.lib.jsonp-impl>1.1.6</version.lib.jsonp-impl>
         <version.lib.junit4>4.13.1</version.lib.junit4>
         <version.lib.junit>5.6.2</version.lib.junit>
-        <version.lib.kafka-junit5>3.2.1</version.lib.kafka-junit5>
         <version.lib.kafka>2.5.0</version.lib.kafka>
         <version.lib.log4j>2.13.3</version.lib.log4j>
         <version.lib.logback>1.2.3</version.lib.logback>
@@ -118,7 +117,6 @@
         <version.lib.prometheus>0.9.0</version.lib.prometheus>
         <version.lib.reactive-streams-tck>1.0.3</version.lib.reactive-streams-tck>
         <version.lib.reactivestreams>1.0.3</version.lib.reactivestreams>
-        <version.lib.scala>2.12.10</version.lib.scala>
         <version.lib.slf4j>1.7.30</version.lib.slf4j>
         <version.lib.smallrye-openapi>1.2.0</version.lib.smallrye-openapi>
         <version.lib.snakeyaml>1.27</version.lib.snakeyaml>
@@ -989,25 +987,6 @@
                 <artifactId>kafka-clients</artifactId>
                 <version>${version.lib.kafka}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.kafka</groupId>
-                <artifactId>kafka_2.12</artifactId>
-                <version>${version.lib.kafka}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.zookeeper</groupId>
-                        <artifactId>zookeeper</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.scala-lang</groupId>
-                        <artifactId>scala-library</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.scala-lang</groupId>
-                        <artifactId>scala-reflect</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <!-- Testing libraries -->
             <dependency>
                 <groupId>org.mockito</groupId>
@@ -1110,27 +1089,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>com.salesforce.kafka.test</groupId>
-                <artifactId>kafka-junit5</artifactId>
-                <version>${version.lib.kafka-junit5}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.zookeeper</groupId>
-                        <artifactId>zookeeper</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.zookeeper</groupId>
-                <artifactId>zookeeper</artifactId>
-                <version>${version.lib.zookeeper}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.scala-lang</groupId>
-                <artifactId>scala-library</artifactId>
-                <version>${version.lib.scala}</version>
-            </dependency>
             <dependency>
                 <groupId>org.reactivestreams</groupId>
                 <artifactId>reactive-streams-tck</artifactId>

diff --git a/docs/mp/config/01_introduction.adoc b/docs/mp/config/01_introduction.adoc
@@ -100,7 +100,7 @@ service-2: "${uri}/service2"
 * *Encryption* +
 You can encrypt secrets using a master password and store them in a configuration file.
 The config encryption filter in MicroProfile Config is enabled by default.
-For more information, see <<about/02_configuration-secrets.adoc,Configuration Secrets>>.
+For more information, see <<security/03_configuration-secrets.adoc,Configuration Secrets>>.
 
 [source,properties]
 .Example of encrypted secrets
@@ -220,4 +220,4 @@ For more information on using Helidon Config APIs, see the Helidon SE Configurat
 
 - https://helidon.io/docs/latest/apidocs/io/helidon/config/spi/package-summary.html[Helidon Config SPI]
 - https://helidon.io/docs/latest/apidocs/io/helidon/config/package-summary.html[Helidon Config API]
-- https://download.eclipse.org/microprofile/microprofile-config-1.3/apidocs/[Eclispe MicroProfile API]
+- https://download.eclipse.org/microprofile/microprofile-config-1.3/apidocs/[Eclipse MicroProfile API]