diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ae3bea61..71372c27 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 8 + java-version: 17 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - name: Unit Test with Gradle @@ -26,7 +26,7 @@ jobs: - name: Export Integration Test Summary run: cat integration-test/build/test-results/report.md >> $GITHUB_STEP_SUMMARY - name: Merge Jacoco - run: ./gradlew jacocoTestReport + run: ./gradlew :jacocoTestReport - name: Generate JaCoCo Badge uses: cicirello/jacoco-badge-generator@v2 with: diff --git a/build.gradle b/build.gradle index 1fd60a5e..14f77d20 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ -plugins { - id 'java' - id 'idea' - id 'jacoco' -} +allprojects { + apply(plugin: 'java') + apply(plugin: 'idea') + apply(plugin: 'jacoco') -repositories { - mavenCentral() + repositories { + mavenCentral() + } } idea { diff --git a/generator/build.gradle b/generator/build.gradle index 3c0d82b6..83631287 100644 --- a/generator/build.gradle +++ b/generator/build.gradle @@ -1,12 +1,11 @@ plugins { - id "java" - id 'idea' - id "jacoco" id "io.freefair.lombok" version "8.11" } -repositories { - mavenCentral() +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } group = 'com.reajason.javaweb.memsell' @@ -52,4 +51,5 @@ dependencies { testImplementation platform('org.junit:junit-bom:5.11.3') testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } \ No newline at end of file diff --git a/integration-test/build.gradle b/integration-test/build.gradle index 4f8e9776..899585fb 100644 --- a/integration-test/build.gradle +++ b/integration-test/build.gradle @@ -1,12 +1,11 @@ plugins { - id "java" - id "jacoco" - id 'idea' id "io.freefair.lombok" version "8.11" } -repositories { - mavenCentral() +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } group = 'com.reajason.javaweb' @@ -21,6 +20,7 @@ dependencies { testImplementation 'org.testcontainers:testcontainers:1.20.4' testImplementation 'org.testcontainers:junit-jupiter:1.20.4' testImplementation platform('org.junit:junit-bom:5.11.3') + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.junit.platform:junit-platform-reporting:1.11.3' } diff --git a/vul-webapp-jakarta/build.gradle b/vul-webapp-jakarta/build.gradle index 33a92aed..4988cc74 100644 --- a/vul-webapp-jakarta/build.gradle +++ b/vul-webapp-jakarta/build.gradle @@ -5,8 +5,12 @@ plugins { group = 'com.reajason.javaweb.vul' version = '' -repositories { - mavenCentral() +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } dependencies { diff --git a/vul-webapp/build.gradle b/vul-webapp/build.gradle index 286f204f..b4e91f83 100644 --- a/vul-webapp/build.gradle +++ b/vul-webapp/build.gradle @@ -5,11 +5,10 @@ plugins { group = 'com.reajason.javaweb.vul' version = '' -repositories { - mavenCentral() -} - java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } sourceCompatibility = JavaVersion.VERSION_1_6 targetCompatibility = JavaVersion.VERSION_1_6 }