jooby-cli: sync with latest 4.0

- fix #3745
- fix #3744
- templates clean up

Author: jknack

modules/jooby-cli/pom.xml

@@ -112,6 +112,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${maven-compiler-plugin.version}</version>
+        <inherited>false</inherited>
         <configuration>
           <annotationProcessorPaths>
             <path>
@@ -123,6 +124,9 @@
           <compilerArgs>
             <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
           </compilerArgs>
+          <source>17</source>
+          <target>17</target>
+          <release>17</release>
         </configuration>
       </plugin>
       <plugin>

modules/jooby-cli/src/main/java/io/jooby/cli/CreateCmd.java

@@ -345,7 +345,7 @@ private List<Dependency> testDependencies(Map<String, String> dependencyMap, boo
             "org.junit.jupiter", "junit-jupiter-engine", dependencyMap.get("junitVersion")));
     dependencies.add(new Dependency("io.jooby", "jooby-test", null));
     dependencies.add(
-        new Dependency("com.squareup.okhttp3", "okhttp", dependencyMap.get("okhttpVersion")));
+        new Dependency("com.squareup.okhttp3", "okhttp-jvm", dependencyMap.get("okhttpVersion")));
     return dependencies;
   }
 }

modules/jooby-cli/src/main/resources/cli/build.gradle.hbs

@@ -18,7 +18,7 @@ plugins {
 group "{{groupId}}"
 version "{{version}}"
 mainClassName = "{{package}}.App"
-sourceCompatibility = 17
+sourceCompatibility = 21
 
 repositories {
   mavenLocal()

modules/jooby-cli/src/main/resources/cli/build.gradle.kts.hbs

@@ -43,12 +43,12 @@ dependencies {
 
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("io.jooby:jooby-test")
-    testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
+    testImplementation("com.squareup.okhttp3:okhttp-jvm:5.1.0")
 }
 
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 
     compilerOptions {
         javaParameters = true
@@ -59,8 +59,8 @@ tasks {
 {{#if kapt}}
     kapt {
       arguments {
-        arg("jooby.incremental", true)
-        arg("jooby.debug", false)
+        arg("jooby.incremental", "true")
+        arg("jooby.debug", "false")
       }
     }
 {{/if}}

modules/jooby-cli/src/main/resources/cli/gradle.properties.hbs

@@ -1,3 +1,3 @@
-javaVersion=17
+javaVersion=21
 {{#if kotlin}}systemProp.kotlinVersion={{kotlinVersion}}{{/if}}
 systemProp.joobyVersion={{joobyVersion}}

modules/jooby-cli/src/main/resources/cli/pom.xml.hbs

@@ -21,8 +21,8 @@
     <kotlin.version>{{kotlinVersion}}</kotlin.version>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     {{/if}}
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <maven.compiler.parameters>true</maven.compiler.parameters>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -32,16 +32,20 @@
     <dependency>
       <groupId>{{groupId}}</groupId>
       <artifactId>{{artifactId}}</artifactId>
-      {{#if version}}<version>{{version}}</version>{{/if}}
+      {{~#if version~}}<version>{{version}}</version>{{~/if}}
     </dependency>
   {{/each}}
     <!-- Tests -->
   {{#each testDependencies}}
     <dependency>
       <groupId>{{groupId}}</groupId>
       <artifactId>{{artifactId}}</artifactId>
-      {{#if version}}<version>{{version}}</version>{{/if}}
+      {{#if version}}
+      <version>{{version}}</version>
       <scope>test</scope>
+      {{else}}
+      <scope>test</scope>
+      {{/if}}
     </dependency>
   {{/each}}
   </dependencies>
@@ -130,9 +134,6 @@
             <compilerArg>
               -Ajooby.debug=false
             </compilerArg>
-            <compilerArg>
-              -Ajooby.services=true
-            </compilerArg>
           </compilerArgs>
         </configuration>
       {{/if}}