Skip to content

Commit

Permalink
update to java 17, spring boot 3.1.5 and jakarta migration
Browse files Browse the repository at this point in the history
  • Loading branch information
alexey-lukashov committed Sep 21, 2024
1 parent b601dff commit 7e90af7
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 42 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
/.idea/
/build/
/out/

/vinz-clortho/build/
21 changes: 5 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ buildscript {

plugins {
id 'pl.allegro.tech.build.axion-release' version '1.13.3'
id 'org.springframework.boot' version '2.6.14' apply false
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'org.springframework.boot' version '3.1.5' apply false
id 'io.spring.dependency-management' version '1.1.3'
id 'idea'
id 'java'
id 'java-library'
Expand Down Expand Up @@ -43,8 +43,8 @@ scmVersion {

idea {
project {
jdkName = "11"
languageLevel = "11"
jdkName = "17"
languageLevel = "17"
}
}

Expand All @@ -58,7 +58,7 @@ subprojects {

group = 'zone.cogni.lib.vinz-clortho'
project.version = scmVersion.version
sourceCompatibility = '11'
sourceCompatibility = '17'

repositories {
if (project.hasProperty('jenkins-ci')) {
Expand All @@ -75,7 +75,6 @@ subprojects {
mavenCentral()
maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
maven { url "https://repo.spring.io/milestone" }
maven { url "https://archiva.cogni.zone/repository/public" }
}

dependencyManagement {
Expand Down Expand Up @@ -162,16 +161,6 @@ subprojects {
}
}
repositories {
if (project.hasProperty("publishToCognizoneArchiva")) {
maven {
credentials {
username = System.properties['archiva.username']
password = System.properties['archiva.password']
}
name = 'cognizone'
url = System.properties['archiva.url']
}
}
if (project.hasProperty("publishToCognizoneNexus")) {
maven {
credentials {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import lombok.RequiredArgsConstructor;
import org.apache.http.HttpEntity;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import jakarta.servlet.http.HttpServletRequest;
import java.io.InputStream;

@FunctionalInterface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.ReadListener;
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import lombok.Getter;
import lombok.RequiredArgsConstructor;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import jakarta.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.util.function.Supplier;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.AntPathMatcher;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.core.Ordered;

import javax.servlet.Filter;
import jakarta.servlet.Filter;
import java.util.Optional;

@SuppressWarnings("ClassHasNoToStringMethod")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
import org.springframework.http.HttpStatus;
import org.springframework.util.AntPathMatcher;

import javax.annotation.Nullable;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Nullable;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
Expand Down

0 comments on commit 7e90af7

Please sign in to comment.