Merge pull request #178 from SpineEventEngine/1.x-update-dependencies

armiol · web-flow · commit 94bf59af0602 · 2023-04-07T15:58:23.000+01:00
[1.x] Update to Spine 1.9 API
diff --git a/.github/workflows/build-on-ubuntu.yml b/.github/workflows/build-on-ubuntu.yml
@@ -14,7 +14,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: zulu
 
       # This operation is specific to `gcloud-java` repository only.
diff --git a/.github/workflows/increment_guard.yml b/.github/workflows/increment_guard.yml
@@ -14,9 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: 11
+          distribution: zulu
 
       - name: Pull config
         run: git submodule update --init --recursive
diff --git a/.github/workflows/publish-v1.yml b/.github/workflows/publish-v1.yml
@@ -0,0 +1,70 @@
+name: Publishing for Spine v1.x
+
+on:
+  push:
+    branches:
+      - v1
+      - 1.x-dev
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: zulu
+          cache: gradle
+
+      - name: Decrypt CloudRepo credentials
+        run: ./config/scripts/decrypt.sh "$CLOUDREPO_CREDENTIALS_KEY" ./.github/keys/cloudrepo.properties.gpg ./cloudrepo.properties
+        env:
+          CLOUDREPO_CREDENTIALS_KEY: ${{ secrets.CLOUDREPO_CREDENTIALS_KEY }}
+
+      - name: Decrypt Git SSH credentials
+        run: ./config/scripts/decrypt.sh "$GIT_CREDENTIALS_KEY" ./.github/keys/deploy_key_rsa.gpg ./deploy_key_rsa
+        env:
+          GIT_CREDENTIALS_KEY: ${{ secrets.GIT_CREDENTIALS_KEY }}
+
+        # Make sure the SSH key is not "too visible". SSH agent will not accept it otherwise.
+      - name: Set file system permissions
+        run: chmod 400 ./deploy_key_rsa && chmod +x ./config/scripts/register-ssh-key.sh
+
+      - name: Decrypt GCS credentials
+        run: ./config/scripts/decrypt.sh "$GCS_CREDENTIALS_KEY" ./.github/keys/gcs-auth-key.json.gpg ./gcs-auth-key.json
+        env:
+          GCS_CREDENTIALS_KEY: ${{ secrets.GCS_CREDENTIALS_KEY }}
+
+      - name: Decrypt GCAR credentials
+        run: ./config/scripts/decrypt.sh "$MAVEN_PUBLISHER_KEY" ./.github/keys/maven-publisher.json.gpg ./maven-publisher.json
+        env:
+          MAVEN_PUBLISHER_KEY: ${{ secrets.MAVEN_PUBLISHER_KEY }}
+
+      - name: Decrypt Git SSH credentials
+        run: ./config/scripts/decrypt.sh "$GRADLE_PORTAL_CREDENTIALS_KEY" ./.github/keys/gradle-plugin-portal.secret.properties.gpg ./gradle-plugin-portal.secret.properties
+        env:
+          GRADLE_PORTAL_CREDENTIALS_KEY: ${{ secrets.GRADLE_PORTAL_CREDENTIALS_KEY }}
+
+      - name: Append Gradle properties
+        run: cat ./gradle-plugin-portal.secret.properties >> ./gradle.properties
+
+      - name: Publish artifacts to Maven
+        # Since we're in the `v1`/`1.x-dev` branch already, this means that tests of a PR passed.
+        # So, no need to run the tests again when publishing.\
+        #
+        # Also, we don't want to update the GitHub Pages content, as it may be already
+        # updated with the contents of 2.x branch. So this operation should be performed
+        # manually, if really needed.
+        # See https://github.com/SpineEventEngine/config/tree/master/scripts/publish-documentation.
+        run: ./gradlew publish -x test -x updateGitHubPages --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FORMAL_GIT_HUB_PAGES_AUTHOR: developers@spine.io
+          # https://docs.github.com/en/actions/reference/environment-variables
+          REPO_SLUG: $GITHUB_REPOSITORY    # e.g. SpineEventEngine/core-java
+          GOOGLE_APPLICATION_CREDENTIALS: ./maven-publisher.json
+          NPM_TOKEN: ${{ secrets.NPM_SECRET }}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -84,7 +84,15 @@ subprojects {
         from(Deps.scripts.slowTests(project))
         from(Deps.scripts.testOutput(project))
         from(Deps.scripts.javadocOptions(project))
-        from(Deps.scripts.javacArgs(project))
+
+        // Instead of using `Deps.scripts.javacArgs(project)`, this project needs a special
+        // version of this script, made for JDK 11.
+        //
+        // The reason is that Datastore emulator now requires JDK 11+ to start,
+        // and this library requires it in order to run tests.
+        //
+        from("${rootDir}/javac-args-jdk11.gradle")
+
         from(Deps.scripts.projectLicenseReport(project))
         from(Deps.scripts.pmd(project))
     }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -30,7 +30,7 @@ plugins {
 
 repositories {
     mavenLocal()
-    jcenter()
+    mavenCentral()
 }
 
 val jacksonVersion = "2.11.0"
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
@@ -365,7 +365,15 @@ object DependencyResolution {
                 includeGroup("io.spine.gcloud")
             }
         }
-        repositories.jcenter()
+        repositories.maven {
+            url = URI(Repos.spineSnapshots)
+            content {
+                includeGroup("io.spine")
+                includeGroup("io.spine.tools")
+                includeGroup("io.spine.gcloud")
+            }
+        }
+        repositories.mavenCentral()
         repositories.maven {
             url = URI(Repos.gradlePlugins)
         }
