This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
The following commit(s) were added to refs/heads/master by this push:
new e12255a [BAHIR-196] Added scala 2.12 and updated plugins
e12255a is described below
commit e12255a6784ef8c55376aab1db61afb635751bf8
Author: eskabetxe <[email protected]>
AuthorDate: Thu Mar 7 18:00:27 2019 +0100
[BAHIR-196] Added scala 2.12 and updated plugins
Closes #46
---
dev/change-scala-version.sh | 4 +-
dev/release-build.sh | 18 ++++-----
pom.xml | 93 ++++++++++++++++++++++++++++++++++-----------
3 files changed, 81 insertions(+), 34 deletions(-)
diff --git a/dev/change-scala-version.sh b/dev/change-scala-version.sh
index 7203ee7..a467950 100755
--- a/dev/change-scala-version.sh
+++ b/dev/change-scala-version.sh
@@ -18,7 +18,7 @@
set -e
-VALID_VERSIONS=( 2.10 2.11 )
+VALID_VERSIONS=( 2.11 2.12 )
usage() {
echo "Usage: $(basename $0) [-h|--help] <version>
@@ -44,7 +44,7 @@ check_scala_version() {
check_scala_version "$TO_VERSION"
if [ $TO_VERSION = "2.11" ]; then
- FROM_VERSION="2.10"
+ FROM_VERSION="2.12"
else
FROM_VERSION="2.11"
fi
diff --git a/dev/release-build.sh b/dev/release-build.sh
index e8a193b..40b8a32 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.10 and 2.11 artifacts.
+Note that this will publish both Scala 2.11 and 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.10 and 2.11 artifacts.
+Note that this will publish both Scala 2.11 and 2.12 artifacts.
OPTIONS
@@ -283,13 +283,13 @@ if [[ "$RELEASE_PUBLISH" == "true" ]]; then
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 -DskiptTests
-Darguments="-DskipTests" -Dgpg.passphrase=$GPG_PASSPHRASE
+ 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.10
- ./dev/change-scala-version.sh 2.10
- 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
-Darguments="-DskipTests" -Pscala-2.10 -Dgpg.passphrase=$GPG_PASSPHRASE
+ #Deploy scala 2.12
+ ./dev/change-scala-version.sh 2.12
+ 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.12
-Darguments="-DskipTests" -Dgpg.passphrase=$GPG_PASSPHRASE
cd "$BASE_DIR" #exit target
@@ -317,9 +317,9 @@ if [[ "$RELEASE_SNAPSHOT" == "true" ]]; then
#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.10
- ./dev/change-scala-version.sh 2.10
- $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.10 -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
cd "$BASE_DIR" #exit target
exit 0
diff --git a/pom.xml b/pom.xml
index 150862a..3271069 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>21</version>
</parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-flink-parent_2.11</artifactId>
@@ -89,7 +89,6 @@
<java.version>1.8</java.version>
<scala.version>2.11.12</scala.version>
- <scala.version>2.11.8</scala.version>
<scala.binary.version>2.11</scala.binary.version>
@@ -102,8 +101,8 @@
<junit.jupiter.version>5.3.1</junit.jupiter.version>
<junit.groups></junit.groups>
- <scalatest.version>2.2.6</scalatest.version>
- <scalacheck.version>1.12.6</scalacheck.version> <!-- 1.13.0 appears
incompatible with scalatest 2.2.6 -->
+ <scalatest.version>3.0.5</scalatest.version>
+ <scalacheck.version>1.14.0</scalacheck.version>
<PermGen>64m</PermGen>
<MaxPermGen>512m</MaxPermGen>
@@ -248,7 +247,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version>
+ <version>0.13</version>
<executions>
<execution>
<id>enforce-licenses</id>
@@ -276,12 +275,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.10</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.4.6</version>
<executions>
<execution>
<id>scala-compile-first</id>
@@ -328,7 +327,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.8.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -345,7 +344,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>2.22.1</version>
<!-- Note config is repeated in scalatest config -->
<configuration>
<groups>${junit.groups}</groups>
@@ -369,7 +368,7 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>2.0.0</version>
<!-- Note config is repeated in surefire config -->
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
@@ -397,7 +396,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -407,7 +406,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.1</version>
<configuration>
<attach>true</attach>
</configuration>
@@ -424,12 +423,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
+ <version>3.0.1</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -437,12 +436,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -457,6 +456,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
<executions>
<execution>
<id>default-cli</id>
@@ -523,6 +523,16 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.scalastyle</groupId>
+ <artifactId>scalastyle-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -532,7 +542,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
<executions>
<execution>
<id>generate-test-classpath</id>
@@ -566,7 +575,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
@@ -579,7 +587,6 @@
<plugin>
<groupId>org.scalastyle</groupId>
<artifactId>scalastyle-maven-plugin</artifactId>
- <version>0.8.0</version>
<configuration>
<verbose>false</verbose>
<failOnViolation>true</failOnViolation>
@@ -603,14 +610,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
<configuration>
<consoleOutput>false</consoleOutput>
<failOnViolation>true</failOnViolation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <sourceDirectories>${basedir}/src/main/java</sourceDirectories>
+
<testSourceDirectories>${basedir}/src/test/java</testSourceDirectories>
<configLocation>dev/checkstyle.xml</configLocation>
<outputFile>${basedir}/target/checkstyle-output.xml</outputFile>
<encoding>${project.build.sourceEncoding}</encoding>
@@ -696,7 +702,9 @@
<profile>
<id>scala-2.11</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!scala-2.12</name>
+ </property>
</activation>
<properties>
<scala.version>2.11.12</scala.version>
@@ -718,6 +726,45 @@
<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>
+ <property>
+ <name>scala-2.12</name>
+ </property>
+ </activation>
+ <properties>
+ <scala.version>2.12.8</scala.version>
+ <scala.binary.version>2.12</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.11</exclude>
</excludes>
</bannedDependencies>
</rules>
