[hotfix] Introduce profiles for releasing connectors for Opensearch 1…

… and 2
apache · Apr 24, 2024 · 22a2934 · 22a2934
1 parent 0017525
commit 22a2934
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 22 deletions.
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>2.0-SNAPSHOT</version>
+		<version>${revision}</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>2.0-SNAPSHOT</version>
+		<version>${revision}</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>2.0-SNAPSHOT</version>
+		<version>${revision}</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>2.0-SNAPSHOT</version>
+		<version>${revision}</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>2.0-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 
 	<artifactId>flink-connector-opensearch2</artifactId>

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>2.0-SNAPSHOT</version>
+		<version>${revision}</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>2.0-SNAPSHOT</version>
+		<version>${revision}</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>2.0-SNAPSHOT</version>
+	<version>${revision}</version>
 	<name>Flink : Connectors : Opensearch : Parent</name>
 	<packaging>pom</packaging>
 	<url>https://flink.apache.org</url>
@@ -52,12 +52,11 @@ under the License.
 
 	<modules>
 		<module>flink-connector-opensearch-base</module>
-		<module>flink-connector-opensearch</module>
-		<module>flink-connector-opensearch-e2e-tests</module>
-		<module>flink-sql-connector-opensearch</module>
 	</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>
@@ -390,17 +389,28 @@ under the License.
 	</dependencyManagement>
 
 	<profiles>
-	<profile>
-		<id>java11</id>
-		<activation>
-			<jdk>[11,)</jdk>
-		</activation>
-		<modules>
-			<module>flink-connector-opensearch2</module>
-			<module>flink-connector-opensearch2-e2e-tests</module>
-			<module>flink-sql-connector-opensearch2</module>
-		</modules>
-	</profile>
+		<profile>
+			<id>opensearch1</id>
+			<activation>
+				<jdk>[8,)</jdk>
+			</activation>
+			<modules>
+				<module>flink-connector-opensearch</module>
+				<module>flink-connector-opensearch-e2e-tests</module>
+				<module>flink-sql-connector-opensearch</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>opensearch2</id>
+			<activation>
+				<jdk>[11,)</jdk>
+			</activation>
+			<modules>
+				<module>flink-connector-opensearch2</module>
+				<module>flink-connector-opensearch2-e2e-tests</module>
+				<module>flink-sql-connector-opensearch2</module>
+			</modules>
+		</profile>
 	</profiles>
 
 	<build>