diff --git a/.github/workflows/gradle-pr.yml b/.github/workflows/gradle-pr.yml index 14c155c..ca0aebc 100644 --- a/.github/workflows/gradle-pr.yml +++ b/.github/workflows/gradle-pr.yml @@ -5,33 +5,25 @@ name: Pull Request Java CI with Gradle on: [pull_request] -env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - -permissions: - packages: read - jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Cache Gradle packages - uses: actions/cache@v1 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build -Dbuild.number=$GITHUB_RUN_ID - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - buildNumber: ${{ github.run_number }} + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build -Dbuild.number=$GITHUB_RUN_ID diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml index 501c22d..85cb091 100644 --- a/.github/workflows/gradle-release.yml +++ b/.github/workflows/gradle-release.yml @@ -3,9 +3,6 @@ name: Release Java CI with Gradle -env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - on: # Trigger the workflow on push push: @@ -19,30 +16,29 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Cache Gradle packages - uses: actions/cache@v1 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew clean build -x test - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - buildNumber: ${{ github.run_number }} - - name: Publish Packages to Sonotype - run: ./gradlew -Pversion="${githubRef#refs/tags/}" -PbuildNumber="${buildNumber}" sign publishMavenPublicationToSonatypeRepository - env: - githubRef: ${{ github.ref }} - buildNumber: ${{ github.run_number }} - ORG_GRADLE_PROJECT_signingKey: ${{secrets.signingKey}} - ORG_GRADLE_PROJECT_signingPassword: ${{secrets.signingPassword}} - ORG_GRADLE_PROJECT_sonatypeUsername: ${{secrets.sonatypeUsername}} - ORG_GRADLE_PROJECT_sonatypePassword: ${{secrets.sonatypePassword}} + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew clean build -x test + - name: Publish Packages to Sonotype + run: ./gradlew -Pversion="${githubRef#refs/tags/}" -PbuildNumber="${buildNumber}" sign publishMavenPublicationToSonatypeRepository + env: + githubRef: ${{ github.ref }} + buildNumber: ${{ github.run_number }} + ORG_GRADLE_PROJECT_signingKey: ${{secrets.signingKey}} + ORG_GRADLE_PROJECT_signingPassword: ${{secrets.signingPassword}} + ORG_GRADLE_PROJECT_sonatypeUsername: ${{secrets.sonatypeUsername}} + ORG_GRADLE_PROJECT_sonatypePassword: ${{secrets.sonatypePassword}} + diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ece63d4..f14c3df 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -3,15 +3,9 @@ name: Java CI with Gradle -env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - -permissions: - packages: write - on: push: - branches: [ main ] + branches: [ master ] schedule: # * is a special character in YAML so you have to quote this string - cron: '0 6 * * *' @@ -21,21 +15,24 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Cache Gradle packages - uses: actions/cache@v1 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" build publishMavenPublicationToGitHubPackagesRepository --no-daemon --stacktrace - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - buildNumber: ${{ github.run_number }} + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" build publishMavenPublicationToGitHubPackagesRepository --no-daemon --stacktrace + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + buildNumber: ${{ github.run_number }} + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4b41779..db877dc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,8 @@ plugins { id 'com.jfrog.artifactory' version '4.21.0' apply false id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' + id 'maven-publish' } apply plugin: 'java-library' @@ -9,7 +11,7 @@ apply plugin: 'maven-publish' apply plugin: 'com.jfrog.artifactory' apply plugin: 'signing' -sourceCompatibility = '1.8' +sourceCompatibility = '17' repositories { if (version.endsWith('SNAPSHOT')) { @@ -63,32 +65,19 @@ dependencies { testImplementation'io.projectreactor:reactor-test' } -plugins.withType(JavaLibraryPlugin) { - task sourcesJar(type: Jar) { - classifier 'sources' - from sourceSets.main.allJava - } - - task javadocJar(type: Jar, dependsOn: javadoc) { - classifier 'javadoc' - from javadoc.destinationDir - } - plugins.withType(MavenPublishPlugin) { - publishing { - publications { - maven(MavenPublication) { - from components.java - artifact sourcesJar - artifact javadocJar - } - } +java { + withSourcesJar() + withJavadocJar() +} +publishing { + publications { + mavenJava(MavenPublication) { + from components.java } } } - - test { useJUnitPlatform() } diff --git a/gradle.properties b/gradle.properties index 162484f..608a758 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,11 +2,10 @@ group=io.rsocket.broker version=0.3.1-SNAPSHOT assertjVersion=3.21.0 -junitJupiterVersion=5.8.2 -mockitoVersion=3.12.4 +junitJupiterVersion=5.9.2 +mockitoVersion=5.2.0 reactorBomVersion=2020.0.13 -rsocketBrokerClientVersion=0.3.0-SNAPSHOT -rsocketVersion=1.1.1 -springBootVersion=2.6.3 -springCloudVersion=2021.0.0 - +rsocketBrokerClientVersion=0.3.0 +rsocketVersion=1.1.3 +springBootVersion=3.1.5 +springCloudVersion=2022.0.4 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 669386b..fce403e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..365c03f --- /dev/null +++ b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +io.rsocket.broker.http.bridge.config.RSocketHttpBridgeAutoConfiguration \ No newline at end of file