#813 - java, spring and gradle version updated

avniproject · Oct 30, 2024 · d596e83 · d596e83
1 parent 294dddb
commit d596e83
Show file tree

Hide file tree

Showing 92 changed files with 138 additions and 151 deletions.
diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-1.8
+21.0
diff --git a/avni-server-api/build.gradle b/avni-server-api/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '2.0.0.RELEASE'
+        springBootVersion = '3.3.5'
         osPackageVersion = "6.2.1"
     }
     repositories { mavenCentral() }
@@ -12,64 +12,65 @@ buildscript {
 
 plugins {
     id 'org.springframework.boot' version "${springBootVersion}"
-    id 'io.spring.dependency-management' version '1.0.8.RELEASE'
-    id "nebula.ospackage" version "6.2.1"
+    id 'io.spring.dependency-management' version '1.1.6'
+    id "com.netflix.nebula.ospackage" version "11.10.0"
     id 'java'
 }
 
-ext { springBootVersion = '2.0.0.RELEASE' }
+ext { springBootVersion = '3.3.5' }
 //todo: Remove when upgrading Spring version. This was introduced to use SameSiteCookies
-ext['tomcat.version'] = '9.0.80'
+//ext['tomcat.version'] = '9.0.80'
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'idea'
 apply from: 'rpm.gradle'
 apply plugin: 'io.spring.dependency-management'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 repositories { mavenCentral() }
 
-bootJar {
-    baseName = "avni-server"
-    version = "0.0.1-SNAPSHOT"
-    mainClassName = 'org.avni.Avni'
-}
+//bootJar {
+//    mainClassName = 'org.avni.Avni'
+//}
 
 configurations {
     dev
     all*.exclude group: 'org.slf4j', module: 'slf4j-simple'
 }
 
 dependencies {
-    compile group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '8.5.46'
-    compile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}")
-    compile "org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}"
-    testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
-    compile "org.springframework.boot:spring-boot-starter-data-rest:${springBootVersion}"
-    compile("org.springframework.boot:spring-boot-starter-security:${springBootVersion}")
+    implementation group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '8.5.46'
+    implementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}")
+    implementation "org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}"
+    testImplementation "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
+    implementation "org.springframework.boot:spring-boot-starter-data-rest:${springBootVersion}"
+    implementation("org.springframework.boot:spring-boot-starter-security:${springBootVersion}")
     testImplementation "com.github.tomakehurst:wiremock-jre8-standalone:2.34.0"
-    compile "org.postgresql:postgresql:9.4-1200-jdbc41"
+    implementation "org.postgresql:postgresql:9.4-1200-jdbc41"
     implementation 'org.springframework.boot:spring-boot-starter-batch'
     testImplementation 'org.springframework.batch:spring-batch-test'
-    compile "joda-time:joda-time:2.9.4"
-    compile group: 'org.jadira.usertype', name: 'usertype.core', version: '6.0.1.GA'
-    compile "org.flywaydb:flyway-core:4.0.3"
-    compile "org.flywaydb.flyway-test-extensions:flyway-spring-test:4.0"
-    compile "com.zaxxer:HikariCP:2.5.1"
-    compile "org.apache.poi:poi:3.16-beta2"
-    compile "org.apache.poi:poi-ooxml:3.16-beta2"
-    compile 'org.apache.httpcomponents:httpclient:4.5.9'
-    compile 'com.auth0:jwks-rsa:0.3.0'
-    compile 'com.auth0:java-jwt:3.3.0'
-    compile group: 'org.hibernate', name: 'hibernate-search-orm', version: '5.9.2.Final'
-    compile 'com.bugsnag:bugsnag:3.+'
-    compile 'com.amazonaws:aws-java-sdk-s3'
-    compile 'com.amazonaws:aws-java-sdk-cognitoidp'
-    compile 'commons-validator:commons-validator:1.4.1'
-    compile 'org.passay:passay:1.6.3'
+    implementation "joda-time:joda-time:2.9.4"
+    implementation group: 'org.jadira.usertype', name: 'usertype.core', version: '6.0.1.GA'
+    implementation "org.flywaydb:flyway-core:4.0.3"
+    implementation "org.flywaydb.flyway-test-extensions:flyway-spring-test:4.0"
+    implementation "com.zaxxer:HikariCP:2.5.1"
+    implementation "org.apache.poi:poi:3.16-beta2"
+    implementation "org.apache.poi:poi-ooxml:3.16-beta2"
+    implementation 'org.apache.httpcomponents:httpclient:4.5.9'
+    implementation 'com.auth0:jwks-rsa:0.3.0'
+    implementation 'com.auth0:java-jwt:3.3.0'
+    implementation group: 'org.hibernate', name: 'hibernate-search-orm', version: '5.9.2.Final'
+    implementation 'com.bugsnag:bugsnag:3.+'
+    implementation 'com.amazonaws:aws-java-sdk-s3'
+    implementation 'com.amazonaws:aws-java-sdk-cognitoidp'
+    implementation 'commons-validator:commons-validator:1.4.1'
+    implementation 'org.passay:passay:1.6.3'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'org.keycloak:keycloak-spring-boot-starter:21.0.2'
     implementation 'org.keycloak:keycloak-admin-client:21.0.2'
