Update "sample" Maven and Gradle projects

vojtechhabarta · Oct 2, 2022 · 31b458a · 31b458a
1 parent c98d7c9
commit 31b458a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 53 deletions.
diff --git a/sample-gradle-spring/build.gradle b/sample-gradle-spring/build.gradle
@@ -1,29 +1,19 @@
 
-apply plugin: 'java'
-apply plugin: 'cz.habarta.typescript-generator'
+plugins {
+    id 'java'
+    id 'cz.habarta.typescript-generator' version 'FILL_VERSION'
+}
 
-version = '2.0'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+version = '3.0'
+sourceCompatibility = 11
+targetCompatibility = 11
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-web:2.5.6'
-}
-
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'cz.habarta.typescript-generator:typescript-generator-gradle-plugin:FILL_VERSION'
-        classpath 'cz.habarta.typescript-generator:typescript-generator-spring:FILL_VERSION'
-    }
+    implementation 'org.springframework.boot:spring-boot-starter-web:2.7.4'
 }
 
 generateTypeScript {

diff --git a/sample-gradle/build.gradle b/sample-gradle/build.gradle
@@ -1,36 +1,31 @@
 
-apply plugin: 'java'
-apply plugin: 'groovy'
-apply plugin: 'kotlin'
-apply plugin: 'scala'
-apply plugin: 'cz.habarta.typescript-generator'
+buildscript {
+    dependencies {
+        classpath 'com.fasterxml.jackson.module:jackson-module-scala_2.13:2.13.4'
+    }
+}
 
-version = '2.0'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+plugins {
+    id 'java'
+    id 'groovy'
+    id "org.jetbrains.kotlin.jvm" version "1.4.32"
+    id 'scala'
+    id 'cz.habarta.typescript-generator' version 'FILL_VERSION'
+}
+
+version = '3.0'
+sourceCompatibility = 11
+targetCompatibility = 11
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.0'
-    implementation 'org.codehaus.groovy:groovy-all:3.0.9'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.5.32'
-    implementation 'org.scala-lang:scala-library:2.13.7'
-}
-
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'cz.habarta.typescript-generator:typescript-generator-gradle-plugin:FILL_VERSION'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.32'
-        classpath 'com.fasterxml.jackson.module:jackson-module-scala_2.13:2.13.0'
-    }
+    implementation 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.4'
+    implementation 'org.codehaus.groovy:groovy-all:3.0.13'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.32'
+    implementation 'org.scala-lang:scala-library:2.13.9'
 }
 
 generateTypeScript {

diff --git a/sample-maven-spring/pom.xml b/sample-maven-spring/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>cz.habarta.typescript-generator</groupId>
     <artifactId>sample-maven-spring</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>sample-maven-spring</name>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.5.12</version>
+            <version>2.7.4</version>
         </dependency>
     </dependencies>
 
@@ -25,10 +25,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                     <compilerArgs>
                         <arg>-parameters</arg>
                     </compilerArgs>

diff --git a/sample-maven/pom.xml b/sample-maven/pom.xml
@@ -4,15 +4,15 @@
 
     <groupId>cz.habarta.typescript-generator</groupId>
     <artifactId>sample-maven</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>sample-maven</name>
 
     <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.13.0</version>
+            <version>2.13.4</version>
         </dependency>
     </dependencies>
 
@@ -21,10 +21,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                     <compilerArgs>
                         <arg>-parameters</arg>
                     </compilerArgs>