Merge branch 'master' into brig/activity-page-new

walmartlabs · Nov 13, 2023 · 5a0c415 · 5a0c415
2 parents bf8c6be + dc167a5
commit 5a0c415
Show file tree

Hide file tree

Showing 287 changed files with 18,742 additions and 1,658 deletions.
diff --git a/.github/settings.xml b/.github/settings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <profiles>
+        <profile>
+            <id>gha</id>
+            <properties>
+                <it.skipDocker>true</it.skipDocker>
+            </properties>
+        </profile>
+    </profiles>
+</settings>
+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,23 +14,12 @@ jobs:
   build:
     strategy:
       matrix:
-        jdk_version: ['17']
+        jdk_version: [ '17' ]
       fail-fast: false
 
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
 
     steps:
-      - name: Clear /tmp
-        run: |
-          docker run --rm -v /tmp:/data alpine find /data -ctime +2 -exec rm -rf '{}' \; 2>&1 > /dev/null || true
-
-      - name: Clear old Docker resources
-        run: |
-          docker rm -f $(docker ps -aq) || true
-          docker volume rm $(docker volume ps -q) || true
-          docker system prune -af || true
-          docker image prune -af || true
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         with:
@@ -42,21 +31,17 @@ jobs:
           username: ${{ secrets.OSS_DOCKERHUB_USERNAME }}
           password: ${{ secrets.OSS_DOCKERHUB_PASSWORD }}
 
-      - uses: actions/checkout@v3
-
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           java-version: '${{ matrix.jdk_version }}'
           distribution: 'temurin'
 
-      - name: Remove old Concord artifacts
-        run: |
-          rm -rf ~/.m2/repository/com/walmartlabs/concord
-          rm -rf ~/actions-runner/.m2/repository/com/walmartlabs/concord
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Build and test with Maven
-        run: ./mvnw -B clean install -Pdocker -Pit -Pjdk${{ matrix.jdk_version }}
-        
+        run: ./mvnw -s .github/settings.xml -B clean install -Pgha -Pdocker -Pit -Pjdk${{ matrix.jdk_version }}
+
       - name: Build with debian docker images
-        run: ./mvnw -C -B -f docker-images install -DskipTests -Pdocker -Pdebian -Pjdk${{ matrix.jdk_version }}
+        run: ./mvnw -s .github/settings.xml -C -B -f docker-images install -DskipTests -Pgha -Pdocker -Pdebian -Pjdk${{ matrix.jdk_version }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,44 @@
 # Change log
 
+## [2.1.0] - 2023-10-10
+
+### Added
+
+- new concord-client-v2
+([#810](https://github.com/walmartlabs/concord/pull/810));
+- runtime-v2: hasFlow function
+([#813](https://github.com/walmartlabs/concord/pull/813));
+- runtime-v2: uuid function
+([#812](https://github.com/walmartlabs/concord/pull/812));
+- runtime-v2: allow listen to project load events at runtime
+([#785](https://github.com/walmartlabs/concord/pull/785));
+- console2: allow changing JSON store org 
+([#790](https://github.com/walmartlabs/concord/pull/790)).
+
+### Changed
+- runtime-v2: automatically convert non serializable map.entry to serializable in exp
+([#815](https://github.com/walmartlabs/concord/pull/815)); 
+- server: return 404 when repository is not found
+([#806](https://github.com/walmartlabs/concord/pull/806));
+- runtime-v2: fix global vars update after resume
+([#809](https://github.com/walmartlabs/concord/pull/809));
+- console2: handle procesess with commitId, but without repoUrl
+([#807](https://github.com/walmartlabs/concord/pull/807));
+- runtime-v2: fix initialize of array expression
+([#800](https://github.com/walmartlabs/concord/pull/800));
+- server: only admins can access policies
+([#792](https://github.com/walmartlabs/concord/pull/792));
+- cli: active profiles fix
+([#789](https://github.com/walmartlabs/concord/pull/789)).
+
 ## [2.0.0] - 2023-08-16
 
+
 # Breaking
 
 - project: drop support for JDK 8 and JDK 11. Make JDK 17
 the new default version.
 
-
-
 ## [1.103.0] - 2023-07-16
 
 ### Added

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ different systems together using scenarios and plugins created by users.
 
 Dependencies:
 - [Git](https://git-scm.com/) 2.18+
-- [Java 8](https://adoptium.net/)
+- [Java 17](https://adoptium.net/)
 - [Docker Community Edition](https://www.docker.com/community-edition)
 - [Docker Buildx](https://docs.docker.com/build/buildx/install/)
 - (Optional) [NodeJS and NPM](https://nodejs.org/en/download/) (Node 16 or greater)
@@ -41,7 +41,7 @@ Available Maven profiles:
 - `docker` - build Docker images;
 - `debian` - build Debian-based Docker images instead of the default CentOS base;
 - `it` - run integration tests;
-- `jdk17`, `jdk17-aarch64` - use a different JDK version for building artifacts and Docker images.
+- ``jdk17-aarch64` - use a different JDK version for building artifacts and Docker images.
 
 Profiles can be combined, e.g.
 
@@ -122,4 +122,4 @@ See the [examples](examples) directory.
 
 ## Development Notes
 
-See [NOTES.md](NOTES.md).
+See [NOTES.md](NOTES.md).
diff --git a/agent/pom.xml b/agent/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -100,6 +100,7 @@
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.ws.rs</groupId>

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/pom.xml b/client/pom.xml
@@ -6,13 +6,21 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>concord-client</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <swagger.version>1.5.20</swagger.version>
+        <gson.version>2.10</gson.version>
+        <gson.fire.version>1.8.3</gson.fire.version>
+        <okhttp.version>2.7.5</okhttp.version>
+        <okio.version>1.17.2</okio.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.walmartlabs.concord.server</groupId>
@@ -31,27 +39,40 @@
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>okhttp</artifactId>
+            <version>${okhttp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp</groupId>
             <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okio</groupId>
             <artifactId>okio</artifactId>
+            <version>${okio.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.gsonfire</groupId>
-            <artifactId>gson-fire</artifactId>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
+            <version>${swagger.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>${gson.fire.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -123,6 +144,7 @@
             <plugin>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-codegen-maven-plugin</artifactId>
+                <version>2.3.1</version>
                 <executions>
                     <execution>
                         <id>server</id>
@@ -131,7 +153,7 @@
                         </goals>
                         <configuration>
                             <inputSpec>
-                                ${project.basedir}/../server/impl/target/classes/com/walmartlabs/concord/server/swagger/swagger.json
+                                ${project.basedir}/swagger.json
                             </inputSpec>
                             <language>java</language>
                             <languageSpecificPrimitives>