@@ -81,17 +82,18 @@ dependencies {
     implementation 'org.hibernate:hibernate-ehcache:5.2.14.Final'
     implementation 'javax.cache:cache-api:1.1.1'
     dev "org.springframework.boot:spring-boot-devtools:${springBootVersion}"
-    testCompile "org.mockito:mockito-core:2.23.4"
-    testCompile 'org.powermock:powermock-core:2.0.9'
-    testCompile 'org.powermock:powermock-api-mockito2:2.0.9'
-    testCompile 'org.powermock:powermock-module-junit4:2.0.9'
-    runtime("org.springframework.boot:spring-boot-properties-migrator")
+    testImplementation "org.mockito:mockito-core:2.23.4"
+    testImplementation 'org.powermock:powermock-core:2.0.9'
+    testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
+    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
+    runtimeOnly("org.springframework.boot:spring-boot-properties-migrator")
     implementation 'org.apache.tika:tika-core:2.7.0'
-    compile 'org.owasp.encoder:encoder:1.2.3'
+    implementation 'org.owasp.encoder:encoder:1.2.3'
     implementation 'org.apache.commons:commons-csv:1.10.0'
-    compile 'com.googlecode.libphonenumber:libphonenumber:8.12.32'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.32'
     testImplementation 'org.slf4j:slf4j-reload4j:2.0.6'
-    compile 'com.google.guava:guava:33.2.1-jre'
+    implementation 'com.google.guava:guava:33.2.1-jre'
+    implementation 'org.codehaus.jettison:jettison:1.5.4'
 }
 
 bootRun {

diff --git a/avni-server-api/rpm.gradle b/avni-server-api/rpm.gradle
@@ -1,10 +1,8 @@
 import groovy.json.JsonSlurper
 
-apply plugin: "nebula.ospackage"
-
+apply plugin: "com.netflix.nebula.ospackage"
 
 ospackage {
-
     packageName = 'avni-server'
     release = System.env.CIRCLE_BUILD_NUM ?: 0
     version = "${project.version.replace('-SNAPSHOT', '')}"
@@ -15,9 +13,8 @@ ospackage {
     signingKeyId("72845CB15D05862A")
     signingKeyPassphrase("$System.env.KEY_PASSWORD")
 
-
     conflicts("java-1.7.0-openjdk")
-    requires("java-1.8.0-openjdk")
+    requires("java-1.21.0-openjdk")
     preInstall file("${project.rootProject.rootDir}/infra/rpm/scripts/preInstall.sh")
     postInstall file("${project.rootProject.rootDir}/infra/rpm/scripts/postInstall.sh")
     preUninstall file("${project.rootProject.rootDir}/infra/rpm/scripts/preUninstall.sh")

diff --git a/avni-server-api/src/main/java/org/avni/messaging/domain/MessageReceiver.java b/avni-server-api/src/main/java/org/avni/messaging/domain/MessageReceiver.java
@@ -3,7 +3,7 @@
 import org.avni.server.domain.OrganisationAwareEntity;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "message_receiver")

diff --git a/avni-server-api/src/main/java/org/avni/messaging/domain/MessageRequest.java b/avni-server-api/src/main/java/org/avni/messaging/domain/MessageRequest.java
@@ -4,7 +4,7 @@
 import org.joda.time.DateTime;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "message_request_queue")

diff --git a/avni-server-api/src/main/java/org/avni/messaging/domain/MessageRule.java b/avni-server-api/src/main/java/org/avni/messaging/domain/MessageRule.java
@@ -3,7 +3,7 @@
 import org.avni.server.domain.OrganisationAwareEntity;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "message_rule")

diff --git a/avni-server-api/src/main/java/org/avni/server/application/DecisionConcept.java b/avni-server-api/src/main/java/org/avni/server/application/DecisionConcept.java
@@ -3,7 +3,7 @@
 import org.avni.server.domain.Concept;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "decision_concept")

diff --git a/avni-server-api/src/main/java/org/avni/server/application/Form.java b/avni-server-api/src/main/java/org/avni/server/application/Form.java
@@ -8,7 +8,7 @@
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 

diff --git a/avni-server-api/src/main/java/org/avni/server/application/FormElement.java b/avni-server-api/src/main/java/org/avni/server/application/FormElement.java
@@ -10,7 +10,7 @@
 import org.springframework.util.StringUtils;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;

