[hotfix] Use 1.1 branch during weekly instead of 1.0

apache · May 11, 2024 · f95bb34 · f95bb34
1 parent ed90318
commit f95bb34
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
@@ -30,9 +30,6 @@ jobs:
     strategy:
       matrix:
         flink_branches: [ {
-          flink: 1.17-SNAPSHOT,
-          branch: main
-        }, {
           flink: 1.18-SNAPSHOT,
           jdk: '8, 11',
           branch: main
@@ -46,10 +43,10 @@ jobs:
           branch: main
         }, {
           flink: 1.17.2,
-          branch: v1.0
+          branch: v1.1
         }, {
           flink: 1.18.1,
-          branch: v1.0
+          branch: v1.1
         }]
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:

diff --git a/flink-connector-opensearch-base/pom.xml b/flink-connector-opensearch-base/pom.xml
@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>${revision}</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-connector-opensearch-base</artifactId>

diff --git a/flink-connector-opensearch-e2e-tests/pom.xml b/flink-connector-opensearch-e2e-tests/pom.xml
@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>${revision}</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-connector-opensearch-e2e-tests</artifactId>

diff --git a/flink-connector-opensearch/pom.xml b/flink-connector-opensearch/pom.xml
@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>${revision}</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-connector-opensearch</artifactId>

diff --git a/flink-connector-opensearch2-e2e-tests/pom.xml b/flink-connector-opensearch2-e2e-tests/pom.xml
@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>${revision}</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-connector-opensearch2-e2e-tests</artifactId>

diff --git a/flink-connector-opensearch2/pom.xml b/flink-connector-opensearch2/pom.xml
@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>${revision}</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-connector-opensearch2</artifactId>

diff --git a/flink-connector-opensearch2/src/test/resources/archunit.properties b/flink-connector-opensearch2/src/test/resources/archunit.properties
@@ -17,7 +17,7 @@
 #
 
 # By default we allow removing existing violations, but fail when new violations are added.
-@freeze.store.default.allowStoreUpdate=true
+freeze.store.default.allowStoreUpdate=true
 
 # Enable this if a new (frozen) rule has been added in order to create the initial store and record the existing violations.
 #freeze.store.default.allowStoreCreation=true

diff --git a/flink-sql-connector-opensearch/pom.xml b/flink-sql-connector-opensearch/pom.xml
@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>${revision}</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-sql-connector-opensearch</artifactId>

diff --git a/flink-sql-connector-opensearch2/pom.xml b/flink-sql-connector-opensearch2/pom.xml
@@ -26,7 +26,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.flink</groupId>
 		<artifactId>flink-connector-opensearch-parent</artifactId>
-		<version>${revision}</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>flink-sql-connector-opensearch2</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@ under the License.
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>flink-connector-opensearch-parent</artifactId>
-	<version>${revision}</version>
+	<version>2.0-SNAPSHOT</version>
 	<name>Flink : Connectors : Opensearch : Parent</name>
 	<packaging>pom</packaging>
 	<url>https://flink.apache.org</url>
@@ -55,8 +55,6 @@ under the License.
 	</modules>
 
 	<properties>
-		<flink.connector.opensearch.parent.revision>1.2-SNAPSHOT</flink.connector.opensearch.parent.revision>
-		<revision>${flink.connector.opensearch.parent.revision}</revision>
 		<flink.version>1.18.0</flink.version>
 		<commons-compress.version>1.26.1</commons-compress.version>
 		<jackson-bom.version>2.16.2</jackson-bom.version>