Upgraded to Java 17 and Micronaut 3.8.0 (#229)

* Split API and CLI (#227) * Split API and CLI * Update README.md * Update README.md * Fix Sonar * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Fix Sonar * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update * Update README.md * Update README.md * Update README.md * Update * Add build step in pull and push actions * Java 17 * Upgrade * Upgrade * Upgrade * Upgrade * Upgrade * Upgrade * Upgrade * Upgrade * Fixed test * Split API and CLI (#227) * Split API and CLI * Update README.md * Update README.md * Fix Sonar * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Fix Sonar * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update * Update README.md * Update README.md * Update README.md * Update * Upgrade * Rollback testcontainers kafka * Fix upgrade * Enforce testcontainers kafka version * Fixed inject * Fixed docker tests * Fixed docker tests * Fixed docker tests * Fixed docker tests * Disabled dev profile
michelin · Jan 12, 2023 · 8498360 · 8498360
1 parent 1fd60f8
commit 8498360
Show file tree

Hide file tree

Showing 122 changed files with 939 additions and 1,620 deletions.
diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml
@@ -14,10 +14,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
 
     - name: Cache SonarCloud packages

diff --git a/.github/workflows/on_push_master.yml b/.github/workflows/on_push_master.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
 
       - name: Cache SonarCloud packages

diff --git a/.github/workflows/on_push_tag.yml b/.github/workflows/on_push_tag.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
 
       - name: Cache Gradle packages

diff --git a/.gitignore b/.gitignore
@@ -12,5 +12,4 @@ out/
 .settings
 .classpath
 .factorypath
-api/src/main/java/com/michelin/ns4kafka/controllers/InitController.java
-api/src/main/resources/application-*.yml
+src/main/resources/application-*.yml
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id("com.github.johnrengelman.shadow") version "7.0.0"
-    id("io.micronaut.application") version "1.5.0"
-    id 'jacoco'
-    id "org.sonarqube" version "3.1.1"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("io.micronaut.application") version "3.6.7"
+    id "jacoco"
+    id "org.sonarqube" version "3.5.0.2730"
 }
 
 group = "com.michelin.ns4kafka"
@@ -12,45 +12,52 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.20'
-    annotationProcessor 'org.projectlombok:lombok:1.18.20'
+    annotationProcessor("org.projectlombok:lombok")
+    annotationProcessor("io.micronaut:micronaut-http-validation")
     annotationProcessor("io.micronaut.openapi:micronaut-openapi")
-    annotationProcessor("io.micronaut:micronaut-management")
     annotationProcessor("io.micronaut.security:micronaut-security-annotations")
-    annotationProcessor("io.swagger.core.v3:swagger-annotations")
 
-    implementation("io.micronaut:micronaut-validation")
-    implementation("io.micronaut:micronaut-runtime")
-    implementation("javax.annotation:javax.annotation-api")
     implementation("io.micronaut:micronaut-http-client")
-    implementation("io.micronaut.openapi:micronaut-openapi")
+    implementation("io.micronaut:micronaut-jackson-databind")
+    implementation("io.micronaut.kafka:micronaut-kafka")
     implementation("io.micronaut.security:micronaut-security")
     implementation("io.micronaut.security:micronaut-security-jwt")
     implementation("io.micronaut.security:micronaut-security-ldap")
-    implementation("io.micronaut.kafka:micronaut-kafka")
+    implementation("io.swagger.core.v3:swagger-annotations")
+    implementation("jakarta.annotation:jakarta.annotation-api")
+    implementation("io.micronaut.rxjava3:micronaut-rxjava3")
+    implementation("io.micronaut.rxjava3:micronaut-rxjava3-http-client")
+    implementation("io.micronaut.openapi:micronaut-openapi")
+
+    compileOnly("org.projectlombok:lombok")
 
     runtimeOnly("ch.qos.logback:logback-classic")
 
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
-    testCompileOnly 'org.projectlombok:lombok:1.18.16'
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.testcontainers:junit-jupiter")
+    testImplementation("org.testcontainers:testcontainers")
+    testImplementation("org.testcontainers:kafka") {
+        version {
+            strictly '1.15.3'
+        }
+    }
+    testImplementation("org.mockito:mockito-junit-jupiter:4.11.0")
 
-    testImplementation 'org.testcontainers:kafka:1.15.3'
-    testImplementation "org.testcontainers:junit-jupiter"
-    testImplementation 'org.mockito:mockito-inline:3.7.7'
-    testImplementation 'org.mockito:mockito-junit-jupiter:3.7.7'
+    testAnnotationProcessor("org.projectlombok:lombok")
+    testCompileOnly("org.projectlombok:lombok")
 }
 
 application {
     mainClass.set( "com.michelin.ns4kafka.Application")
 }
 
 java {
-    sourceCompatibility = JavaVersion.toVersion('11')
-    targetCompatibility = JavaVersion.toVersion('11')
+    sourceCompatibility = JavaVersion.toVersion('17')
+    targetCompatibility = JavaVersion.toVersion('17')
 }
 
 run {
-    //environment( "MICRONAUT_ENVIRONMENTS","dev")
+    //environment("MICRONAUT_ENVIRONMENTS","dev")
 }
 
 micronaut {
@@ -62,14 +69,17 @@ micronaut {
     }
 }
 
+dockerfile {
+    baseImage = "eclipse-temurin:17-jre-alpine"
+}
+
 dockerBuild {
     images = ["michelin/ns4kafka:"+version]
 }
 
 tasks.withType(JavaCompile) {
     options.fork = true
     options.forkOptions.jvmArgs << '-Dmicronaut.openapi.views.spec=rapidoc.enabled=true'
-
 }
 
 sonarqube {

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-micronautVersion=2.5.9
+micronautVersion=3.8.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Apr 06 16:48:19 CEST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip