Prepare for 0.5

Signed-off-by: Daniel Henneberger <git@danielhenneberger.com>
DataSQRL · May 22, 2024 · bdef5bb · bdef5bb
1 parent 4240a87
commit bdef5bb
Show file tree

Hide file tree

Showing 18 changed files with 101 additions and 39 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -56,6 +56,99 @@
     <tag>v0.5.0-RC3</tag>
   </scm>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-lib-common</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-errors</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-flexible-csv</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-flexible-json</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-h2-1.16</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-jdbc-1.16</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-jdbc-1.17</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-jdbc-1.18</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-json</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-name</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-secure</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-text</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-time</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.datasqrl</groupId>
+        <artifactId>sqrl-vector</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.projectlombok</groupId>

diff --git a/sqrl-flink-lib/sqrl-flexible-json/pom.xml b/sqrl-flink-lib/sqrl-flexible-json/pom.xml
@@ -43,17 +43,14 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-errors</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-name</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-json</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.flink</groupId>
@@ -76,7 +73,6 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-lib-common</artifactId>
-      <version>${version}</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/sqrl-flink-lib/sqrl-jdbc-1.16/pom.xml b/sqrl-flink-lib/sqrl-jdbc-1.16/pom.xml
@@ -71,12 +71,10 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-lib-common</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-flexible-json</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.flink</groupId>

diff --git a/sqrl-flink-lib/sqrl-jdbc-1.17/pom.xml b/sqrl-flink-lib/sqrl-jdbc-1.17/pom.xml
@@ -72,12 +72,10 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-lib-common</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-flexible-json</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.flink</groupId>

diff --git a/sqrl-flink-lib/sqrl-jdbc-1.18/pom.xml b/sqrl-flink-lib/sqrl-jdbc-1.18/pom.xml
@@ -72,12 +72,10 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-lib-common</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-flexible-json</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.flink</groupId>

diff --git a/sqrl-flink-lib/sqrl-json/pom.xml b/sqrl-flink-lib/sqrl-json/pom.xml
@@ -67,7 +67,6 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-lib-common</artifactId>
-      <version>0.5.0-RC5-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

diff --git a/sqrl-flink-lib/sqrl-secure/pom.xml b/sqrl-flink-lib/sqrl-secure/pom.xml
@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-lib-common</artifactId>
-      <version>${version}</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/sqrl-flink-lib/sqrl-text/pom.xml b/sqrl-flink-lib/sqrl-text/pom.xml
@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-lib-common</artifactId>
-      <version>${version}</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/sqrl-flink-lib/sqrl-time/pom.xml b/sqrl-flink-lib/sqrl-time/pom.xml
@@ -49,7 +49,6 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-lib-common</artifactId>
-      <version>${version}</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/sqrl-flink-lib/sqrl-vector/pom.xml b/sqrl-flink-lib/sqrl-vector/pom.xml
@@ -72,12 +72,10 @@
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-lib-common</artifactId>
-      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>com.datasqrl</groupId>
       <artifactId>sqrl-jdbc-1.16</artifactId>
-      <version>0.5.0-RC5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

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
@@ -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
@@ -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