Repository: bahir-flink Updated Branches: refs/heads/master e23fa6552 -> 5fbe12a1c
[MINOR] Properly active scala 2.10 versus 2.11 Project: http://git-wip-us.apache.org/repos/asf/bahir-flink/repo Commit: http://git-wip-us.apache.org/repos/asf/bahir-flink/commit/5fbe12a1 Tree: http://git-wip-us.apache.org/repos/asf/bahir-flink/tree/5fbe12a1 Diff: http://git-wip-us.apache.org/repos/asf/bahir-flink/diff/5fbe12a1 Branch: refs/heads/master Commit: 5fbe12a1c9ed2c66e45e1ece3682f9a85ec3149e Parents: e23fa65 Author: Luciano Resende <[email protected]> Authored: Thu Apr 6 15:47:48 2017 -0700 Committer: Luciano Resende <[email protected]> Committed: Thu Apr 6 15:56:47 2017 -0700 ---------------------------------------------------------------------- dev/release-build.sh | 4 ++-- flink-connector-akka/pom.xml | 1 - pom.xml | 7 +++---- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/5fbe12a1/dev/release-build.sh ---------------------------------------------------------------------- diff --git a/dev/release-build.sh b/dev/release-build.sh index 65429e3..945c750 100755 --- a/dev/release-build.sh +++ b/dev/release-build.sh @@ -317,11 +317,11 @@ if [[ "$RELEASE_SNAPSHOT" == "true" ]]; then 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" -Dgpg.passphrase=$GPG_PASSPHRASE + $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" -Dscala-2.10 -Dgpg.passphrase=$GPG_PASSPHRASE + $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 cd "$BASE_DIR" #exit target exit 0 http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/5fbe12a1/flink-connector-akka/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connector-akka/pom.xml b/flink-connector-akka/pom.xml index d2d9d05..5eb261b 100644 --- a/flink-connector-akka/pom.xml +++ b/flink-connector-akka/pom.xml @@ -34,7 +34,6 @@ under the License. <packaging>jar</packaging> <properties> - <scala.binary.version>2.11</scala.binary.version> <mockito.version>1.10.19</mockito.version> <akka.version>2.3.15</akka.version> </properties> http://git-wip-us.apache.org/repos/asf/bahir-flink/blob/5fbe12a1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b513353..8161d19 100644 --- a/pom.xml +++ b/pom.xml @@ -555,10 +555,8 @@ <profile> <id>scala-2.10</id> - <activation> - <property><name>scala-2.10</name></property> - </activation> <properties> + <scala.version>2.10.5</scala.version> <scala.binary.version>2.10</scala.binary.version> </properties> <build> @@ -591,9 +589,10 @@ <profile> <id>scala-2.11</id> <activation> - <property><name>!scala-2.10</name></property> + <activeByDefault>true</activeByDefault> </activation> <properties> + <scala.version>2.11.8</scala.version> <scala.binary.version>2.11</scala.binary.version> </properties> <build>
