This is an automated email from the ASF dual-hosted git repository. eskabetxe pushed a commit to branch BAHIR-308 in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
commit a5f2385e6513503bfe63600fa020131d60802797 Author: Joao Boto <[email protected]> AuthorDate: Wed Jul 6 16:42:06 2022 +0200 [BAHIR-308] Remove support for scala 2.11 --- .github/workflows/maven-ci.yml | 2 +- .travis.yml | 1 - dev/change-scala-version.sh | 2 +- dev/release-build.sh | 10 ++------- distribution/pom.xml | 6 +++--- 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 | 4 ++-- flink-connector-netty/pom.xml | 4 ++-- flink-connector-pinot/pom.xml | 4 ++-- flink-connector-redis/pom.xml | 4 ++-- flink-library-siddhi/pom.xml | 4 ++-- pom.xml | 44 +++------------------------------------ 16 files changed, 30 insertions(+), 75 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index e063fa4..cc42ad2 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -31,7 +31,7 @@ jobs: matrix: java: ['8', '11'] flink-version: ['1.14.4'] - scala-version: ['2.11', '2.12'] + scala-version: ['2.12'] steps: - uses: actions/checkout@v2 diff --git a/.travis.yml b/.travis.yml index e414766..17985fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,6 @@ jdk: - openjdk8 env: - - FLINK_VERSION="1.14.4" SCALA_VERSION="2.11" - FLINK_VERSION="1.14.4" SCALA_VERSION="2.12" before_install: diff --git a/dev/change-scala-version.sh b/dev/change-scala-version.sh index a467950..f76d8a5 100755 --- a/dev/change-scala-version.sh +++ b/dev/change-scala-version.sh @@ -18,7 +18,7 @@ set -e -VALID_VERSIONS=( 2.11 2.12 ) +VALID_VERSIONS=( 2.12 ) usage() { echo "Usage: $(basename $0) [-h|--help] <version> diff --git a/dev/release-build.sh b/dev/release-build.sh index 3c03e88..0b1a770 100755 --- a/dev/release-build.sh +++ b/dev/release-build.sh @@ -38,11 +38,11 @@ to the staging release location. --release-publish --gitCommitHash="a874b73" Publish the maven artifacts of a release to the Apache staging maven repository. -Note that this will publish both Scala 2.11 and 2.12 artifacts. +Note that this will publish Scala 2.12 artifacts. --release-snapshot [--gitCommitHash="a874b73"] Publish the maven snapshot artifacts to Apache snapshots maven repository -Note that this will publish both Scala 2.11 and 2.12 artifacts. +Note that this will publish Scala 2.12 artifacts. OPTIONS @@ -297,9 +297,6 @@ if [[ "$RELEASE_PUBLISH" == "true" ]]; then checkout_code cd target/bahir-flink - #Deploy default scala 2.11 - mvn $PUBLISH_PROFILES -DaltDeploymentRepository=apache.releases.https::default::https://repository.apache.org/service/local/staging/deploy/maven2 clean package gpg:sign install:install deploy:deploy -DskipTests -Pscala-2.11 -Darguments="-DskipTests" -Dgpg.passphrase=$GPG_PASSPHRASE - mvn clean #Deploy scala 2.12 @@ -329,9 +326,6 @@ if [[ "$RELEASE_SNAPSHOT" == "true" ]]; then exit 1 fi - #Deploy default scala 2.11 - $MVN $PUBLISH_PROFILES -DaltDeploymentRepository=apache.snapshots.https::default::https://repository.apache.org/content/repositories/snapshots clean package gpg:sign install:install deploy:deploy -DskipTests -Darguments="-DskipTests" -Pscala-2.11 -Dgpg.passphrase=$GPG_PASSPHRASE - #Deploy scala 2.12 ./dev/change-scala-version.sh 2.12 $MVN $PUBLISH_PROFILES -DaltDeploymentRepository=apache.snapshots.https::default::https://repository.apache.org/content/repositories/snapshots clean package gpg:sign install:install deploy:deploy -DskipTests -Darguments="-DskipTests" -Pscala-2.12 -Dgpg.passphrase=$GPG_PASSPHRASE diff --git a/distribution/pom.xml b/distribution/pom.xml index 14035e8..c8ac4ee 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.11</artifactId> - <version>1.1-SNAPSHOT</version> + <artifactId>bahir-flink-parent_2.12</artifactId> + <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <groupId>org.apache.bahir</groupId> - <artifactId>bahir-flink-assembly_2.11</artifactId> + <artifactId>bahir-flink-assembly_2.12</artifactId> <packaging>pom</packaging> <name>Apache Bahir - Flink Extensions Distribution</name> <url>http://bahir.apache.org/</url> diff --git a/flink-connector-activemq/pom.xml b/flink-connector-activemq/pom.xml index 9522816..f70e158 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-activemq_2.11</artifactId> + <artifactId>flink-connector-activemq_2.12</artifactId> <packaging>jar</packaging> <name>flink-connector-activemq</name> diff --git a/flink-connector-akka/pom.xml b/flink-connector-akka/pom.xml index 1b1dd46..b929dce 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-akka_2.11</artifactId> + <artifactId>flink-connector-akka_2.12</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 92f4b91..e900aac 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-flume_2.11</artifactId> + <artifactId>flink-connector-flume_2.12</artifactId> <packaging>jar</packaging> <name>flink-connector-flume</name> diff --git a/flink-connector-influxdb/pom.xml b/flink-connector-influxdb/pom.xml index af5e4b1..c272e85 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-influxdb_2.11</artifactId> + <artifactId>flink-connector-influxdb_2.12</artifactId> <packaging>jar</packaging> <name>flink-connector-influxdb</name> diff --git a/flink-connector-influxdb2/pom.xml b/flink-connector-influxdb2/pom.xml index 3458790..74c8fd1 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-influxdb2_2.11</artifactId> + <artifactId>flink-connector-influxdb2_2.12</artifactId> <packaging>jar</packaging> <name>flink-connector-influxdb2</name> diff --git a/flink-connector-kudu/pom.xml b/flink-connector-kudu/pom.xml index fd485d5..20b16b4 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-connector-kudu_2.11</artifactId> + <artifactId>flink-connector-kudu_2.12</artifactId> <packaging>jar</packaging> <name>flink-connector-kudu</name> diff --git a/flink-connector-netty/pom.xml b/flink-connector-netty/pom.xml index 344477f..6f76037 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-netty_2.11</artifactId> + <artifactId>flink-connector-netty_2.12</artifactId> <packaging>jar</packaging> <name>flink-connector-netty</name> diff --git a/flink-connector-pinot/pom.xml b/flink-connector-pinot/pom.xml index 5584aed..670504a 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-pinot_2.11</artifactId> + <artifactId>flink-connector-pinot_2.12</artifactId> <packaging>jar</packaging> <name>flink-connector-pinot</name> diff --git a/flink-connector-redis/pom.xml b/flink-connector-redis/pom.xml index d7d67de..7e5b592 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-redis_2.11</artifactId> + <artifactId>flink-connector-redis_2.12</artifactId> <packaging>jar</packaging> <name>flink-connector-redis</name> diff --git a/flink-library-siddhi/pom.xml b/flink-library-siddhi/pom.xml index 96089f9..33dca44 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>flink-library-siddhi_2.11</artifactId> + <artifactId>flink-library-siddhi_2.12</artifactId> <packaging>jar</packaging> <name>flink-library-siddhi</name> diff --git a/pom.xml b/pom.xml index fd63fd6..51b6cea 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.11</artifactId> + <artifactId>bahir-flink-parent_2.12</artifactId> <version>1.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Bahir for Apache Flink - Parent POM</name> @@ -114,8 +114,8 @@ <!-- Flink version --> <flink.version>1.14.4</flink.version> - <scala.binary.version>2.11</scala.binary.version> - <scala.version>2.11.12</scala.version> + <scala.binary.version>2.12</scala.binary.version> + <scala.version>2.12.8</scala.version> <!-- General dependencies version --> <log4j.version>2.17.1</log4j.version> @@ -834,44 +834,6 @@ <module>distribution</module> </modules> </profile> - <profile> - <id>scala-2.11</id> - <activation> - <property> - <name>scala-2.11</name> - </property> - </activation> - <properties> - <scala.version>2.11.12</scala.version> - <scala.binary.version>2.11</scala.binary.version> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-versions</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <bannedDependencies> - <excludes combine.children="append"> - <exclude>*:*_2.10</exclude> - <exclude>*:*_2.12</exclude> - </excludes> - </bannedDependencies> - </rules> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> <profile> <id>scala-2.12</id> <activation>
