Using com.redislabs.testcontainers group instead of github package re…

…gistry

.github/workflows/build.yml

@@ -37,10 +37,3 @@ jobs:
 
       - name: Build
         run: ./gradlew build -S
-
-      - name: Show Reports
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: reports-${{ runner.os }}
-          path: build/

.github/workflows/early-access.yml

@@ -37,19 +37,12 @@ jobs:
       - name: Build
         run: ./gradlew -Prelease=true build aggregateJacocoReport -S
 
-      - name: Show Reports
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: reports-${{ runner.os }}
-          path: build/
-
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
 
       - name: Version
         id: vars
-        run: echo ::set-output name=version::$(grep "version" gradle.properties | cut -d'=' -f2 | tr -d " ")
+        run: echo ::set-output name=version::$(cat VERSION)
 
       - name: Assemble
         uses: jreleaser/release-action@v1

.github/workflows/release.yml

@@ -37,9 +37,9 @@ jobs:
       - name: Set release version
         run: |
           VERSION=${{ github.event.inputs.version }}
-          sed -i -e "s/^version\=.*/version=$VERSION/g" gradle.properties
+          echo $VERSION > VERSION
           sed -i -e "s/^\:project-version\:\ .*/:project-version: $VERSION/g" README.adoc
-          git add gradle.properties
+          git add VERSION
           git add README.adoc
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config --global user.name "GitHub Action"
@@ -56,7 +56,10 @@ jobs:
           GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         run: |
-          ./gradlew -Prelease=true -Pfull-release=true build -S
+          ./gradlew -Prelease=true -Pfull-release=true \
+          -PsonatypeUsername=${{ secrets.SONATYPE_USERNAME }} \
+          -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} \
+          build publishToSonatype createGuide -S
 
       - name: Assemble
         uses: jreleaser/release-action@v1
@@ -88,5 +91,8 @@ jobs:
             out/jreleaser/trace.log
             out/jreleaser/output.properties
 
-      - name: Guide
-        run: ./gradlew createGuide gitPublishPush -S
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/guide/build/docs/asciidoc

VERSION

@@ -0,0 +1 @@
+2.12.1-SNAPSHOT

build.gradle

@@ -57,14 +57,6 @@ allprojects {
     repositories {
         gradlePluginPortal()
         mavenCentral()
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/redis-developer/registry")
-            credentials {
-                username = project.findProperty("github.username") ?: System.getenv("GITHUB_USERNAME")
-                password = project.findProperty("github.token") ?: System.getenv("GITHUB_TOKEN")
-            }
-        }
         mavenLocal()
     }
     tasks.withType(GenerateModuleMetadata) {

connectors/riot-db/riot-db.gradle

@@ -18,8 +18,8 @@ dependencies {
     implementation 'org.postgresql:postgresql'
     implementation 'org.xerial:sqlite-jdbc:3.34.0'
     testImplementation project(':riot-test')
-    testImplementation group: 'org.testcontainers', name: 'postgresql', version: testcontainersVersion
-    testImplementation group: 'org.testcontainers', name: 'oracle-xe', version: testcontainersVersion
+    testImplementation group: 'com.redislabs.testcontainers', name: 'postgresql', version: testcontainersVersion
+    testImplementation group: 'com.redislabs.testcontainers', name: 'oracle-xe', version: testcontainersVersion
 }
 
 configurations {

connectors/riot-stream/riot-stream.gradle

@@ -20,7 +20,7 @@ dependencies {
     implementation 'io.confluent:kafka-avro-serializer:6.2.0'
     implementation 'io.confluent:kafka-protobuf-serializer:6.2.0'
     testImplementation project(':riot-test')
-    testImplementation group: 'org.testcontainers', name: 'kafka', version: testcontainersVersion
+    testImplementation group: 'com.redislabs.testcontainers', name: 'kafka', version: testcontainersVersion
 }
 
 configurations {

core/riot-test/riot-test.gradle

@@ -6,7 +6,7 @@ dependencies {
     api 'org.junit.jupiter:junit-jupiter-engine'
     annotationProcessor group: 'info.picocli', name: 'picocli-codegen', version: picocliVersion
     api 'com.redislabs:testcontainers-redis:1.1.6'
-    api group: 'org.testcontainers', name: 'junit-jupiter', version: testcontainersVersion
+    api group: 'com.redislabs.testcontainers', name: 'junit-jupiter', version: testcontainersVersion
     implementation 'commons-io:commons-io:2.8.0'
 }
 

gradle.properties

@@ -1,10 +1,7 @@
 group=com.redislabs
-version=2.12.1-SNAPSHOT
-gitPublishPluginVersion=3.0.0
 kordampPluginVersion=0.46.0
-kordampBuildVersion=2.5.0
-jreleaserPluginVersion=0.4.0
+redislabsBuildVersion=0.1.0
 picocliVersion=4.6.1
-testcontainersVersion=1.15.3-REDISLABS
+testcontainersVersion=1.15.3
 protobufVersion=3.14.0
 googleHttpVersion=1.38.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jreleaser.yml

@@ -21,7 +21,7 @@ release:
     changelog:
       sort: DESC
       formatted: ALWAYS
-      change: '- {{commitShortHash}} {{commitTitle}}'
+      format: '- {{commitShortHash}} {{commitTitle}}'
       labelers:
         - label: 'feature'
           title: 'Resolves #'
@@ -34,6 +34,8 @@ release:
           body: 'Relates to #'
         - label: 'task'
           title: '[chore]'
+        - label: 'dependencies'
+          title: '[deps]'
       categories:
         - title: '🚀 Features'
           labels:
@@ -44,9 +46,14 @@ release:
         - title: '🧰 Tasks'
           labels:
             - 'task'
+        - title: '⚙️ Dependencies'
+          labels:
+            - 'dependencies'
       replacers:
         - search: '\[chore\] '
           replace: ''
+        - search: '\[deps\] '
+          replace: ''
 
 announce:
   slack:

settings.gradle

@@ -5,18 +5,16 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion"
+        classpath "com.redislabs.gradle:redislabs-parentbuild:$redislabsBuildVersion"
         classpath "org.kordamp.gradle:java-project-gradle-plugin:$kordampPluginVersion"
         classpath "org.kordamp.gradle:guide-gradle-plugin:$kordampPluginVersion"
-        classpath "org.jreleaser:jreleaser-gradle-plugin:$jreleaserPluginVersion"
-        classpath "org.ajoberstar:gradle-git-publish:$gitPublishPluginVersion"
         classpath "io.freefair.gradle:lombok-plugin:6.0.0-m2"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:2.5.1"
         classpath "io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE"
     }
 }
 
-apply plugin: 'org.kordamp.gradle.kordamp-parentbuild'
+apply plugin: 'com.redislabs.gradle.redislabs-parentbuild'
 
 rootProject.name = 'riot'
 
@@ -29,11 +27,9 @@ projects {
         }
         path(':') {
             id 'org.kordamp.gradle.java-project'
-            id 'org.jreleaser'
         }
         path(':guide') {
             id 'org.kordamp.gradle.guide'
-            id 'org.ajoberstar.git-publish'
         }
         dirs(['core', 'connectors']) {
             id 'java-library'