Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FLINK-29264] Various cleanups #31

Merged
merged 6 commits into from
Sep 13, 2022
Merged

[FLINK-29264] Various cleanups #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce8dfcc
[FLINK-29264] Given parent module a proper artifact ID
zentol Sep 12, 2022
7f0f898
[FLINK-29265] Update version to 3.0-SNAPSHOT
zentol Sep 12, 2022
68482f0
[FLINK-29266] Cleanup root pom
zentol Sep 12, 2022
c5503ac
[FLINK-25868][build] Disable japicmp in packaging/e2e modules
zentol Sep 13, 2022
5ba20a1
[FLINK-25868][build] Use custom japicmp plugin version
zentol Sep 13, 2022
3787d45
[FLINK-25868][build] Enable japicmp for all modules
zentol Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions flink-connector-elasticsearch-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ under the License.

<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
<version>1.16-SNAPSHOT</version>
<artifactId>flink-connector-elasticsearch-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>

<artifactId>flink-connector-elasticsearch-base</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions flink-connector-elasticsearch6/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ under the License.

<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
<version>1.16-SNAPSHOT</version>
<artifactId>flink-connector-elasticsearch-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>

<artifactId>flink-connector-elasticsearch6</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions flink-connector-elasticsearch7/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ under the License.

<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
<version>1.16-SNAPSHOT</version>
<artifactId>flink-connector-elasticsearch-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>

<artifactId>flink-connector-elasticsearch7</artifactId>
Expand Down
8 changes: 6 additions & 2 deletions flink-sql-connector-elasticsearch6/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,19 @@ under the License.

<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
<version>1.16-SNAPSHOT</version>
<artifactId>flink-connector-elasticsearch-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>

<artifactId>flink-sql-connector-elasticsearch6</artifactId>
<name>Flink : Connectors : SQL : Elasticsearch 6</name>

<packaging>jar</packaging>

<properties>
<japicmp.skip>true</japicmp.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
Expand Down
8 changes: 6 additions & 2 deletions flink-sql-connector-elasticsearch7/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,19 @@ under the License.

<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
<version>1.16-SNAPSHOT</version>
<artifactId>flink-connector-elasticsearch-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>

<artifactId>flink-sql-connector-elasticsearch7</artifactId>
<name>Flink : Connectors : SQL : Elasticsearch 7</name>

<packaging>jar</packaging>

<properties>
<japicmp.skip>true</japicmp.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
Expand Down
108 changes: 18 additions & 90 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ under the License.
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
<version>1.16-SNAPSHOT</version>
<name>Flink : Connectors : </name>
<artifactId>flink-connector-elasticsearch-parent</artifactId>
<version>3.0-SNAPSHOT</version>
<name>Flink : Connectors : Elasticsearch : Parent</name>
<packaging>pom</packaging>
<url>https://flink.apache.org</url>
<inceptionYear>2022</inceptionYear>
Expand Down Expand Up @@ -63,16 +63,13 @@ under the License.

<flink.version>1.16-SNAPSHOT</flink.version>
<flink.shaded.version>15.0</flink.shaded.version>
<flink.shaded.jackson.version>2.12.4</flink.shaded.jackson.version>

<!-- Overwrite default values from parent pom.
Intellij is (sometimes?) using those values to choose target language level
and thus is changing back to java 1.6 on each maven re-import -->
<target.java.version>1.8</target.java.version>
<maven.compiler.source>${target.java.version}</maven.compiler.source>
<maven.compiler.target>${target.java.version}</maven.compiler.target>
<scala.version>2.12.7</scala.version>
<scala.binary.version>2.12</scala.binary.version>

<junit4.version>4.13.2</junit4.version>
<junit5.version>5.8.1</junit5.version>
Expand All @@ -83,7 +80,7 @@ under the License.
<spotless.version>2.13.0</spotless.version>

<japicmp.skip>false</japicmp.skip>
<japicmp.referenceVersion>1.14.0</japicmp.referenceVersion>
<japicmp.referenceVersion>1.15.0</japicmp.referenceVersion>
<japicmp.outputDir>tools/japicmp-output</japicmp.outputDir>

<slf4j.version>1.7.36</slf4j.version>
Expand Down Expand Up @@ -210,45 +207,6 @@ under the License.
<dependencyManagement>

<dependencies>

