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.

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

ALFREDOPS-851 upgrade used Java version to 17 to fix sonarcloud warning #155

Merged
merged 3 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Test
uses: gradle/gradle-build-action@v2
with:
Expand All @@ -39,11 +39,11 @@ jobs:
version: [ "61", "62", "70", "71", "72", "73","74" ]
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Login to Docker
env:
DOCKER_HUB_USER: ${{ secrets.XENIT_DOCKER_REGISTRY_USERNAME }}
Expand All @@ -70,11 +70,11 @@ jobs:
if: ${{ startsWith(github.ref, 'refs/heads/master') || startswith(github.ref, 'refs/heads/release') }}
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Publish
env:
ORG_GRADLE_PROJECT_sonatype_username: ${{ secrets.SONATYPE_S01_USERNAME }}
Expand Down
1 change: 1 addition & 0 deletions alfred-telemetry-platform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ dependencies {
testImplementation "org.hamcrest:hamcrest-all:${hamcrestVersion}"
testImplementation "org.awaitility:awaitility:${awaitilityVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"
testImplementation "net.bytebuddy:byte-buddy:${byteBuddyVersion}"
todorinskiz marked this conversation as resolved.
Show resolved Hide resolved
testRuntimeOnly 'org.alfresco:alfresco-remote-api'
}

Expand Down
12 changes: 10 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ allprojects {
apply plugin: 'java'
apply plugin: 'jacoco'

compileJava {
options.release = 11
}
compileTestJava {
options.release = 11
}

jacocoTestReport {
reports {
xml.enabled true
Expand All @@ -39,10 +46,11 @@ allprojects {
jvmExtrasVersion = '0.1.2'

junitJupiterVersion = '5.4.2'
mockitoVersion = '2.27.0'
mockitoVersion = '4.5.1'
byteBuddyVersion = '1.14.6'
hamcrestVersion = '1.3'
awaitilityVersion = '4.1.0'
restAssuredVersion = '4.0.0'
restAssuredVersion = '5.3.0'
}


Expand Down
4 changes: 0 additions & 4 deletions integration-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ ext {
extraDependencies = []
}

java {
sourceCompatibility = JavaVersion.VERSION_11
}

dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static void initializeRestAssured() {

final String baseURI = "https://" + System.getProperty("solr.host", "localhost");
RestAssured.baseURI = baseURI;
int port = Integer.parseInt(System.getProperty("solr.tcp.8443", "8443"));
int port = Integer.parseInt(System.getProperty("solr.tcp.8443", "8444"));
todorinskiz marked this conversation as resolved.
Show resolved Hide resolved
RestAssured.port = port;
final String solrFlavor = System.getProperty("solrFlavor","/solr");
final String basePath = ("solr4".equals(solrFlavor))? "/solr4" : "/solr";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ services:
- DEBUG=true
- JMX_ENABLED=true
ports:
- "8444:8443"
todorinskiz marked this conversation as resolved.
Show resolved Hide resolved
- target: 8443
mode: host
# - target: 8080
Expand Down
Loading