From bdef5bb0854977e39603e810b3209de75be72a1d Mon Sep 17 00:00:00 2001 From: Daniel Henneberger Date: Wed, 22 May 2024 11:36:36 -0700 Subject: [PATCH] Prepare for 0.5 Signed-off-by: Daniel Henneberger --- .github/workflows/build-config.yml | 2 +- .github/workflows/release.yml | 13 +-- playbook.md | 6 +- profiles/default/flink/build.gradle | 2 +- profiles/default/package.json | 2 +- profiles/default/vertx/Dockerfile | 2 +- sqrl-flink-lib/pom.xml | 93 +++++++++++++++++++ sqrl-flink-lib/sqrl-flexible-json/pom.xml | 4 - sqrl-flink-lib/sqrl-jdbc-1.16/pom.xml | 2 - sqrl-flink-lib/sqrl-jdbc-1.17/pom.xml | 2 - sqrl-flink-lib/sqrl-jdbc-1.18/pom.xml | 2 - sqrl-flink-lib/sqrl-json/pom.xml | 1 - sqrl-flink-lib/sqrl-secure/pom.xml | 1 - sqrl-flink-lib/sqrl-text/pom.xml | 1 - sqrl-flink-lib/sqrl-time/pom.xml | 1 - sqrl-flink-lib/sqrl-vector/pom.xml | 2 - .../datasqrl/cmd/AbstractCompilerCommand.java | 2 +- .../java/com/datasqrl/cmd/RootCommand.java | 2 +- 18 files changed, 101 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build-config.yml b/.github/workflows/build-config.yml index d398c1618..d49e3c87c 100644 --- a/.github/workflows/build-config.yml +++ b/.github/workflows/build-config.yml @@ -1,7 +1,7 @@ name: Build and test SQRL with Maven on: pull_request: - branches: [ "main", "v0.5", "v0.5-RC5" ] + branches: [ "main", "v0.5"] jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c122721b0..2d5fcf1bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: distribution: 'adopt' cache: maven - name: Build SQRL - run: mvn -B -U -T 6 -e clean install -DskipTests=true + run: mvn -B -U -T 6 -e clean deploy -DskipTests=true # Set up Docker - name: Set up QEMU @@ -32,14 +32,6 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Determine tag suffix - id: tag_suffix - run: | - if [[ "${{ github.ref_name }}" =~ -RC[0-9]+$ ]]; then - echo "TAG_SUFFIX=${{ github.ref_name }}" >> $GITHUB_ENV - else - echo "TAG_SUFFIX=latest" >> $GITHUB_ENV - fi - name: Build and Push sqrl-cli Latest uses: docker/build-push-action@v3 with: @@ -48,7 +40,6 @@ jobs: push: true tags: | datasqrl/cmd:${{ github.ref_name }} - datasqrl/cmd:${{ env.TAG_SUFFIX }} platforms: linux/amd64,linux/arm64 - name: Build and Push sqrl-vertx Docker uses: docker/build-push-action@v3 @@ -58,7 +49,6 @@ jobs: push: true tags: | datasqrl/sqrl-server:${{ github.ref_name }} - datasqrl/sqrl-server:${{ env.TAG_SUFFIX }} platforms: linux/amd64,linux/arm64 - name: Build and Push sqrl-dependencies Docker uses: docker/build-push-action@v3 @@ -68,5 +58,4 @@ jobs: push: true tags: | datasqrl/sqrl-dependencies:${{ github.ref_name }} - datasqrl/sqrl-dependencies:${{ env.TAG_SUFFIX }} platforms: linux/amd64,linux/arm64 \ No newline at end of file diff --git a/playbook.md b/playbook.md index 6bd544c3f..c45638423 100644 --- a/playbook.md +++ b/playbook.md @@ -34,12 +34,8 @@ docker build -t datasqrl/datasqrl-cmd . ``` # To run int test: -First, build the docker files: -``` -docker build . -t datasqrl/sqrl-dependencies:0.5-RC4 -``` -Second, build the docker server image: +Build the docker server image: ``` mvn package cd sqrl-server/sqrl-server-vertx diff --git a/profiles/default/flink/build.gradle b/profiles/default/flink/build.gradle index 17d9905c1..62382de8f 100644 --- a/profiles/default/flink/build.gradle +++ b/profiles/default/flink/build.gradle @@ -12,7 +12,7 @@ ext { flinkVersion = "1.18.1" jdbcVersion = "3.1.2-1.18" kafkaVersion = "3.1.0-1.18" - sqrlVersion = "0.5.0-RC4" + sqrlVersion = "0.5.0" } repositories { diff --git a/profiles/default/package.json b/profiles/default/package.json index a612ffbc6..9c79a34aa 100644 --- a/profiles/default/package.json +++ b/profiles/default/package.json @@ -35,7 +35,7 @@ }, "package": { "name": "datasqrl.profile.default", - "version": "v0.5.0-RC5", + "version": "v0.5.0", "variant": "dev", "description": "A docker compose datasqrl profile", "homepage": "", diff --git a/profiles/default/vertx/Dockerfile b/profiles/default/vertx/Dockerfile index 4f5bd8ba8..06455fe6b 100644 --- a/profiles/default/vertx/Dockerfile +++ b/profiles/default/vertx/Dockerfile @@ -1,4 +1,4 @@ -FROM datasqrl/sqrl-server:v0.5.0-RC5-SNAPSHOT +FROM datasqrl/sqrl-server:v0.5.0 COPY server-model.json /opt/sqrl/server-model.json COPY server-config.json /opt/sqrl/server-config.json diff --git a/sqrl-flink-lib/pom.xml b/sqrl-flink-lib/pom.xml index 3f6c3297d..600f4fa24 100644 --- a/sqrl-flink-lib/pom.xml +++ b/sqrl-flink-lib/pom.xml @@ -56,6 +56,99 @@ v0.5.0-RC3 + + + + com.datasqrl + sqrl-lib-common + ${project.version} + + + + com.datasqrl + sqrl-errors + ${project.version} + + + + com.datasqrl + sqrl-flexible-csv + ${project.version} + + + + com.datasqrl + sqrl-flexible-json + ${project.version} + + + + com.datasqrl + sqrl-h2-1.16 + ${project.version} + + + + com.datasqrl + sqrl-jdbc-1.16 + ${project.version} + + + + com.datasqrl + sqrl-jdbc-1.17 + ${project.version} + + + + com.datasqrl + sqrl-jdbc-1.18 + ${project.version} + + + + com.datasqrl + sqrl-json + ${project.version} + + + + com.datasqrl + sqrl- + ${project.version} + + + + com.datasqrl + sqrl-name + ${project.version} + + + + com.datasqrl + sqrl-secure + ${project.version} + + + + com.datasqrl + sqrl-text + ${project.version} + + + + com.datasqrl + sqrl-time + ${project.version} + + + + com.datasqrl + sqrl-vector + ${project.version} + + + org.projectlombok diff --git a/sqrl-flink-lib/sqrl-flexible-json/pom.xml b/sqrl-flink-lib/sqrl-flexible-json/pom.xml index 358af68df..443b966be 100644 --- a/sqrl-flink-lib/sqrl-flexible-json/pom.xml +++ b/sqrl-flink-lib/sqrl-flexible-json/pom.xml @@ -43,17 +43,14 @@ com.datasqrl sqrl-errors - ${version} com.datasqrl sqrl-name - ${version} com.datasqrl sqrl-json - ${version} org.apache.flink @@ -76,7 +73,6 @@ com.datasqrl sqrl-lib-common - ${version} diff --git a/sqrl-flink-lib/sqrl-jdbc-1.16/pom.xml b/sqrl-flink-lib/sqrl-jdbc-1.16/pom.xml index f23139f4b..b60f4bdf5 100644 --- a/sqrl-flink-lib/sqrl-jdbc-1.16/pom.xml +++ b/sqrl-flink-lib/sqrl-jdbc-1.16/pom.xml @@ -71,12 +71,10 @@ com.datasqrl sqrl-lib-common - ${version} com.datasqrl sqrl-flexible-json - ${version} org.apache.flink diff --git a/sqrl-flink-lib/sqrl-jdbc-1.17/pom.xml b/sqrl-flink-lib/sqrl-jdbc-1.17/pom.xml index 55e33c637..5ebc255bd 100644 --- a/sqrl-flink-lib/sqrl-jdbc-1.17/pom.xml +++ b/sqrl-flink-lib/sqrl-jdbc-1.17/pom.xml @@ -72,12 +72,10 @@ com.datasqrl sqrl-lib-common - ${version} com.datasqrl sqrl-flexible-json - ${version} org.apache.flink diff --git a/sqrl-flink-lib/sqrl-jdbc-1.18/pom.xml b/sqrl-flink-lib/sqrl-jdbc-1.18/pom.xml index 7bf7021c3..79de312d6 100644 --- a/sqrl-flink-lib/sqrl-jdbc-1.18/pom.xml +++ b/sqrl-flink-lib/sqrl-jdbc-1.18/pom.xml @@ -72,12 +72,10 @@ com.datasqrl sqrl-lib-common - ${version} com.datasqrl sqrl-flexible-json - ${version} org.apache.flink diff --git a/sqrl-flink-lib/sqrl-json/pom.xml b/sqrl-flink-lib/sqrl-json/pom.xml index a3b10f48d..8f23c0c2f 100644 --- a/sqrl-flink-lib/sqrl-json/pom.xml +++ b/sqrl-flink-lib/sqrl-json/pom.xml @@ -67,7 +67,6 @@ com.datasqrl sqrl-lib-common - 0.5.0-RC5-SNAPSHOT diff --git a/sqrl-flink-lib/sqrl-secure/pom.xml b/sqrl-flink-lib/sqrl-secure/pom.xml index 9948115cb..ab5121a9f 100644 --- a/sqrl-flink-lib/sqrl-secure/pom.xml +++ b/sqrl-flink-lib/sqrl-secure/pom.xml @@ -49,7 +49,6 @@ com.datasqrl sqrl-lib-common - ${version} diff --git a/sqrl-flink-lib/sqrl-text/pom.xml b/sqrl-flink-lib/sqrl-text/pom.xml index b0dcc8420..5c663f389 100644 --- a/sqrl-flink-lib/sqrl-text/pom.xml +++ b/sqrl-flink-lib/sqrl-text/pom.xml @@ -49,7 +49,6 @@ com.datasqrl sqrl-lib-common - ${version} diff --git a/sqrl-flink-lib/sqrl-time/pom.xml b/sqrl-flink-lib/sqrl-time/pom.xml index 7cb42bd06..fd0797030 100644 --- a/sqrl-flink-lib/sqrl-time/pom.xml +++ b/sqrl-flink-lib/sqrl-time/pom.xml @@ -49,7 +49,6 @@ com.datasqrl sqrl-lib-common - ${version} diff --git a/sqrl-flink-lib/sqrl-vector/pom.xml b/sqrl-flink-lib/sqrl-vector/pom.xml index 5286ee827..608cffd6b 100644 --- a/sqrl-flink-lib/sqrl-vector/pom.xml +++ b/sqrl-flink-lib/sqrl-vector/pom.xml @@ -72,12 +72,10 @@ com.datasqrl sqrl-lib-common - ${version} com.datasqrl sqrl-jdbc-1.16 - 0.5.0-RC5-SNAPSHOT provided diff --git a/sqrl-tools/sqrl-cli/src/main/java/com/datasqrl/cmd/AbstractCompilerCommand.java b/sqrl-tools/sqrl-cli/src/main/java/com/datasqrl/cmd/AbstractCompilerCommand.java index 0874a45a3..f2f26b379 100644 --- a/sqrl-tools/sqrl-cli/src/main/java/com/datasqrl/cmd/AbstractCompilerCommand.java +++ b/sqrl-tools/sqrl-cli/src/main/java/com/datasqrl/cmd/AbstractCompilerCommand.java @@ -126,7 +126,7 @@ public PackageJson createDefaultConfig(ErrorCollector errors) { packageJson.setProfiles(new String[]{"datasqrl.profile.default"}); packageJson.getDependencies() .addDependency("datasqrl.profile.default", - new DependencyImpl("datasqrl.profile.default", "v0.5.0-RC5", "dev")); + new DependencyImpl("datasqrl.profile.default", "v0.5.0", "dev")); return packageJson; } diff --git a/sqrl-tools/sqrl-cli/src/main/java/com/datasqrl/cmd/RootCommand.java b/sqrl-tools/sqrl-cli/src/main/java/com/datasqrl/cmd/RootCommand.java index e61ced327..6a07b3211 100644 --- a/sqrl-tools/sqrl-cli/src/main/java/com/datasqrl/cmd/RootCommand.java +++ b/sqrl-tools/sqrl-cli/src/main/java/com/datasqrl/cmd/RootCommand.java @@ -11,7 +11,7 @@ import picocli.CommandLine; import picocli.CommandLine.ScopeType; -@CommandLine.Command(name = "datasqrl", mixinStandardHelpOptions = true, version = "v0.5.0-RC4", +@CommandLine.Command(name = "datasqrl", mixinStandardHelpOptions = true, version = "v0.5.0", subcommands = {CompilerCommand.class, PublishCommand.class, TestCommand.class, LoginCommand.class}) @Getter