Skip to content

Commit

Permalink
feat: use java 17 as based version
Browse files Browse the repository at this point in the history
  • Loading branch information
piotrwielgolaski-tomtom committed Nov 4, 2024
1 parent 4ffa973 commit 73a8dee
Show file tree
Hide file tree
Showing 18 changed files with 256 additions and 204 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '8', '11', '17']
java: [ '17', '21']
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
- uses: gradle/gradle-build-action@v2
- uses: gradle/actions/setup-gradle@v3
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Cache Gradle packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Test with Gradle
run: ./gradlew clean build integrationTest
- name: Archive Reports
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: reports-${{ matrix.java }}
Expand Down
93 changes: 47 additions & 46 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath "com.github.jengelman.gradle.plugins:shadow:6.1.0"
classpath "com.github.johnrengelman:shadow:8.1.1"
classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
}
}
apply plugin: "io.github.gradle-nexus.publish-plugin"

allprojects {
if(project.hasProperty('releaseVersion')) {
if (project.hasProperty('releaseVersion')) {
version = project.releaseVersion
} else {
version = '1.0-SNAPSHOT'
Expand All @@ -44,32 +44,33 @@ nexusPublishing {
}

def projectDescriptions = [
'james-agent-common': 'A package that lets you write your own toolkits for James',
'james-controller-webservice-api': 'API for REST controller of James',
'james-agent-common' : 'A package that lets you write your own toolkits for James',
'james-controller-webservice-api' : 'API for REST controller of James',
'james-controller-webservice-client': 'Client for REST controller of James'
]

subprojects { prj ->
repositories {
mavenCentral()
mavenCentral()
}
apply plugin : 'java'
apply plugin: 'java'
sourceCompatibility = 17
if (!projectDescriptions.containsKey(prj.name)) {
apply plugin: 'com.github.johnrengelman.shadow'
}
ext.versions = [
groovy : '3.0.17',
guava : '32.1.2-jre',
jackson : '2.14.2',
snakeyaml : '2.0',
spock : '2.0-groovy-3.0',
objenesis : '3.2',
awaitility : '4.1.0',
javassist : '3.28.0-GA',
bytebuddytests: '1.11.1',
disruptor: '3.4.2',
groovy : '3.0.17',
guava : '32.1.2-jre',
jackson : '2.14.2',
snakeyaml : '2.0',
spock : '2.3-groovy-3.0',
objenesis : '3.2',
awaitility : '4.1.0',
javassist : '3.28.0-GA',
bytebuddytests : '1.15.9',
disruptor : '3.4.2',
log4j_stackutil: '2.17.1',
ecs_logging: '1.1.0'
ecs_logging : '1.1.0'
]
test.useJUnitPlatform()
}
Expand All @@ -84,43 +85,43 @@ configure(projectList) { Project confPrj ->
withJavadocJar()
withSourcesJar()
}
if(project.hasProperty('releaseVersion')) {
if (project.hasProperty('releaseVersion')) {
signing {
sign publishing.publications
sign publishing.publications
}
}
publishing {
publications {
sonatype(MavenPublication) {
from components.java
pom {
name = confPrj.name
packaging = 'jar'
description = projectDescriptions[confPrj.name]
url = 'https://github.com/tomtom-international/james'
publications {
sonatype(MavenPublication) {
from components.java
pom {
name = confPrj.name
packaging = 'jar'
description = projectDescriptions[confPrj.name]
url = 'https://github.com/tomtom-international/james'

scm {
connection = 'scm:git:https://github.com/tomtom-international/james.git'
developerConnection = 'scm:git:https://github.com/tomtom-international/james.git'
url = 'https://github.com/tomtom-international/james'
}
scm {
connection = 'scm:git:https://github.com/tomtom-international/james.git'
developerConnection = 'scm:git:https://github.com/tomtom-international/james.git'
url = 'https://github.com/tomtom-international/james'
}

licenses {
license {
name = 'The Apache License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0'
}
}
developers {
developer {
id = 'james'
name = 'James'
email = '[email protected]'
}
licenses {
license {
name = 'The Apache License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0'
}
}
developers {
developer {
id = 'james'
name = 'James'
email = '[email protected]'
}
}
}
}
}
}
}
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 73a8dee

Please sign in to comment.