<!-- Flink shaded dependencies -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-asm-9</artifactId>
<version>9.2-${flink.shaded.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-guava</artifactId>
<version>30.1.1-jre-${flink.shaded.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson</artifactId>
<version>${flink.shaded.jackson.version}-${flink.shaded.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-module-jsonSchema</artifactId>
<version>${flink.shaded.jackson.version}-${flink.shaded.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-netty</artifactId>
<version>4.1.70.Final-${flink.shaded.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-netty-tcnative-dynamic</artifactId>
<version>2.0.44.Final-${flink.shaded.version}</version>
<scope>test</scope>
</dependency>

<!-- Flink dependencies -->

<dependency>
Expand Down Expand Up @@ -336,12 +294,6 @@ under the License.
<version>${log4j.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>

<!-- For dependency convergence -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
Expand Down Expand Up @@ -373,13 +325,7 @@ under the License.
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.8.3</version>
</dependency>

<!-- kryo used in different versions by Flink an chill -->
<!-- For dependency convergence -->
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
Expand All @@ -393,18 +339,6 @@ under the License.
<version>2.1</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
Expand Down Expand Up @@ -467,7 +401,7 @@ under the License.
<version>3.2.4</version>
</plugin>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<groupId>io.github.zentol.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
<dependencies>
<dependency>
Expand Down Expand Up @@ -634,7 +568,7 @@ under the License.
</configuration>
</plugin>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<groupId>io.github.zentol.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
Expand Down Expand Up @@ -823,6 +757,12 @@ under the License.
</configuration>
</plugin>

<plugin>
<!-- activate API compatibility checks -->
<groupId>io.github.zentol.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
Expand Down Expand Up @@ -1026,10 +966,10 @@ under the License.
<rules>
<bannedDependencies>
<excludes>
<exclude>org.apache.flink:flink-table-planner_${scala.binary.version}</exclude>
<exclude>org.apache.flink:flink-table-planner_*</exclude>
</excludes>
<includes>
<include>org.apache.flink:flink-table-planner_${scala.binary.version}:*:*:test</include>
<include>org.apache.flink:flink-table-planner_*:*:*:test</include>
</includes>
<message>
Direct dependencies on flink-table-planner are not allowed.
Expand Down Expand Up @@ -1165,7 +1105,7 @@ under the License.
<property>rootDir</property>
<project>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
<artifactId>flink-connector-elasticsearch-parent</artifactId>
</project>
</configuration>
</execution>
Expand Down Expand Up @@ -1327,9 +1267,9 @@ under the License.

<!-- Configuration for the binary compatibility checker -->
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<groupId>io.github.zentol.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
<version>0.11.0</version>
<version>0.16.0_m325</version>
<configuration>
<oldVersion>
<dependency>
Expand All @@ -1356,18 +1296,6 @@ under the License.
<exclude>@org.apache.flink.annotation.Experimental</exclude>
<exclude>@org.apache.flink.annotation.PublicEvolving</exclude>
<exclude>@org.apache.flink.annotation.Internal</exclude>
<exclude>org.apache.flink.streaming.api.datastream.DataStream#DataStream(org.apache.flink.streaming.api.environment.StreamExecutionEnvironment,org.apache.flink.streaming.api.transformations.StreamTransformation)</exclude>
<exclude>org.apache.flink.streaming.api.environment.LegacyLocalStreamEnvironment</exclude>
<exclude>org.apache.flink.streaming.api.functions.sink.RichSinkFunction#invoke(java.lang.Object)</exclude>
<exclude>org.apache.flink.streaming.api.functions.sink.SinkFunction</exclude>
<exclude>org.apache.flink.api.java.hadoop.mapred.HadoopInputFormat</exclude>
<exclude>org.apache.flink.api.java.hadoop.mapred.HadoopOutputFormat</exclude>
<exclude>org.apache.flink.api.java.hadoop.mapreduce.HadoopInputFormat</exclude>
<exclude>org.apache.flink.api.java.hadoop.mapreduce.HadoopOutputFormat</exclude>
<exclude>org.apache.flink.api.scala.hadoop.mapred.HadoopInputFormat</exclude>
<exclude>org.apache.flink.api.scala.hadoop.mapred.HadoopOutputFormat</exclude>
<exclude>org.apache.flink.api.scala.hadoop.mapreduce.HadoopInputFormat</exclude>
<exclude>org.apache.flink.api.scala.hadoop.mapreduce.HadoopOutputFormat</exclude>
</excludes>
<accessModifier>public</accessModifier>
<breakBuildOnModifications>false</breakBuildOnModifications>
Expand Down