diff --git a/config b/config
@@ -1 +1 @@
-Subproject commit c74b74f04e808224bcfb0ed2e7a4be925de5d273
+Subproject commit 9c072b030c537f494ed0f766efc4a88e4ecd4d55
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsAggregateStorageTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsAggregateStorageTest.java
@@ -31,7 +31,7 @@
 import com.google.protobuf.Any;
 import com.google.protobuf.Timestamp;
 import com.google.protobuf.util.Timestamps;
-import io.spine.base.Tests;
+import io.spine.environment.Tests;
 import io.spine.core.Event;
 import io.spine.core.Version;
 import io.spine.protobuf.AnyPacker;
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsAggregateStorageTruncationTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsAggregateStorageTruncationTest.java
@@ -26,7 +26,7 @@
 
 package io.spine.server.storage.datastore;
 
-import io.spine.base.Tests;
+import io.spine.environment.Tests;
 import io.spine.server.ServerEnvironment;
 import io.spine.server.aggregate.AggregateStorageTruncationTest;
 import io.spine.testing.server.storage.datastore.TestDatastoreStorageFactory;
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsCatchUpSmokeTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsCatchUpSmokeTest.java
@@ -26,7 +26,7 @@
 
 package io.spine.server.storage.datastore;
 
-import io.spine.base.Tests;
+import io.spine.environment.Tests;
 import io.spine.server.ServerEnvironment;
 import io.spine.server.delivery.CatchUpTest;
 import io.spine.testing.SlowTest;
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsDeliverySmokeTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsDeliverySmokeTest.java
@@ -26,7 +26,7 @@
 
 package io.spine.server.storage.datastore;
 
-import io.spine.base.Tests;
+import io.spine.environment.Tests;
 import io.spine.server.ServerEnvironment;
 import io.spine.server.delivery.DeliveryTest;
 import io.spine.testing.SlowTest;
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/tenant/NamespaceIndexTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/tenant/NamespaceIndexTest.java
@@ -32,7 +32,7 @@
 import com.google.common.testing.NullPointerTester;
 import com.google.common.truth.IterableSubject;
 import io.spine.base.Identifier;
-import io.spine.base.Tests;
+import io.spine.environment.Tests;
 import io.spine.core.TenantId;
 import io.spine.net.InternetDomain;
 import io.spine.server.BoundedContext;
diff --git a/javac-args-jdk11.gradle b/javac-args-jdk11.gradle
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2022, TeamDev. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * This script configures Java Compiler.
+ *
+ * NOTE: This is a modified copy of `/config/gradle/javac-args.gradle`, made specifically
+ * for building `gcloud-java` under JDK 11.
+ */
+
+tasks.withType(JavaCompile) {
+
+    // This restriction is lifted ONLY for `gcloud-java` project,
+    // Since the Datastore emulator now requires JDK 11+,
+    // and it is not possible to build the project without it.
+    //
+    // Therefore the build of `gcloud-java` is performed under JDK 11.
+    /*
+    if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+        throw new GradleException("Spine Event Engine can be built with JDK 8 only." +
+                " Supporting JDK 11 and above at build-time is planned in 2.0 release." +
+                " Please use the pre-built binaries available in the Spine Maven repository." +
+                " See https://github.com/SpineEventEngine/base/issues/457.")
+    }
+    */
+
+    // Explicitly states the encoding of the source and test source files, ensuring
+    // correct execution of the `javac` task.
+    //
+    // Also promotes compiler warnings to errors, so that the build fails on warnings.
+    // This includes Error Prone warnings
+    options.encoding = 'UTF-8'
+    options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Werror"
+
+    // Configure Error Prone:
+    // 1. Exclude generated sources from being analyzed by Error Prone.
+    // 2. Turn the check off until Error Prone can handle `@Nested` JUnit classes.
+    //    See issue: https://github.com/google/error-prone/issues/956
+    // 3. Turn off checks which report unused methods and unused method parameters.
+    //    See issue: https://github.com/SpineEventEngine/config/issues/61
+    //
+    // For more config details see:
+    //    https://github.com/tbroyer/gradle-errorprone-plugin/tree/master#usage
+
+    options.errorprone.errorproneArgs.addAll('-XepExcludedPaths:.*/generated/.*',
+            '-Xep:ClassCanBeStatic:OFF',
+            '-Xep:UnusedMethod:OFF',
+            '-Xep:UnusedVariable:OFF',
+            '-Xep:CheckReturnValue:OFF')
+}
diff --git a/license-report.md b/license-report.md
diff --git a/pom.xml b/pom.xml
diff --git a/pull b/pull
diff --git a/version.gradle.kts b/version.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ plugins {`
`30`	`30`
`31`	`31`	`repositories {`
`32`	`32`	`mavenLocal()`
`33`		`- jcenter()`
	`33`	`+ mavenCentral()`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`val jacksonVersion = "2.11.0"`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,15 @@ object DependencyResolution {`
`365`	`365`	`includeGroup("io.spine.gcloud")`
`366`	`366`	`}`
`367`	`367`	`}`
`368`		`- repositories.jcenter()`
	`368`	`+ repositories.maven {`
	`369`	`+ url = URI(Repos.spineSnapshots)`
	`370`	`+ content {`
	`371`	`+ includeGroup("io.spine")`
	`372`	`+ includeGroup("io.spine.tools")`
	`373`	`+ includeGroup("io.spine.gcloud")`
	`374`	`+ }`
	`375`	`+ }`
	`376`	`+ repositories.mavenCentral()`
`369`	`377`	`repositories.maven {`
`370`	`378`	`url = URI(Repos.gradlePlugins)`
`371`	`379`	`}`