Merge pull request #81 from conorheffron/bot-upgrade

JDK & Gradle Upgrade

Author: conorheffron

.github/workflows/codacy.yml

@@ -15,10 +15,10 @@ name: Codacy Security Scan
 
 on:
   push:
-    branches: [ "dev", "release" ]
+    branches: [ "main" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "dev" ]
+    branches: [ "main" ]
   schedule:
     - cron: '15 13 * * 5'
 

.github/workflows/docker-image.yml

@@ -2,9 +2,9 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "dev" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "dev" ]
+    branches: [ "main" ]
 
 jobs:
 

.github/workflows/gradle.yml

@@ -9,9 +9,9 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ "dev", "release" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "dev", "release" ]
+    branches: [ "main" ]
 
 jobs:
   build:
@@ -22,20 +22,20 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'temurin'
 
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
       with:
-        gradle-version: '4.7'
+        gradle-version: '7.3'
         dependency-graph: download-and-submit
         cache-disabled: true
 
-    - name: Build with Gradle 4.7
+    - name: Build with Gradle 7.3
       run: gradle build
 
   dependency-submission:
@@ -46,9 +46,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'temurin'
-        gradle-version: 4.7
+        gradle-version: 7.3

build.gradle

@@ -3,25 +3,23 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.22.RELEASE")
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:3.2.4")
         classpath('se.transmode.gradle:gradle-docker:1.2')
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
-apply plugin: 'org.springframework.boot'
 apply plugin: 'docker'
 apply plugin: 'war'
-apply plugin: 'maven'
 
 group = 'conorheffron'
-version = '2.4.0'
+version = '3.1.0'
 description = "Sample Data Manager"
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 tasks.withType(JavaCompile) {
 	options.encoding = 'UTF-8'
 }
@@ -32,24 +30,22 @@ repositories {
 
 dependencies {
     implementation group: 'org.springframework.boot', name: 'spring-boot-maven-plugin', version: '3.2.4'
-    compile group: 'com.rabbitmq', name: 'amqp-client', version:'5.21.0'
-    compile group: 'io.searchbox', name: 'jest', version:'6.3.1'
-    compile group: 'org.elasticsearch', name: 'elasticsearch', version:'8.13.2'
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:'1.5.22.RELEASE'
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version:'1.5.22.RELEASE'
-    compile group: 'mysql', name: 'mysql-connector-java', version:'8.0.33'
-    compile group: 'com.sparkpost', name: 'sparkpost-lib', version:'0.27'
-    compile group: 'com.h2database', name: 'h2', version:'2.2.224'
-    compile group: 'org.apache.maven.reporting', name: 'maven-reporting-api', version:'3.1.1'
-    compile group: 'org.jacoco', name: 'jacoco-maven-plugin', version:'0.8.12'
- 
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version:'3.2.4'
-    compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version:'10.1.20'
-    // compile group: 'javax.servlet', name: 'jstl', version:'1.2'
-    compile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
+    implementation group: 'com.rabbitmq', name: 'amqp-client', version: '5.18.0'
+    implementation group: 'io.searchbox', name: 'jest', version:'6.3.1'
+    implementation group: 'org.elasticsearch', name: 'elasticsearch', version:'8.13.2'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:'1.5.22.RELEASE'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version:'1.5.22.RELEASE'
+    implementation group: 'mysql', name: 'mysql-connector-java', version:'8.0.33'
+    implementation group: 'com.sparkpost', name: 'sparkpost-lib', version:'0.27'
+    implementation group: 'com.h2database', name: 'h2', version:'2.2.224'
+    implementation group: 'org.apache.maven.reporting', name: 'maven-reporting-api', version:'3.1.1'
+    implementation group: 'org.jacoco', name: 'jacoco-maven-plugin', version:'0.8.12'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version:'3.2.4'
+    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version:'10.1.20'
+    implementation group: 'javax.servlet', name: 'servlet-api', version: '2.5'
 
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
-    testCompile(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'3.2.4') {
+    testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'3.2.4') {
 		exclude(module: 'commons-logging')
     }
 }