Skip to content

Commit 1ec56c9

Browse files
build: upgrade to java 17 and update CI workflows (#496)
* build: upgrade to java 17 and update CI workflows * build: upgrade gradle wrapper to 7.6.4 * build: upgrade gradle wrapper to 8.5 * plugin-fixes * Update gradle.yml Trying to fix CI --------- Co-authored-by: Karan Preet Singh Sasan <preetkaran20@gmail.com>
1 parent eeaab26 commit 1ec56c9

29 files changed

+281
-181
lines changed

.github/workflows/gradle.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# This workflow will build a Java project with Gradle
2-
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
3-
41
name: Java CI with Gradle
52

63
on:
@@ -11,20 +8,26 @@ on:
118

129
jobs:
1310
build:
14-
1511
runs-on: ubuntu-latest
1612

1713
steps:
18-
- uses: actions/checkout@v2
19-
- name: Set up JDK 1.8
20-
uses: actions/setup-java@v1
21-
with:
22-
java-version: 1.8
23-
- name: Grant execute permission for gradlew
24-
run: chmod +x gradlew
25-
- name: Build with Gradle
26-
run: ./gradlew build
27-
- name: Upload coverage reports to Codecov
28-
uses: codecov/codecov-action@v3
29-
env:
30-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
14+
- name: Checkout repository
15+
uses: actions/checkout@v4
16+
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v4
19+
with:
20+
distribution: temurin
21+
java-version: '17'
22+
cache: gradle
23+
24+
- name: Grant execute permission for gradlew
25+
run: chmod +x gradlew
26+
27+
- name: Build with Gradle
28+
run: ./gradlew clean build --no-daemon
29+
30+
- name: Upload coverage reports to Codecov
31+
uses: codecov/codecov-action@v4
32+
with:
33+
token: ${{ secrets.CODECOV_TOKEN }}

build.gradle

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
}
5-
dependencies {
6-
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.4.5")
7-
}
8-
}
9-
101
//Community Plugins
112
plugins {
12-
id("com.diffplug.spotless") version "5.6.1"
13-
id("com.google.cloud.tools.jib") version "3.3.1"
14-
id("org.sonarqube") version "3.3"
15-
id("jacoco")
3+
id 'org.springframework.boot' version '2.7.18'
4+
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
5+
id 'java'
6+
id 'eclipse'
7+
id 'idea'
8+
id 'com.diffplug.spotless' version '6.25.0'
9+
id 'com.google.cloud.tools.jib' version '3.3.1'
10+
id 'org.sonarqube' version '3.3'
11+
id 'jacoco'
1612
}
1713

18-
apply plugin: 'java'
19-
apply plugin: 'eclipse'
20-
apply plugin: 'idea'
21-
apply plugin: 'org.springframework.boot'
22-
apply plugin: 'io.spring.dependency-management'
23-
2414
bootJar {
2515
baseName = 'VulnerableApp'
2616
version = '1.0.0'
@@ -34,7 +24,6 @@ configurations {
3424

3525
repositories {
3626
mavenCentral()
37-
gradlePluginPortal()
3827
mavenLocal()
3928
}
4029

@@ -43,19 +32,19 @@ sonarqube {
4332
property "sonar.projectKey", "SasanLabs_VulnerableApp"
4433
property "sonar.organization", "sasanlabs"
4534
property "sonar.host.url", "https://sonarcloud.io"
46-
property 'sonar.java.source', '1.8'
47-
property 'sonar.java.target', '1.8'
35+
property 'sonar.java.source', '17'
36+
property 'sonar.java.target', '17'
4837
}
4938
}
5039

51-
sourceCompatibility = 1.8
52-
targetCompatibility = 1.8
40+
sourceCompatibility = 17
41+
targetCompatibility = 17
5342

5443
spotless {
5544
java {
5645
// Don't enforce the license, just the format.
5746
clearSteps()
58-
googleJavaFormat().aosp()
47+
googleJavaFormat('1.17.0').aosp()
5948
}
6049
format 'javascript', {
6150
target 'src/main/resources/**/*.js'
@@ -73,7 +62,7 @@ jib {
7362
logger.info("JIB: Enabling Multi-Platform Images")
7463

7564
from {
76-
image = 'amazoncorretto:8'
65+
image = 'amazoncorretto:17'
7766
platforms {
7867
platform {
7968
architecture = 'amd64'
@@ -89,7 +78,7 @@ jib {
8978
}
9079

9180
jacoco {
92-
toolVersion = "0.8.5"
81+
toolVersion = "0.8.11"
9382
reportsDir = file("$buildDir/jacoco")
9483
}
9584

@@ -128,9 +117,12 @@ dependencies {
128117
testImplementation 'org.springframework.boot:spring-boot-starter-test'
129118

130119
// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-jpa
131-
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version: '2.3.1.RELEASE'
120+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
121+
122+
implementation 'javax.xml.bind:jaxb-api:2.3.1'
123+
implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
132124

133-
runtimeOnly group:'com.h2database', name:'h2', version: '1.3.176'
125+
runtimeOnly group:'com.h2database', name:'h2'
134126

135127
// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
136128
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.8'

gradle/wrapper/gradle-wrapper.jar

2.36 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)