This is an automated email from the ASF dual-hosted git repository. eskabetxe pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
commit 176242c9d10d8a67a0f773dc61235b96b26e3c44 Author: Joao Boto <[email protected]> AuthorDate: Thu Mar 23 13:30:24 2023 +0100 [BAHIR-308] Remove scala prefix where we can --- distribution/pom.xml | 20 ++--- flink-connector-activemq/pom.xml | 4 +- flink-connector-akka/pom.xml | 4 +- flink-connector-flume/pom.xml | 4 +- flink-connector-influxdb/pom.xml | 4 +- flink-connector-influxdb2/pom.xml | 4 +- flink-connector-kudu/pom.xml | 14 +++- .../kudu/table/dynamic/KuduDynamicTableSource.java | 3 +- flink-connector-netty/pom.xml | 8 +- flink-connector-pinot/pom.xml | 36 ++------- flink-connector-redis/pom.xml | 8 +- flink-library-siddhi/pom.xml | 10 ++- pom.xml | 89 ++++++++++++++-------- 13 files changed, 112 insertions(+), 96 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index c8ac4ee..4161157 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -20,13 +20,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-assembly_2.12</artifactId> + <artifactId>bahir-flink-assembly</artifactId> <packaging>pom</packaging> <name>Apache Bahir - Flink Extensions Distribution</name> <url>http://bahir.apache.org/</url> @@ -34,7 +34,7 @@ <dependencies> <dependency> <groupId>org.apache.bahir</groupId> - <artifactId>flink-connector-activemq_${scala.binary.version}</artifactId> + <artifactId>flink-connector-activemq</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -44,37 +44,37 @@ </dependency> <dependency> <groupId>org.apache.bahir</groupId> - <artifactId>flink-connector-flume_${scala.binary.version}</artifactId> + <artifactId>flink-connector-flume</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.bahir</groupId> - <artifactId>flink-connector-influxdb2_${scala.binary.version}</artifactId> + <artifactId>flink-connector-influxdb2</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.bahir</groupId> - <artifactId>flink-connector-influxdb_${scala.binary.version}</artifactId> + <artifactId>flink-connector-influxdb</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.bahir</groupId> - <artifactId>flink-connector-kudu_${scala.binary.version}</artifactId> + <artifactId>flink-connector-kudu</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.bahir</groupId> - <artifactId>flink-connector-netty_${scala.binary.version}</artifactId> + <artifactId>flink-connector-netty</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.bahir</groupId> - <artifactId>flink-connector-pinot_${scala.binary.version}</artifactId> + <artifactId>flink-connector-pinot</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.bahir</groupId> - <artifactId>flink-connector-redis_${scala.binary.version}</artifactId> + <artifactId>flink-connector-redis</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/flink-connector-activemq/pom.xml b/flink-connector-activemq/pom.xml index cde65b6..8dfaa85 100644 --- a/flink-connector-activemq/pom.xml +++ b/flink-connector-activemq/pom.xml @@ -23,12 +23,12 @@ under the License. <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-activemq_2.12</artifactId> + <artifactId>flink-connector-activemq</artifactId> <packaging>jar</packaging> <name>flink-connector-activemq</name> diff --git a/flink-connector-akka/pom.xml b/flink-connector-akka/pom.xml index 53da588..a3dbc09 100644 --- a/flink-connector-akka/pom.xml +++ b/flink-connector-akka/pom.xml @@ -23,12 +23,12 @@ under the License. <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-akka_2.12</artifactId> + <artifactId>flink-connector-akka_${scala.binary.version}</artifactId> <packaging>jar</packaging> <name>flink-connector-akka</name> <url>http://bahir.apache.org/</url> diff --git a/flink-connector-flume/pom.xml b/flink-connector-flume/pom.xml index 46f3b1a..bc1d6b1 100644 --- a/flink-connector-flume/pom.xml +++ b/flink-connector-flume/pom.xml @@ -23,12 +23,12 @@ under the License. <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-flume_2.12</artifactId> + <artifactId>flink-connector-flume</artifactId> <packaging>jar</packaging> <name>flink-connector-flume</name> diff --git a/flink-connector-influxdb/pom.xml b/flink-connector-influxdb/pom.xml index 1108cfa..2eb555a 100644 --- a/flink-connector-influxdb/pom.xml +++ b/flink-connector-influxdb/pom.xml @@ -23,12 +23,12 @@ under the License. <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-influxdb_2.12</artifactId> + <artifactId>flink-connector-influxdb</artifactId> <packaging>jar</packaging> <name>flink-connector-influxdb</name> diff --git a/flink-connector-influxdb2/pom.xml b/flink-connector-influxdb2/pom.xml index 48f26df..39a3859 100644 --- a/flink-connector-influxdb2/pom.xml +++ b/flink-connector-influxdb2/pom.xml @@ -23,12 +23,12 @@ under the License. <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-influxdb2_2.12</artifactId> + <artifactId>flink-connector-influxdb2</artifactId> <packaging>jar</packaging> <name>flink-connector-influxdb2</name> diff --git a/flink-connector-kudu/pom.xml b/flink-connector-kudu/pom.xml index 134d6f7..8dc4f88 100644 --- a/flink-connector-kudu/pom.xml +++ b/flink-connector-kudu/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-kudu_2.12</artifactId> + <artifactId>flink-connector-kudu</artifactId> <packaging>jar</packaging> <name>flink-connector-kudu</name> @@ -84,13 +84,21 @@ <groupId>org.apache.flink</groupId> <artifactId>flink-streaming-java</artifactId> </dependency> + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-table-api-java-bridge</artifactId> + </dependency> <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-table-common</artifactId> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner_${scala.binary.version}</artifactId> + <artifactId>flink-table-planner-loader</artifactId> + </dependency> + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-table-runtime</artifactId> </dependency> <dependency> <groupId>org.apache.kudu</groupId> diff --git a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSource.java b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSource.java index cde6a13..da6bebb 100644 --- a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSource.java +++ b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/dynamic/KuduDynamicTableSource.java @@ -43,7 +43,6 @@ import org.slf4j.LoggerFactory; import java.util.*; -import static org.apache.flink.calcite.shaded.com.google.common.base.Preconditions.checkArgument; import static org.apache.flink.table.utils.TableSchemaUtils.containsPhysicalColumnsOnly; /** @@ -143,7 +142,7 @@ public class KuduDynamicTableSource implements ScanTableSource, SupportsProjecti } private TableSchema projectSchema(TableSchema tableSchema, int[][] projectedFields) { - checkArgument( + Preconditions.checkArgument( containsPhysicalColumnsOnly(tableSchema), "Projection is only supported for physical columns."); TableSchema.Builder builder = TableSchema.builder(); diff --git a/flink-connector-netty/pom.xml b/flink-connector-netty/pom.xml index ad450e3..94d5b81 100644 --- a/flink-connector-netty/pom.xml +++ b/flink-connector-netty/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-netty_2.12</artifactId> + <artifactId>flink-connector-netty</artifactId> <packaging>jar</packaging> <name>flink-connector-netty</name> @@ -86,11 +86,11 @@ </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> + <artifactId>flink-streaming-java</artifactId> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner_${scala.binary.version}</artifactId> + <artifactId>flink-table-api-java-bridge</artifactId> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> diff --git a/flink-connector-pinot/pom.xml b/flink-connector-pinot/pom.xml index 6b1aaab..02f281e 100644 --- a/flink-connector-pinot/pom.xml +++ b/flink-connector-pinot/pom.xml @@ -23,12 +23,12 @@ under the License. <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-pinot_2.12</artifactId> + <artifactId>flink-connector-pinot</artifactId> <packaging>jar</packaging> <name>flink-connector-pinot</name> @@ -109,6 +109,10 @@ under the License. <artifactId>flink-streaming-java</artifactId> <type>test-jar</type> </dependency> + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-test-utils</artifactId> + </dependency> <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-tests</artifactId> @@ -122,20 +126,10 @@ under the License. <groupId>org.apache.pinot</groupId> <artifactId>pinot-java-client</artifactId> </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime-web</artifactId> - <version>${flink.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.pinot</groupId> <artifactId>pinot-tools</artifactId> </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils</artifactId> - </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>junit-jupiter</artifactId> @@ -165,11 +159,8 @@ under the License. <goal>enforce</goal> </goals> <configuration> - <rules> - <requireJavaVersion> - <version>${java.version}</version> - </requireJavaVersion> - <bannedDependencies> + <rules combine.children="append"> + <bannedDependencies combine.children="append"> <excludes combine.self="override"> <!-- The org.codehaus.groovy dependency is required by org.apache.pinot:pinot-tools --> </excludes> @@ -200,17 +191,6 @@ under the License. </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <configuration combine.children="append"> - <rules combine.children="append"> - <compound implementation="com.github.ferstl.maven.pomenforcers.CompoundPedanticEnforcer" combine.children="append"> - <enforcers combine.children="override">POM_SECTION_ORDER,MODULE_ORDER,DEPENDENCY_MANAGEMENT_ORDER,DEPENDENCY_CONFIGURATION,DEPENDENCY_ELEMENT,DEPENDENCY_SCOPE,DEPENDENCY_MANAGEMENT_LOCATION,PLUGIN_MANAGEMENT_ORDER,PLUGIN_CONFIGURATION,PLUGIN_ELEMENT,PLUGIN_MANAGEMENT_LOCATION</enforcers> - </compound> - </rules> - </configuration> - </plugin> </plugins> </pluginManagement> <plugins> diff --git a/flink-connector-redis/pom.xml b/flink-connector-redis/pom.xml index 374c288..eda3c73 100644 --- a/flink-connector-redis/pom.xml +++ b/flink-connector-redis/pom.xml @@ -23,12 +23,12 @@ under the License. <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-redis_2.12</artifactId> + <artifactId>flink-connector-redis</artifactId> <packaging>jar</packaging> <name>flink-connector-redis</name> @@ -79,10 +79,6 @@ under the License. <groupId>org.apache.flink</groupId> <artifactId>flink-table-common</artifactId> </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner_${scala.binary.version}</artifactId> - </dependency> <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-test-utils</artifactId> diff --git a/flink-library-siddhi/pom.xml b/flink-library-siddhi/pom.xml index 3a7c86e..b6136b6 100644 --- a/flink-library-siddhi/pom.xml +++ b/flink-library-siddhi/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-library-siddhi_2.12</artifactId> + <artifactId>flink-library-siddhi_${scala.binary.version}</artifactId> <packaging>jar</packaging> <name>flink-library-siddhi</name> @@ -68,6 +68,12 @@ </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> + <version>${flink.version}</version> + </dependency> </dependencies> </dependencyManagement> diff --git a/pom.xml b/pom.xml index 2f49e84..ce17db3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <version>24</version> </parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-parent_2.12</artifactId> + <artifactId>bahir-flink-parent</artifactId> <version>1.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Bahir for Apache Flink - Parent POM</name> @@ -170,11 +170,6 @@ <type>test-jar</type> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-scala_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-streaming-java</artifactId> @@ -189,28 +184,29 @@ </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> + <artifactId>flink-table-api-java</artifactId> <version>${flink.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-java</artifactId> + <artifactId>flink-table-api-java-bridge</artifactId> <version>${flink.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-java-bridge</artifactId> + <artifactId>flink-table-common</artifactId> <version>${flink.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table-common</artifactId> + <artifactId>flink-table-planner-loader</artifactId> <version>${flink.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner_${scala.binary.version}</artifactId> + <artifactId>flink-table-runtime</artifactId> <version>${flink.version}</version> <scope>provided</scope> </dependency> @@ -520,27 +516,54 @@ <version>2.1.0</version> </dependency> </dependencies> - <configuration> - <rules> - <compound implementation="com.github.ferstl.maven.pomenforcers.CompoundPedanticEnforcer" combine.children="append"> - <enforcers>POM_SECTION_ORDER,MODULE_ORDER,DEPENDENCY_MANAGEMENT_ORDER,DEPENDENCY_ORDER,DEPENDENCY_CONFIGURATION,DEPENDENCY_ELEMENT,DEPENDENCY_SCOPE,DEPENDENCY_MANAGEMENT_LOCATION,PLUGIN_MANAGEMENT_ORDER,PLUGIN_CONFIGURATION,PLUGIN_ELEMENT,PLUGIN_MANAGEMENT_LOCATION</enforcers> - <!-- DEPENDENCY_ORDER configuration --> - <dependenciesGroupIdPriorities>org.apache.bahir</dependenciesGroupIdPriorities> - <dependenciesOrderBy>groupId,artifactId,scope</dependenciesOrderBy> - <dependenciesScopePriorities>compile,runtime,provided,test</dependenciesScopePriorities> - <!-- DEPENDENCY_MANAGEMENT_ORDER configuration --> - <dependencyManagementGroupIdPriorities>org.apache.bahir</dependencyManagementGroupIdPriorities> - <dependencyManagementOrderBy>groupId,artifactId,scope</dependencyManagementOrderBy> - <dependencyManagementScopePriorities>compile,runtime,provided,test</dependencyManagementScopePriorities> - <!-- PLUGIN_MANAGEMENT_ORDER configuration --> - <pluginManagementOrderBy>groupId,artifactId</pluginManagementOrderBy> - <providedDependencies /> - <testDependencies /> - </compound> - <!-- <requireUpperBoundDeps combine.children="append"/>--> - </rules> - </configuration> <executions> + <execution> + <id>pom-enforcer</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <compound implementation="com.github.ferstl.maven.pomenforcers.CompoundPedanticEnforcer" combine.children="append"> + <enforcers>POM_SECTION_ORDER,MODULE_ORDER,DEPENDENCY_MANAGEMENT_ORDER,DEPENDENCY_ORDER,DEPENDENCY_CONFIGURATION,DEPENDENCY_ELEMENT,DEPENDENCY_SCOPE,DEPENDENCY_MANAGEMENT_LOCATION,PLUGIN_MANAGEMENT_ORDER,PLUGIN_CONFIGURATION,PLUGIN_ELEMENT,PLUGIN_MANAGEMENT_LOCATION</enforcers> + <!-- DEPENDENCY_ORDER configuration --> + <dependenciesGroupIdPriorities>org.apache.bahir</dependenciesGroupIdPriorities> + <dependenciesOrderBy>groupId,artifactId,scope</dependenciesOrderBy> + <dependenciesScopePriorities>compile,runtime,provided,test</dependenciesScopePriorities> + <!-- DEPENDENCY_MANAGEMENT_ORDER configuration --> + <dependencyManagementGroupIdPriorities>org.apache.bahir</dependencyManagementGroupIdPriorities> + <dependencyManagementOrderBy>groupId,artifactId,scope</dependencyManagementOrderBy> + <dependencyManagementScopePriorities>compile,runtime,provided,test</dependencyManagementScopePriorities> + <!-- PLUGIN_MANAGEMENT_ORDER configuration --> + <pluginManagementOrderBy>groupId,artifactId</pluginManagementOrderBy> + <providedDependencies /> + <testDependencies /> + </compound> + </rules> + </configuration> + </execution> + <execution> + <id>forbid-direct-table-planner-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <excludes> + <exclude>org.apache.flink:flink-table-planner_*</exclude> + </excludes> + <includes> + <include>org.apache.flink:flink-table-planner_*:*:*:test</include> + </includes> + <message> + Direct dependencies on flink-table-planner are not allowed. + You should depend on either Table API modules or flink-table-planner-loader. + </message> + </bannedDependencies> + </rules> + </configuration> + </execution> <execution> <id>enforce-versions</id> <goals> @@ -548,6 +571,10 @@ </goals> <configuration> <rules> + <requireMavenVersion> + <!-- enforce at least mvn version 3.1.1 (see FLINK-12447) --> + <version>[3.1.1,)</version> + </requireMavenVersion> <requireJavaVersion> <version>${java.version}</version> </requireJavaVersion>
