Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gradle deprecation fixes testing #930

Merged
merged 6 commits into from
Jan 31, 2025
Merged

gradle deprecation fixes testing #930

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
febda08
gradle deprecation fixes testing
arunvenmany-ibm Jan 22, 2025
80ad8f2
some more fixes
arunvenmany-ibm Jan 22, 2025
2261a54
more changes for javaConventions
arunvenmany-ibm Jan 23, 2025
c44a9e3
changed to use upload artifact v4
arunvenmany-ibm Jan 24, 2025
75d0c16
more changes to support multiple loose ear pages
arunvenmany-ibm Jan 24, 2025
8b0c0a3
rolling back java extension related changes
arunvenmany-ibm Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
working-directory: build/reports/tests
env:
BUILD_REPORTS_PATH: /buildReports/${{runner.os}}/java${{matrix.java}}/${{matrix.RUNTIME}}-${{matrix.RUNTIME_VERSION}}/
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ failure() }}
with:
name: buildReportsArtifactLinux
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
if: ${{ failure() }}
working-directory: C:/ci.gradle
run: cp -r build/reports/tests/test D:/buildReports/${{runner.os}}/java${{matrix.java}}/${{matrix.RUNTIME}}-${{matrix.RUNTIME_VERSION}}/
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ failure() }}
with:
name: buildReportsArtifactWindows
Expand Down
6 changes: 3 additions & 3 deletions src/main/groovy/io/openliberty/tools/gradle/tasks/CompileJSPTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ class CompileJSPTask extends AbstractFeatureTask {
}
}

if (project.hasProperty('sourceCompatibility')) {
if (project.getExtensions().getByName('java').hasProperty("sourceCompatibility")) {
logger.info("Found sourceCompatibility")
compile.setSource((String) project.getProperties().get('sourceCompatibility'))
}
compile.setSource((String) project.getExtensions().getByName('java').getProperties().get('sourceCompatibility'))
cherylking marked this conversation as resolved.
Show resolved Hide resolved
}
}

private void setJspVersion(CompileJSPs compile, Set<String> installedFeatures) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/app-configuration-include-test/test-maven-war/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ group = 'test'
version = '1.0-SNAPSHOT'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

tasks.withType(JavaCompile) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/app-configuration-m2-default-test/test-maven-war/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ group = 'test'
version = '1.0-SNAPSHOT'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

tasks.withType(JavaCompile) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/app-configuration-m2-test/test-maven-war/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ group = 'test'
version = '1.0-SNAPSHOT'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

tasks.withType(JavaCompile) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/arquillian-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ allprojects {
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/dev-test/basic-dev-project/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apply plugin: "liberty"
apply plugin: "war"

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/dev-test/dev-container/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apply plugin: "liberty"
apply plugin: "war"

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/dev-test/dev-skip-feature-install/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apply plugin: "liberty"
apply plugin: "war"

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/dev-test/dev-skip-feature-install/buildInstallLiberty.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apply plugin: "liberty"
apply plugin: "war"

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/generate-features-test/basic-dev-project/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apply plugin: "liberty"
apply plugin: "war"

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/generate-features-test/restful/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apply plugin: "liberty"
apply plugin: "war"

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/liberty-package-test/liberty-package-looseApplication.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/loose-ear-earlibs-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ subprojects {
apply plugin: 'java'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/loose-ear-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ subprojects {
apply plugin: 'java'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/loose-war-with-loose-jar/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ subprojects {
apply plugin: 'java'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
Expand Down
5 changes: 3 additions & 2 deletions src/test/resources/multi-module-loose-ear-pages-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ allprojects {
subprojects {
apply plugin: 'java'

sourceCompatibility = 8
targetCompatibility = 8

tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

repositories {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/multi-module-loose-ear-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ allprojects {
subprojects {
apply plugin: 'java'
java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet-noWebAppConfig/getAppNamesFromConfigTest.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet-noWebAppConfig/testAppListsWithObjects.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions ...test/resources/sample.servlet-noWebAppConfig/testWarTasksWithDifferentDependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet-noWebAppConfig/verifyTimeoutSuccessListsOfAppsTest.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/TestStripVersion.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testAppConfig.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testAppConfigFail.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testAppendServerEnvWithConfigServerEnv.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testAppendServerEnvWithEnvProps.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testAppendServerEnvWithNoEnvProps.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testAppendServerEnvWithOnlyEnvProps.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testConfigDropinsApp.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testEtcOutputDir.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testLooseApplication.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
cherylking marked this conversation as resolved.
Show resolved Hide resolved
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testLooseApplicationWithWarTask.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testOutputDirs.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/sample.servlet/testPluginConfigFile.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ apply plugin: 'war'
apply plugin: 'liberty'

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

compileJava.options.encoding = 'UTF-8'
Expand Down
Loading
Loading