Skip to content

Commit

Permalink
[INLONG-10091][Sort] Add json format for Flink 1.18 (apache#10092)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aloyszhang @herywang
aloyszhang authored and herywang committed May 9, 2024
1 parent ef5f187 commit 2496258
Show file tree
Hide file tree
Showing 34 changed files with 4,800 additions and 153 deletions.
208 changes: 172 additions & 36 deletions inlong-distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,42 +35,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<finalName>apache-${project.parent.artifactId}-${project.version}</finalName>
</configuration>
<executions>
<execution>
<id>release</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/release.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>sort-plugin</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/sort-connectors-v1.13.xml</descriptor>
<descriptor>src/main/assemblies/sort-connectors-v1.15.xml</descriptor>
<descriptor>src/main/assemblies/sort-connectors-v1.18.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand All @@ -94,4 +58,176 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>flink-all-version</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<finalName>apache-${project.parent.artifactId}-${project.version}</finalName>
</configuration>
<executions>
<execution>
<id>release</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/release.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>sort-plugin</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/sort-connectors-v1.13.xml</descriptor>
<descriptor>src/main/assemblies/sort-connectors-v1.15.xml</descriptor>
<descriptor>src/main/assemblies/sort-connectors-v1.18.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>v1.13</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<finalName>apache-${project.parent.artifactId}-${project.version}</finalName>
</configuration>
<executions>
<execution>
<id>release</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/release.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>sort-plugin</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/sort-connectors-v1.13.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>v1.15</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<finalName>apache-${project.parent.artifactId}-${project.version}</finalName>
</configuration>
<executions>
<execution>
<id>release</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/release.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>sort-plugin</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/sort-connectors-v1.15.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>v1.18</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<finalName>apache-${project.parent.artifactId}-${project.version}</finalName>
</configuration>
<executions>
<execution>
<id>release</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/release.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>sort-plugin</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/sort-connectors-v1.18.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
1 change: 1 addition & 0 deletions inlong-sort/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@
<flink.version>1.18.1</flink.version>
<flink.minor.version>1.18</flink.minor.version>
<flink.scala.binary.version>2.12</flink.scala.binary.version>
<flink.test.utils.artifactId>flink-test-utils</flink.test.utils.artifactId>
</properties>
</profile>
</profiles>
Expand Down
112 changes: 89 additions & 23 deletions inlong-sort/sort-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,6 @@
<artifactId>sort-format-base</artifactId>
<version>${project.version}</version>
</dependency>
<!--flink core-->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-flink-dependencies-${sort.flink.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<!-- for test -->
<dependency>
Expand Down Expand Up @@ -100,12 +83,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-format-json-${sort.flink.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-format-csv</artifactId>
Expand All @@ -126,6 +103,29 @@
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<!--flink core-->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-flink-dependencies-${sort.flink.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-format-json-${sort.flink.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-connector-tubemq</artifactId>
Expand Down Expand Up @@ -245,6 +245,29 @@
<profile>
<id>v1.15</id>
<dependencies>
<!--flink core-->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-flink-dependencies-${sort.flink.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-format-json-${sort.flink.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-connector-tubemq-v1.15</artifactId>
Expand Down Expand Up @@ -327,6 +350,49 @@
</plugins>
</build>
</profile>
<profile>
<id>v1.18</id>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-flink-dependencies-${sort.flink.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-connector-pulsar-v1.18</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${plugin.surefire.version}</version>
<configuration>
<includes>
<include>org.apache.inlong.sort.function.*</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>

0 comments on commit 2496258

Please sign in to comment.