Merge branch 'brig/v2-log-yaml' of https://github.com/walmartlabs/con…

…cord into brig/v2-log-yaml
walmartlabs · Dec 25, 2023 · 80f8147 · 80f8147
2 parents 20e5941 + 75770e6
commit 80f8147
Show file tree

Hide file tree

Showing 222 changed files with 17,816 additions and 1,524 deletions.
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/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>