Skip to content

Commit

Permalink
chore: remove commented Spring 2.7 code and switch all yamls to JDK17
Browse files Browse the repository at this point in the history
Signed-off-by: rnd4you <rnd4u.org@gmail.com>
  • Loading branch information
rnd4you committed Jan 4, 2024
1 parent ef7416b commit 0e75e35
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 44 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ jobs:
uses: github/codeql-action/autobuild@012739e5082ff0c22ca6d6ab32e07c36df03c4a4

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4

- name: Build Java
run: mvn -B -DskipTests -Pcompile-jdk17 clean install --file pom.xml
4 changes: 2 additions & 2 deletions .github/workflows/findbugs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
egress-policy: audit

- uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Build with Maven
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: maven

Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
- name: Publish package
run: mvn --batch-mode deploy
Expand Down
11 changes: 3 additions & 8 deletions src/main/java/com/lpvs/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,9 @@
import java.io.IOException;
import java.nio.charset.StandardCharsets;

//import javax.servlet.ServletException; // Spring 2.7
import jakarta.servlet.ServletException; // Spring 3.2

//import javax.servlet.http.HttpServletRequest; // Spring 2.7
import jakarta.servlet.http.HttpServletRequest; // Spring 3.2

//import javax.servlet.http.HttpServletResponse; // Spring 2.7
import jakarta.servlet.http.HttpServletResponse; // Spring 3.2
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
import java.util.Optional;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;

//import javax.annotation.PostConstruct; // Spring 2.7
import jakarta.annotation.PostConstruct; // Spring 3.2
import jakarta.annotation.PostConstruct;

/**
* Controller class for handling GitHub webhook events.
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/lpvs/entity/LPVSDetectedLicense.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
import lombok.Getter;
import lombok.Setter;

//import javax.persistence.*; // Spring 2.7
import jakarta.persistence.*; // Spring 3.2
import jakarta.persistence.*;
import java.io.Serializable;

/**
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/lpvs/entity/LPVSLicense.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
import lombok.NoArgsConstructor;
import lombok.Setter;

//import javax.persistence.*; // Spring 2.7
import jakarta.persistence.*; // Spring 3.2
import jakarta.persistence.*;
import java.io.Serializable;

/**
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/lpvs/entity/LPVSLicenseConflict.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
import lombok.NoArgsConstructor;
import lombok.Setter;

//import javax.persistence.*; // Spring 2.7
import jakarta.persistence.*; // Spring 3.2
import jakarta.persistence.*;
import java.io.Serializable;

/**
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/lpvs/entity/LPVSPullRequest.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
import lombok.NoArgsConstructor;
import lombok.Setter;

//import javax.persistence.*; // Spring 2.7
import jakarta.persistence.*; // Spring 3.2
import jakarta.persistence.*;
import java.io.Serializable;
import java.util.Date;
import java.util.Objects;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/lpvs/entity/auth/LPVSMember.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.DynamicUpdate;

//import javax.persistence.*; // Spring 2.7
import jakarta.persistence.*; // Spring 3.2
import jakarta.persistence.*;

/**
* Represents a member in the LPVS system.
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/lpvs/service/LPVSDetectService.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.springframework.web.util.HtmlUtils;

//import javax.annotation.PostConstruct; // Spring 2.7
import jakarta.annotation.PostConstruct; // Spring 3.2
import jakarta.annotation.PostConstruct;


import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

//import javax.annotation.PostConstruct; // Spring 2.7
import jakarta.annotation.PostConstruct; // Spring 3.2
import jakarta.annotation.PostConstruct;
import java.io.IOException;
import java.util.Optional;

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/lpvs/service/LPVSLicenseService.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
//import javax.annotation.PostConstruct; // Spring 2.7
import jakarta.annotation.PostConstruct; // Spring 3.2
import jakarta.annotation.PostConstruct;

import java.util.*;

Expand Down
12 changes: 3 additions & 9 deletions src/test/java/com/lpvs/config/SecurityConfigTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,9 @@
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;

//import javax.servlet.ServletException; // Spring 2.7
import jakarta.servlet.ServletException; // Spring 3.2

//import javax.servlet.http.HttpServletRequest; // Spring 2.7
import jakarta.servlet.http.HttpServletRequest; // Spring 3.2

//import javax.servlet.http.HttpServletResponse; // Spring 2.7
import jakarta.servlet.http.HttpServletResponse; // Spring 3.2

import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
Expand Down

0 comments on commit 0e75e35

Please sign in to comment.