diff --git a/avni-server-api/src/main/java/org/avni/server/application/FormElementGroup.java b/avni-server-api/src/main/java/org/avni/server/application/FormElementGroup.java
@@ -6,7 +6,7 @@
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

diff --git a/avni-server-api/src/main/java/org/avni/server/dao/AddressLevelTypeRepository.java b/avni-server-api/src/main/java/org/avni/server/dao/AddressLevelTypeRepository.java
@@ -8,7 +8,7 @@
 import org.springframework.data.rest.core.annotation.RestResource;
 import org.springframework.stereotype.Repository;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.Collection;
 import java.util.List;
 

diff --git a/avni-server-api/src/main/java/org/avni/server/dao/LocationRepository.java b/avni-server-api/src/main/java/org/avni/server/dao/LocationRepository.java
@@ -17,7 +17,7 @@
 import org.springframework.util.StringUtils;
 
 import javax.persistence.QueryHint;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.*;
 
 @Repository

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/AbstractEncounter.java b/avni-server-api/src/main/java/org/avni/server/domain/AbstractEncounter.java
@@ -7,7 +7,7 @@
 import org.joda.time.DateTime;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.Objects;
 
 @MappedSuperclass

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/AddressLevel.java b/avni-server-api/src/main/java/org/avni/server/domain/AddressLevel.java
@@ -10,7 +10,7 @@
 import org.springframework.data.rest.core.config.Projection;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/AddressLevelType.java b/avni-server-api/src/main/java/org/avni/server/domain/AddressLevelType.java
@@ -7,9 +7,8 @@
 import org.springframework.data.rest.core.config.Projection;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.PositiveOrZero;
+import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/ApprovalStatus.java b/avni-server-api/src/main/java/org/avni/server/domain/ApprovalStatus.java
@@ -4,7 +4,7 @@
 import org.hibernate.annotations.BatchSize;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import org.joda.time.DateTime;
 
 @Entity

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/CHSBaseEntity.java b/avni-server-api/src/main/java/org/avni/server/domain/CHSBaseEntity.java
@@ -1,9 +1,9 @@
 package org.avni.server.domain;
 
+import jakarta.validation.constraints.NotNull;
 import org.hibernate.proxy.HibernateProxyHelper;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.util.UUID;
 
 @MappedSuperclass

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/CHSEntity.java b/avni-server-api/src/main/java/org/avni/server/domain/CHSEntity.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotNull;
 import org.avni.server.framework.security.UserContextHolder;
 import org.joda.time.DateTime;
 import org.springframework.data.annotation.CreatedBy;
@@ -11,7 +12,6 @@
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @MappedSuperclass

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/Catchment.java b/avni-server-api/src/main/java/org/avni/server/domain/Catchment.java
@@ -4,7 +4,7 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.Set;
 

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/Checklist.java b/avni-server-api/src/main/java/org/avni/server/domain/Checklist.java
@@ -5,7 +5,7 @@
 import org.joda.time.DateTime;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/ChecklistDetail.java b/avni-server-api/src/main/java/org/avni/server/domain/ChecklistDetail.java
@@ -5,7 +5,7 @@
 import org.springframework.data.rest.core.config.Projection;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/ChecklistItem.java b/avni-server-api/src/main/java/org/avni/server/domain/ChecklistItem.java
@@ -6,7 +6,7 @@
 import org.joda.time.DateTime;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "checklist_item")

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/ChecklistItemDetail.java b/avni-server-api/src/main/java/org/avni/server/domain/ChecklistItemDetail.java
@@ -5,7 +5,7 @@
 import org.avni.server.application.Form;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "checklist_item_detail")

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/ChecklistItemStatus.java b/avni-server-api/src/main/java/org/avni/server/domain/ChecklistItemStatus.java
@@ -1,6 +1,6 @@
 package org.avni.server.domain;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/Comment.java b/avni-server-api/src/main/java/org/avni/server/domain/Comment.java
@@ -5,7 +5,7 @@
 import org.avni.server.util.S;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "comment")

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/CommentThread.java b/avni-server-api/src/main/java/org/avni/server/domain/CommentThread.java
@@ -6,7 +6,7 @@
 import org.joda.time.DateTime;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/Concept.java b/avni-server-api/src/main/java/org/avni/server/domain/Concept.java
@@ -11,7 +11,7 @@
 import org.avni.server.web.request.ConceptContract;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

diff --git a/avni-server-api/src/main/java/org/avni/server/domain/ConceptAnswer.java b/avni-server-api/src/main/java/org/avni/server/domain/ConceptAnswer.java
@@ -10,7 +10,7 @@
 import org.springframework.data.rest.core.config.Projection;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.Objects;
 
 @Entity