You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sr...@apache.org on 2017/05/14 13:39:25 UTC
[1/9] flink git commit: Revert "[FLINK-6518] Port blobserver config
parameters to ConfigOptions"
Repository: flink
Updated Branches:
refs/heads/release-1.3 471263cfe -> 51818a283
Revert "[FLINK-6518] Port blobserver config parameters to ConfigOptions"
This reverts commit 5e61a01bae6d05bf1d5c76bc48f0ba90bbdef752.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3da6aa83
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3da6aa83
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3da6aa83
Branch: refs/heads/release-1.3
Commit: 3da6aa8326b0dafc4271e6494ddc968312bd1b50
Parents: 471263c
Author: Stefan Richter <s....@data-artisans.com>
Authored: Sun May 14 15:36:49 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 15:36:49 2017 +0200
----------------------------------------------------------------------
.../flink/configuration/BlobServerOptions.java | 76 --------------------
.../flink/configuration/ConfigConstants.java | 40 +++++------
.../apache/flink/runtime/blob/BlobCache.java | 9 +--
.../apache/flink/runtime/blob/BlobClient.java | 5 +-
.../apache/flink/runtime/blob/BlobServer.java | 22 +++---
.../flink/runtime/blob/BlobClientSslTest.java | 5 +-
.../flink/runtime/blob/BlobServerRangeTest.java | 8 +--
.../jobmanager/JobManagerStartupTest.java | 4 +-
8 files changed, 44 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3da6aa83/flink-core/src/main/java/org/apache/flink/configuration/BlobServerOptions.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/BlobServerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/BlobServerOptions.java
deleted file mode 100644
index e27c29f..0000000
--- a/flink-core/src/main/java/org/apache/flink/configuration/BlobServerOptions.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flink.configuration;
-
-import org.apache.flink.annotation.PublicEvolving;
-
-import static org.apache.flink.configuration.ConfigOptions.key;
-
-/**
- * Configuration options for the BlobServer.
- */
-@PublicEvolving
-public class BlobServerOptions {
-
- /**
- * The config parameter defining the storage directory to be used by the blob server.
- */
- public static final ConfigOption<String> STORAGE_DIRECTORY =
- key("blob.storage.directory")
- .noDefaultValue();
-
- /**
- * The config parameter defining number of retires for failed BLOB fetches.
- */
- public static final ConfigOption<Integer> FETCH_RETRIES =
- key("blob.fetch.retries")
- .defaultValue(5);
-
- /**
- * The config parameter defining the maximum number of concurrent BLOB fetches that the JobManager serves.
- */
- public static final ConfigOption<Integer> FETCH_CONCURRENT =
- key("blob.fetch.num-concurrent")
- .defaultValue(50);
-
- /**
- * The config parameter defining the backlog of BLOB fetches on the JobManager.
- */
- public static final ConfigOption<Integer> FETCH_BACKLOG =
- key("blob.fetch.backlog")
- .defaultValue(1000);
-
- /**
- * The config parameter defining the server port of the blob service.
- * The port can either be a port, such as "9123",
- * a range of ports: "50100-50200"
- * or a list of ranges and or points: "50100-50200,50300-50400,51234"
- *
- * Setting the port to 0 will let the OS choose an available port.
- */
- public static final ConfigOption<String> PORT =
- key("blob.server.port")
- .defaultValue("0");
-
- /**
- * Flag to override ssl support for the blob service transport.
- */
- public static final ConfigOption<Boolean> SSL_ENABLED =
- key("blob.service.ssl.enabled")
- .defaultValue(true);
-}
http://git-wip-us.apache.org/repos/asf/flink/blob/3da6aa83/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
index b5b5486..c3704be 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -139,39 +139,36 @@ public final class ConfigConstants {
public static final String RESOURCE_MANAGER_IPC_PORT_KEY = "resourcemanager.rpc.port";
/**
- * @deprecated use {@link BlobServerOptions#STORAGE_DIRECTORY} instead
+ * The config parameter defining the storage directory to be used by the blob server.
*/
- @Deprecated
public static final String BLOB_STORAGE_DIRECTORY_KEY = "blob.storage.directory";
/**
- * @deprecated use {@link BlobServerOptions#FETCH_RETRIES} instead
+ * The config parameter defining number of retires for failed BLOB fetches.
*/
- @Deprecated
public static final String BLOB_FETCH_RETRIES_KEY = "blob.fetch.retries";
/**
- * @deprecated use {@link BlobServerOptions#FETCH_CONCURRENT} instead
+ * The config parameter defining the maximum number of concurrent BLOB fetches that the JobManager serves.
*/
- @Deprecated
public static final String BLOB_FETCH_CONCURRENT_KEY = "blob.fetch.num-concurrent";
/**
- * @deprecated use {@link BlobServerOptions#FETCH_BACKLOG} instead
+ * The config parameter defining the backlog of BLOB fetches on the JobManager
*/
- @Deprecated
public static final String BLOB_FETCH_BACKLOG_KEY = "blob.fetch.backlog";
/**
- * @deprecated use {@link BlobServerOptions#PORT} instead
+ * The config parameter defining the server port of the blob service.
+ * The port can either be a port, such as "9123",
+ * a range of ports: "50100-50200"
+ * or a list of ranges and or points: "50100-50200,50300-50400,51234"
+ *
+ * Setting the port to 0 will let the OS choose an available port.
*/
- @Deprecated
public static final String BLOB_SERVER_PORT = "blob.server.port";
- /**
- * @deprecated use {@link BlobServerOptions#SSL_ENABLED} instead
- */
- @Deprecated
+ /** Flag to override ssl support for the blob service transport */
public static final String BLOB_SERVICE_SSL_ENABLED = "blob.service.ssl.enabled";
/**
@@ -1097,33 +1094,28 @@ public final class ConfigConstants {
public static final int DEFAULT_RESOURCE_MANAGER_IPC_PORT = 0;
/**
- * @deprecated use {@link BlobServerOptions#SSL_ENABLED} instead
+ * The default value to override ssl support for blob service transport
*/
- @Deprecated
public static final boolean DEFAULT_BLOB_SERVICE_SSL_ENABLED = true;
/**
- * @deprecated use {@link BlobServerOptions#FETCH_RETRIES} instead
+ * Default number of retries for failed BLOB fetches.
*/
- @Deprecated
public static final int DEFAULT_BLOB_FETCH_RETRIES = 5;
/**
- * @deprecated use {@link BlobServerOptions#FETCH_CONCURRENT} instead
+ * Default number of concurrent BLOB fetch operations.
*/
- @Deprecated
public static final int DEFAULT_BLOB_FETCH_CONCURRENT = 50;
/**
- * @deprecated use {@link BlobServerOptions#FETCH_BACKLOG} instead
+ * Default BLOB fetch connection backlog.
*/
- @Deprecated
public static final int DEFAULT_BLOB_FETCH_BACKLOG = 1000;
/**
- * @deprecated use {@link BlobServerOptions#PORT} instead
+ * Default BLOB server port. 0 means ephemeral port.
*/
- @Deprecated
public static final String DEFAULT_BLOB_SERVER_PORT = "0";
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/3da6aa83/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java
index 23c7e63..2587b15 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobCache.java
@@ -18,7 +18,7 @@
package org.apache.flink.runtime.blob;
-import org.apache.flink.configuration.BlobServerOptions;
+import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.util.FileUtils;
@@ -129,18 +129,19 @@ public final class BlobCache implements BlobService {
this.blobStore = blobStore;
// configure and create the storage directory
- String storageDirectory = blobClientConfig.getString(BlobServerOptions.STORAGE_DIRECTORY);
+ String storageDirectory = blobClientConfig.getString(ConfigConstants.BLOB_STORAGE_DIRECTORY_KEY, null);
this.storageDir = BlobUtils.initStorageDirectory(storageDirectory);
LOG.info("Created BLOB cache storage directory " + storageDir);
// configure the number of fetch retries
- final int fetchRetries = blobClientConfig.getInteger(BlobServerOptions.FETCH_RETRIES);
+ final int fetchRetries = blobClientConfig.getInteger(
+ ConfigConstants.BLOB_FETCH_RETRIES_KEY, ConfigConstants.DEFAULT_BLOB_FETCH_RETRIES);
if (fetchRetries >= 0) {
this.numFetchRetries = fetchRetries;
}
else {
LOG.warn("Invalid value for {}. System will attempt no retires on failed fetches of BLOBs.",
- BlobServerOptions.FETCH_RETRIES.key());
+ ConfigConstants.BLOB_FETCH_RETRIES_KEY);
this.numFetchRetries = 0;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/3da6aa83/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobClient.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobClient.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobClient.java
index 49e54a1..ea90f54 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobClient.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobClient.java
@@ -19,7 +19,7 @@
package org.apache.flink.runtime.blob;
import org.apache.flink.api.common.JobID;
-import org.apache.flink.configuration.BlobServerOptions;
+import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FSDataInputStream;
import org.apache.flink.core.fs.FileSystem;
@@ -92,7 +92,8 @@ public final class BlobClient implements Closeable {
// Check if ssl is enabled
SSLContext clientSSLContext = null;
if (clientConfig != null &&
- clientConfig.getBoolean(BlobServerOptions.SSL_ENABLED)) {
+ clientConfig.getBoolean(ConfigConstants.BLOB_SERVICE_SSL_ENABLED,
+ ConfigConstants.DEFAULT_BLOB_SERVICE_SSL_ENABLED)) {
clientSSLContext = SSLUtils.createSSLClientContext(clientConfig);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/3da6aa83/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java
index 0e15777..8a70559 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java
@@ -19,7 +19,7 @@
package org.apache.flink.runtime.blob;
import org.apache.flink.api.common.JobID;
-import org.apache.flink.configuration.BlobServerOptions;
+import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.jobmanager.HighAvailabilityMode;
@@ -111,32 +111,34 @@ public class BlobServer extends Thread implements BlobService {
this.blobStore = checkNotNull(blobStore);
// configure and create the storage directory
- String storageDirectory = config.getString(BlobServerOptions.STORAGE_DIRECTORY);
+ String storageDirectory = config.getString(ConfigConstants.BLOB_STORAGE_DIRECTORY_KEY, null);
this.storageDir = BlobUtils.initStorageDirectory(storageDirectory);
LOG.info("Created BLOB server storage directory {}", storageDir);
// configure the maximum number of concurrent connections
- final int maxConnections = config.getInteger(BlobServerOptions.FETCH_CONCURRENT);
+ final int maxConnections = config.getInteger(
+ ConfigConstants.BLOB_FETCH_CONCURRENT_KEY, ConfigConstants.DEFAULT_BLOB_FETCH_CONCURRENT);
if (maxConnections >= 1) {
this.maxConnections = maxConnections;
}
else {
LOG.warn("Invalid value for maximum connections in BLOB server: {}. Using default value of {}",
- maxConnections, BlobServerOptions.FETCH_CONCURRENT.defaultValue());
- this.maxConnections = BlobServerOptions.FETCH_CONCURRENT.defaultValue();
+ maxConnections, ConfigConstants.DEFAULT_BLOB_FETCH_CONCURRENT);
+ this.maxConnections = ConfigConstants.DEFAULT_BLOB_FETCH_CONCURRENT;
}
// configure the backlog of connections
- int backlog = config.getInteger(BlobServerOptions.FETCH_BACKLOG);
+ int backlog = config.getInteger(ConfigConstants.BLOB_FETCH_BACKLOG_KEY, ConfigConstants.DEFAULT_BLOB_FETCH_BACKLOG);
if (backlog < 1) {
LOG.warn("Invalid value for BLOB connection backlog: {}. Using default value of {}",
- backlog, BlobServerOptions.FETCH_BACKLOG.defaultValue());
- backlog = BlobServerOptions.FETCH_BACKLOG.defaultValue();
+ backlog, ConfigConstants.DEFAULT_BLOB_FETCH_BACKLOG);
+ backlog = ConfigConstants.DEFAULT_BLOB_FETCH_BACKLOG;
}
this.shutdownHook = BlobUtils.addShutdownHook(this, LOG);
- if (config.getBoolean(BlobServerOptions.SSL_ENABLED)) {
+ if (config.getBoolean(ConfigConstants.BLOB_SERVICE_SSL_ENABLED,
+ ConfigConstants.DEFAULT_BLOB_SERVICE_SSL_ENABLED)) {
try {
serverSSLContext = SSLUtils.createSSLServerContext(config);
} catch (Exception e) {
@@ -146,7 +148,7 @@ public class BlobServer extends Thread implements BlobService {
// ----------------------- start the server -------------------
- String serverPortRange = config.getString(BlobServerOptions.PORT);
+ String serverPortRange = config.getString(ConfigConstants.BLOB_SERVER_PORT, ConfigConstants.DEFAULT_BLOB_SERVER_PORT);
Iterator<Integer> ports = NetUtils.getPortRangeFromString(serverPortRange);
http://git-wip-us.apache.org/repos/asf/flink/blob/3da6aa83/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobClientSslTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobClientSslTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobClientSslTest.java
index 27603d0..5054107 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobClientSslTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobClientSslTest.java
@@ -31,7 +31,6 @@ import java.security.MessageDigest;
import java.util.Collections;
import java.util.List;
-import org.apache.flink.configuration.BlobServerOptions;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.api.common.JobID;
@@ -92,7 +91,7 @@ public class BlobClientSslTest {
try {
Configuration config = new Configuration();
config.setBoolean(ConfigConstants.SECURITY_SSL_ENABLED, true);
- config.setBoolean(BlobServerOptions.SSL_ENABLED, false);
+ config.setBoolean(ConfigConstants.BLOB_SERVICE_SSL_ENABLED, false);
config.setString(ConfigConstants.SECURITY_SSL_KEYSTORE, "src/test/resources/local127.keystore");
config.setString(ConfigConstants.SECURITY_SSL_KEYSTORE_PASSWORD, "password");
config.setString(ConfigConstants.SECURITY_SSL_KEY_PASSWORD, "password");
@@ -105,7 +104,7 @@ public class BlobClientSslTest {
clientConfig = new Configuration();
clientConfig.setBoolean(ConfigConstants.SECURITY_SSL_ENABLED, true);
- clientConfig.setBoolean(BlobServerOptions.SSL_ENABLED, false);
+ clientConfig.setBoolean(ConfigConstants.BLOB_SERVICE_SSL_ENABLED, false);
clientConfig.setString(ConfigConstants.SECURITY_SSL_TRUSTSTORE, "src/test/resources/local127.truststore");
clientConfig.setString(ConfigConstants.SECURITY_SSL_TRUSTSTORE_PASSWORD, "password");
}
http://git-wip-us.apache.org/repos/asf/flink/blob/3da6aa83/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerRangeTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerRangeTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerRangeTest.java
index c3762aa..ea0eb94 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerRangeTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerRangeTest.java
@@ -18,7 +18,7 @@
package org.apache.flink.runtime.blob;
-import org.apache.flink.configuration.BlobServerOptions;
+import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.util.NetUtils;
import org.apache.flink.util.TestLogger;
@@ -38,7 +38,7 @@ public class BlobServerRangeTest extends TestLogger {
@Test
public void testOnEphemeralPort() throws IOException {
Configuration conf = new Configuration();
- conf.setString(BlobServerOptions.PORT, "0");
+ conf.setString(ConfigConstants.BLOB_SERVER_PORT, "0");
BlobServer srv = new BlobServer(conf);
srv.shutdown();
}
@@ -59,7 +59,7 @@ public class BlobServerRangeTest extends TestLogger {
}
Configuration conf = new Configuration();
- conf.setString(BlobServerOptions.PORT, String.valueOf(socket.getLocalPort()));
+ conf.setString(ConfigConstants.BLOB_SERVER_PORT, String.valueOf(socket.getLocalPort()));
// this thing is going to throw an exception
try {
@@ -88,7 +88,7 @@ public class BlobServerRangeTest extends TestLogger {
}
int availablePort = NetUtils.getAvailablePort();
Configuration conf = new Configuration();
- conf.setString(BlobServerOptions.PORT, sockets[0].getLocalPort() + "," + sockets[1].getLocalPort() + "," + availablePort);
+ conf.setString(ConfigConstants.BLOB_SERVER_PORT, sockets[0].getLocalPort() + "," + sockets[1].getLocalPort() + "," + availablePort);
// this thing is going to throw an exception
try {
http://git-wip-us.apache.org/repos/asf/flink/blob/3da6aa83/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
index a906d9b..9ac6873 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
@@ -30,7 +30,7 @@ import java.util.List;
import com.google.common.io.Files;
-import org.apache.flink.configuration.BlobServerOptions;
+import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.util.StartupUtils;
import org.apache.flink.util.NetUtils;
@@ -130,7 +130,7 @@ public class JobManagerStartupTest extends TestLogger {
}
Configuration failConfig = new Configuration();
String nonExistDirectory = new File(blobStorageDirectory, DOES_NOT_EXISTS_NO_SIR).getAbsolutePath();
- failConfig.setString(BlobServerOptions.STORAGE_DIRECTORY, nonExistDirectory);
+ failConfig.setString(ConfigConstants.BLOB_STORAGE_DIRECTORY_KEY, nonExistDirectory);
try {
JobManager.runJobManager(failConfig, JobManagerMode.CLUSTER, "localhost", portNum);
[2/9] flink git commit: Revert "[hotfix] Minutiae"
Posted by sr...@apache.org.
Revert "[hotfix] Minutiae"
This reverts commit 9fe61355004164cf41a3e01a96218c11ea876daa.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0fe8dfe5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0fe8dfe5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0fe8dfe5
Branch: refs/heads/release-1.3
Commit: 0fe8dfe54484022446a28bb40654d22353293bd4
Parents: 3da6aa8
Author: Stefan Richter <s....@data-artisans.com>
Authored: Sun May 14 15:37:06 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 15:37:06 2017 +0200
----------------------------------------------------------------------
.../org/apache/flink/client/CliFrontend.java | 2 +-
.../api/io/avro/AvroRecordInputFormatTest.java | 26 ++++-------
.../connectors/fs/SequenceFileWriter.java | 2 +-
.../common/accumulators/AccumulatorHelper.java | 2 +-
.../flink/api/java/typeutils/TypeExtractor.java | 2 +-
.../AbstractGenericArraySerializerTest.java | 16 +++----
.../AbstractGenericTypeComparatorTest.java | 6 ++-
.../AbstractGenericTypeSerializerTest.java | 2 +-
.../typeutils/runtime/kryo/SerializersTest.java | 2 +-
.../apache/flink/types/BasicTypeInfoTest.java | 9 ++--
.../flink/api/java/operators/Grouping.java | 2 +-
.../java/functions/SelectByFunctionsTest.java | 18 ++++----
.../java/functions/SemanticPropUtilTest.java | 32 ++++++-------
.../traversals/GraphCreatingVisitor.java | 4 +-
.../flink/runtime/util/SerializedThrowable.java | 10 ++---
.../scheduler/SchedulerSlotSharingTest.java | 2 +-
.../api/operator/SelectByFunctionTest.scala | 18 ++++----
.../operators/AbstractStreamOperatorTest.java | 47 ++++++++++----------
.../runtime/io/BarrierTrackerTest.java | 2 +-
.../test/accumulators/AccumulatorITCase.java | 2 +-
20 files changed, 99 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
index 62fa402..74d5f5d 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
@@ -860,7 +860,7 @@ public class CliFrontend {
Map<String, Object> accumulatorsResult = execResult.getAllAccumulatorResults();
if (accumulatorsResult.size() > 0) {
System.out.println("Accumulator Results: ");
- System.out.println(AccumulatorHelper.getResultsFormatted(accumulatorsResult));
+ System.out.println(AccumulatorHelper.getResultsFormated(accumulatorsResult));
}
} else {
logAndSysout("Job has been submitted with JobID " + result.getJobID());
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroRecordInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroRecordInputFormatTest.java b/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroRecordInputFormatTest.java
index 3b6ad63..91a9612 100644
--- a/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroRecordInputFormatTest.java
+++ b/flink-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroRecordInputFormatTest.java
@@ -18,6 +18,14 @@
package org.apache.flink.api.io.avro;
+import static org.junit.Assert.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
import org.apache.avro.Schema;
import org.apache.avro.file.DataFileReader;
import org.apache.avro.file.DataFileWriter;
@@ -51,22 +59,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
/**
* Test the avro input format.
* (The testcase is mostly the getting started tutorial of avro)
@@ -281,7 +273,7 @@ public class AvroRecordInputFormatTest {
DatumReader<GenericData.Record> datumReader = new GenericDatumReader<>(userSchema);
try (FileReader<GenericData.Record> dataFileReader = DataFileReader.openReader(testFile, datumReader)) {
- // initialize Record by reading it from disk (that's easier than creating it by hand)
+ // initialize Record by reading it from disk (thats easier than creating it by hand)
GenericData.Record rec = new GenericData.Record(userSchema);
dataFileReader.next(rec);
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/SequenceFileWriter.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/SequenceFileWriter.java b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/SequenceFileWriter.java
index 32cadec..08c0d0a 100644
--- a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/SequenceFileWriter.java
+++ b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/SequenceFileWriter.java
@@ -38,7 +38,7 @@ import java.io.IOException;
/**
* A {@link Writer} that writes the bucket files as Hadoop {@link SequenceFile SequenceFiles}.
* The input to the {@link BucketingSink} must
- * be a {@link org.apache.flink.api.java.tuple.Tuple2} of two Hadoop
+ * be a {@link org.apache.flink.api.java.tuple.Tuple2} of two Hadopo
* {@link org.apache.hadoop.io.Writable Writables}.
*
* @param <K> The type of the first tuple field.
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java
index 3282302..1a87235 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java
@@ -112,7 +112,7 @@ public class AccumulatorHelper {
return resultMap;
}
- public static String getResultsFormatted(Map<String, Object> map) {
+ public static String getResultsFormated(Map<String, Object> map) {
StringBuilder builder = new StringBuilder();
for (Map.Entry<String, Object> entry : map.entrySet()) {
builder
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
index 112ca38..f1bf957 100644
--- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
+++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
@@ -394,7 +394,7 @@ public class TypeExtractor {
* @param inputTypeArgumentIndex Index of the type argument of function's first parameter
* specifying the input type if it is wrapped (Iterable, Map,
* etc.). Otherwise -1.
- * @param outputTypeArgumentIndex Index of the type argument of function's second parameter
+ * @param outputTypeArgumentIndex Index of the type argument of functions second parameter
* specifying the output type if it is wrapped in a Collector.
* Otherwise -1.
* @param inType Type of the input elements (In case of an iterable, it is the element type)
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericArraySerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericArraySerializerTest.java
index 7386e6e..307a3d2 100644
--- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericArraySerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericArraySerializerTest.java
@@ -18,6 +18,12 @@
package org.apache.flink.api.java.typeutils.runtime;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Random;
+
+import org.junit.Assert;
+import org.junit.Test;
import org.apache.flink.api.common.typeutils.SerializerTestInstance;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.common.typeutils.base.GenericArraySerializer;
@@ -28,12 +34,6 @@ import org.apache.flink.api.java.typeutils.runtime.AbstractGenericTypeSerializer
import org.apache.flink.api.java.typeutils.runtime.AbstractGenericTypeSerializerTest.ComplexNestedObject2;
import org.apache.flink.api.java.typeutils.runtime.AbstractGenericTypeSerializerTest.SimpleTypes;
import org.apache.flink.util.StringUtils;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Random;
public abstract class AbstractGenericArraySerializerTest {
@@ -110,11 +110,11 @@ public abstract class AbstractGenericArraySerializerTest {
@Test
public void testBeanStyleObjects() {
{
- Book b1 = new Book(976243875L, "The Serialization Odyssey", 42);
+ Book b1 = new Book(976243875L, "The Serialization Odysse", 42);
Book b2 = new Book(0L, "Debugging byte streams", 1337);
Book b3 = new Book(-1L, "Low level interfaces", 0xC0FFEE);
Book b4 = new Book(Long.MAX_VALUE, "The joy of bits and bytes", 0xDEADBEEF);
- Book b5 = new Book(Long.MIN_VALUE, "Winning a prize for creative test strings", 0xBADF00);
+ Book b5 = new Book(Long.MIN_VALUE, "Winnign a prize for creative test strings", 0xBADF00);
Book b6 = new Book(-2L, "Distributed Systems", 0xABCDEF0123456789L);
runTests( new Book[] {b1, b2},
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeComparatorTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeComparatorTest.java
index 44464a3..ef168d8 100644
--- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeComparatorTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeComparatorTest.java
@@ -30,14 +30,16 @@ abstract public class AbstractGenericTypeComparatorTest {
@Test
public void testString() {
- runTests("",
+ runTests(new String[]{
+ "",
"Lorem Ipsum Dolor Omit Longer",
"aaaa",
"abcd",
"abce",
"abdd",
"accd",
- "bbcd");
+ "bbcd"
+ });
}
@Test
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeSerializerTest.java
index a75208a..059c78d 100644
--- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeSerializerTest.java
@@ -88,7 +88,7 @@ abstract public class AbstractGenericTypeSerializerTest {
@Test
public void testBeanStyleObjects() {
{
- Book b1 = new Book(976243875L, "The Serialization Odyssey", 42);
+ Book b1 = new Book(976243875L, "The Serialization Odysse", 42);
Book b2 = new Book(0L, "Debugging byte streams", 1337);
Book b3 = new Book(-1L, "Low level interfaces", 0xC0FFEE);
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/SerializersTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/SerializersTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/SerializersTest.java
index 4a39f8f..7c6d023 100644
--- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/SerializersTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/SerializersTest.java
@@ -46,7 +46,7 @@ public class SerializersTest {
public static class Nested1 {
private FromNested fromNested;
- private Path yodaInterval;
+ private Path yodaIntervall;
}
public static class ClassWithNested {
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-core/src/test/java/org/apache/flink/types/BasicTypeInfoTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/types/BasicTypeInfoTest.java b/flink-core/src/test/java/org/apache/flink/types/BasicTypeInfoTest.java
index 5707701..c090b76 100644
--- a/flink-core/src/test/java/org/apache/flink/types/BasicTypeInfoTest.java
+++ b/flink-core/src/test/java/org/apache/flink/types/BasicTypeInfoTest.java
@@ -11,23 +11,22 @@
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WNTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.flink.types;
+import java.math.BigDecimal;
+import java.math.BigInteger;
import org.apache.flink.api.common.typeinfo.BasicTypeInfo;
import org.apache.flink.util.TestLogger;
import org.junit.Test;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import java.util.Date;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.*;
public class BasicTypeInfoTest extends TestLogger {
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-java/src/main/java/org/apache/flink/api/java/operators/Grouping.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/Grouping.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/Grouping.java
index dbaaa9d..8601c33 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/Grouping.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/Grouping.java
@@ -29,7 +29,7 @@ import org.apache.flink.api.java.DataSet;
* Grouping is an intermediate step for a transformation on a grouped DataSet.<br>
* The following transformation can be applied on Grouping:
* <ul>
- * <li>{@link UnsortedGrouping#reduce(org.apache.flink.api.common.functions.ReduceFunction)},</li>
+ * <li>{@link UnsortedGrouping#reduce(org.apache.flink.api.common.functions.ReduceFunction)},</li>
* <li>{@link UnsortedGrouping#reduceGroup(org.apache.flink.api.common.functions.GroupReduceFunction)}, and</li>
* <li>{@link UnsortedGrouping#aggregate(org.apache.flink.api.java.aggregation.Aggregations, int)}.</li>
* </ul>
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-java/src/test/java/org/apache/flink/api/java/functions/SelectByFunctionsTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/functions/SelectByFunctionsTest.java b/flink-java/src/test/java/org/apache/flink/api/java/functions/SelectByFunctionsTest.java
index 52b59ec..f40c0ca 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/functions/SelectByFunctionsTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/functions/SelectByFunctionsTest.java
@@ -49,7 +49,7 @@ public class SelectByFunctionsTest {
Assert.assertSame("SelectByMax must return bigger tuple", bigger, maxByTuple.reduce(smaller, bigger));
Assert.assertSame("SelectByMax must return bigger tuple", bigger, maxByTuple.reduce(bigger, smaller));
} catch (Exception e) {
- Assert.fail("No exception should be thrown while comparing both tuples");
+ Assert.fail("No exception should be thrown while comapring both tuples");
}
}
@@ -67,7 +67,7 @@ public class SelectByFunctionsTest {
Assert.assertSame("SelectByMax must return the first given tuple", specialCaseBigger, maxByTuple.reduce(specialCaseBigger, bigger));
Assert.assertSame("SelectByMax must return the first given tuple", bigger, maxByTuple.reduce(bigger, specialCaseBigger));
} catch (Exception e) {
- Assert.fail("No exception should be thrown while comparing both tuples");
+ Assert.fail("No exception should be thrown while comapring both tuples");
}
}
@@ -82,7 +82,7 @@ public class SelectByFunctionsTest {
Assert.assertSame("SelectByMax must return bigger tuple", bigger, maxByTuple.reduce(specialCaseBigger, bigger));
Assert.assertSame("SelectByMax must return bigger tuple", bigger, maxByTuple.reduce(bigger, specialCaseBigger));
} catch (Exception e) {
- Assert.fail("No exception should be thrown while comparing both tuples");
+ Assert.fail("No exception should be thrown while comapring both tuples");
}
}
@@ -97,7 +97,7 @@ public class SelectByFunctionsTest {
Assert.assertSame("SelectByMax must return bigger tuple", bigger, maxByTuple.reduce(smaller, bigger));
Assert.assertSame("SelectByMax must return bigger tuple", bigger, maxByTuple.reduce(bigger, smaller));
} catch (Exception e) {
- Assert.fail("No exception should be thrown while comparing both tuples");
+ Assert.fail("No exception should be thrown while comapring both tuples");
}
}
@@ -112,7 +112,7 @@ public class SelectByFunctionsTest {
Assert.assertSame("SelectByMax must return bigger tuple", bigger, maxByTuple.reduce(bigger, bigger));
Assert.assertSame("SelectByMax must return smaller tuple", smaller, maxByTuple.reduce(smaller, smaller));
} catch (Exception e) {
- Assert.fail("No exception should be thrown while comparing both tuples");
+ Assert.fail("No exception should be thrown while comapring both tuples");
}
}
@@ -129,7 +129,7 @@ public class SelectByFunctionsTest {
Assert.assertSame("SelectByMin must return smaller tuple", smaller, minByTuple.reduce(smaller, bigger));
Assert.assertSame("SelectByMin must return smaller tuple", smaller, minByTuple.reduce(bigger, smaller));
} catch (Exception e) {
- Assert.fail("No exception should be thrown while comparing both tuples");
+ Assert.fail("No exception should be thrown while comapring both tuples");
}
}
@@ -145,7 +145,7 @@ public class SelectByFunctionsTest {
Assert.assertSame("SelectByMin must return the first given tuple", specialCaseBigger, minByTuple.reduce(specialCaseBigger, bigger));
Assert.assertSame("SelectByMin must return the first given tuple", bigger, minByTuple.reduce(bigger, specialCaseBigger));
} catch (Exception e) {
- Assert.fail("No exception should be thrown while comparing both tuples");
+ Assert.fail("No exception should be thrown while comapring both tuples");
}
}
@@ -161,7 +161,7 @@ public class SelectByFunctionsTest {
Assert.assertSame("SelectByMin must return smaller tuple", smaller, minByTuple.reduce(specialCaseSmaller, smaller));
Assert.assertSame("SelectByMin must return smaller tuple", smaller, minByTuple.reduce(smaller, specialCaseSmaller));
} catch (Exception e) {
- Assert.fail("No exception should be thrown while comparing both tuples");
+ Assert.fail("No exception should be thrown while comapring both tuples");
}
}
@@ -176,7 +176,7 @@ public class SelectByFunctionsTest {
Assert.assertSame("SelectByMin must return smaller tuple", smaller, minByTuple.reduce(smaller, bigger));
Assert.assertSame("SelectByMin must return smaller tuple", smaller, minByTuple.reduce(bigger, smaller));
} catch (Exception e) {
- Assert.fail("No exception should be thrown while comparing both tuples");
+ Assert.fail("No exception should be thrown while comapring both tuples");
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java
index 453c022..b845e73 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java
@@ -324,7 +324,7 @@ public class SemanticPropUtilTest {
// --------------------------------------------------------------------------------------------
@Test
- public void testForwardedNoArrowIndividualStrings() {
+ public void testForwardedNoArrrowIndividualStrings() {
String[] forwardedFields = {"f2","f3","f0"};
SingleInputSemanticProperties sp = new SingleInputSemanticProperties();
SemanticPropUtil.getSemanticPropsSingleFromString(sp, forwardedFields, null, null, fiveIntTupleType, fiveIntTupleType);
@@ -335,7 +335,7 @@ public class SemanticPropUtilTest {
}
@Test
- public void testForwardedNoArrowOneString() {
+ public void testForwardedNoArrrowOneString() {
String[] forwardedFields = {"f2;f3;f0"};
SingleInputSemanticProperties sp = new SingleInputSemanticProperties();
SemanticPropUtil.getSemanticPropsSingleFromString(sp, forwardedFields, null, null, fiveIntTupleType, fiveIntTupleType);
@@ -360,7 +360,7 @@ public class SemanticPropUtilTest {
}
@Test
- public void testForwardedNoArrowSpaces() {
+ public void testForwardedNoArrrowSpaces() {
String[] forwardedFields = {" f2 ; f3 ; f0 "};
SingleInputSemanticProperties sp = new SingleInputSemanticProperties();
SemanticPropUtil.getSemanticPropsSingleFromString(sp, forwardedFields, null, null, fiveIntTupleType, fiveIntTupleType);
@@ -1219,11 +1219,11 @@ public class SemanticPropUtilTest {
@Test
public void testNonForwardedDual() {
- String[] nonForwardedFieldsFirst = { "f1;f2" };
- String[] nonForwardedFieldsSecond = { "f0" };
+ String[] nonNorwardedFieldsFirst = { "f1;f2" };
+ String[] nonNorwardedFieldsSecond = { "f0" };
DualInputSemanticProperties dsp = new DualInputSemanticProperties();
SemanticPropUtil.getSemanticPropsDualFromString(dsp, null, null,
- nonForwardedFieldsFirst, nonForwardedFieldsSecond, null, null, threeIntTupleType, threeIntTupleType, threeIntTupleType);
+ nonNorwardedFieldsFirst, nonNorwardedFieldsSecond, null, null, threeIntTupleType, threeIntTupleType, threeIntTupleType);
assertTrue(dsp.getForwardingTargetFields(0, 0).contains(0));
assertTrue(dsp.getForwardingTargetFields(0, 1).size() == 0);
@@ -1232,11 +1232,11 @@ public class SemanticPropUtilTest {
assertTrue(dsp.getForwardingTargetFields(1, 1).contains(1));
assertTrue(dsp.getForwardingTargetFields(1, 2).contains(2));
- nonForwardedFieldsFirst[0] = "f1";
- nonForwardedFieldsSecond[0] = "";
+ nonNorwardedFieldsFirst[0] = "f1";
+ nonNorwardedFieldsSecond[0] = "";
dsp = new DualInputSemanticProperties();
SemanticPropUtil.getSemanticPropsDualFromString(dsp, null, null,
- nonForwardedFieldsFirst, null, null, null, threeIntTupleType, fiveIntTupleType, threeIntTupleType);
+ nonNorwardedFieldsFirst, null, null, null, threeIntTupleType, fiveIntTupleType, threeIntTupleType);
assertTrue(dsp.getForwardingTargetFields(0, 0).contains(0));
assertTrue(dsp.getForwardingTargetFields(0, 1).size() == 0);
@@ -1245,11 +1245,11 @@ public class SemanticPropUtilTest {
assertTrue(dsp.getForwardingTargetFields(1, 1).size() == 0);
assertTrue(dsp.getForwardingTargetFields(1, 2).size() == 0);
- nonForwardedFieldsFirst[0] = "";
- nonForwardedFieldsSecond[0] = "f2;f0";
+ nonNorwardedFieldsFirst[0] = "";
+ nonNorwardedFieldsSecond[0] = "f2;f0";
dsp = new DualInputSemanticProperties();
SemanticPropUtil.getSemanticPropsDualFromString(dsp, null, null,
- null, nonForwardedFieldsSecond, null, null, fiveIntTupleType, threeIntTupleType, threeIntTupleType);
+ null, nonNorwardedFieldsSecond, null, null, fiveIntTupleType, threeIntTupleType, threeIntTupleType);
assertTrue(dsp.getForwardingTargetFields(0, 0).size() == 0);
assertTrue(dsp.getForwardingTargetFields(0, 1).size() == 0);
@@ -1283,19 +1283,19 @@ public class SemanticPropUtilTest {
@Test(expected = InvalidSemanticAnnotationException.class)
public void testNonForwardedDualInvalidTypes1() {
- String[] nonForwardedFieldsFirst = { "f1" };
+ String[] nonNorwardedFieldsFirst = { "f1" };
DualInputSemanticProperties dsp = new DualInputSemanticProperties();
SemanticPropUtil.getSemanticPropsDualFromString(dsp, null, null,
- nonForwardedFieldsFirst, null, null, null, fiveIntTupleType, threeIntTupleType, threeIntTupleType);
+ nonNorwardedFieldsFirst, null, null, null, fiveIntTupleType, threeIntTupleType, threeIntTupleType);
}
@Test(expected = InvalidSemanticAnnotationException.class)
public void testNonForwardedDualInvalidTypes2() {
- String[] nonForwardedFieldsSecond = { "f1" };
+ String[] nonNorwardedFieldsSecond = { "f1" };
DualInputSemanticProperties dsp = new DualInputSemanticProperties();
SemanticPropUtil.getSemanticPropsDualFromString(dsp, null, null,
- null, nonForwardedFieldsSecond, null, null, threeIntTupleType, pojoInTupleType, threeIntTupleType);
+ null, nonNorwardedFieldsSecond, null, null, threeIntTupleType, pojoInTupleType, threeIntTupleType);
}
@Test
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/GraphCreatingVisitor.java
----------------------------------------------------------------------
diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/GraphCreatingVisitor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/GraphCreatingVisitor.java
index 92217b5..3f3eae1 100644
--- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/GraphCreatingVisitor.java
+++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/GraphCreatingVisitor.java
@@ -76,8 +76,8 @@ import java.util.Map;
/**
* This traversal creates the optimizer DAG from a program.
* It works as a visitor that walks the program's flow in a depth-first fashion, starting from the data sinks.
- * During the descent it creates an optimizer node for each operator, respectively data source or sink.
- * During the ascent it connects the nodes to the full graph.
+ * During the descend, it creates an optimizer node for each operator, respectively data source or -sink.
+ * During the ascend, it connects the nodes to the full graph.
*/
public class GraphCreatingVisitor implements Visitor<Operator<?>> {
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializedThrowable.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializedThrowable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializedThrowable.java
index 63f4363..f6f08e4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializedThrowable.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializedThrowable.java
@@ -48,7 +48,7 @@ public class SerializedThrowable extends Exception implements Serializable {
private final String originalErrorClassName;
/** The original stack trace, to be printed */
- private final String fullStringifiedStackTrace;
+ private final String fullStingifiedStackTrace;
/** The original exception, not transported via serialization,
* because the class may not be part of the system class loader.
@@ -83,7 +83,7 @@ public class SerializedThrowable extends Exception implements Serializable {
// record the original exception's properties (name, stack prints)
this.originalErrorClassName = exception.getClass().getName();
- this.fullStringifiedStackTrace = ExceptionUtils.stringifyException(exception);
+ this.fullStingifiedStackTrace = ExceptionUtils.stringifyException(exception);
// mimic the original exception's stack trace
setStackTrace(exception.getStackTrace());
@@ -106,7 +106,7 @@ public class SerializedThrowable extends Exception implements Serializable {
SerializedThrowable other = (SerializedThrowable) exception;
this.serializedException = other.serializedException;
this.originalErrorClassName = other.originalErrorClassName;
- this.fullStringifiedStackTrace = other.fullStringifiedStackTrace;
+ this.fullStingifiedStackTrace = other.fullStingifiedStackTrace;
this.cachedException = other.cachedException;
this.setStackTrace(other.getStackTrace());
this.initCause(other.getCause());
@@ -145,13 +145,13 @@ public class SerializedThrowable extends Exception implements Serializable {
@Override
public void printStackTrace(PrintStream s) {
- s.print(fullStringifiedStackTrace);
+ s.print(fullStingifiedStackTrace);
s.flush();
}
@Override
public void printStackTrace(PrintWriter s) {
- s.print(fullStringifiedStackTrace);
+ s.print(fullStingifiedStackTrace);
s.flush();
}
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java
index c049593..5238e95 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java
@@ -320,7 +320,7 @@ public class SchedulerSlotSharingTest {
}
@Test
- public void allocateSlotWithTemporarilyEmptyVertexGroup() {
+ public void allocateSlotWithTemprarilyEmptyVertexGroup() {
try {
JobVertexID jid1 = new JobVertexID();
JobVertexID jid2 = new JobVertexID();
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-scala/src/test/scala/org/apache/flink/api/operator/SelectByFunctionTest.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/test/scala/org/apache/flink/api/operator/SelectByFunctionTest.scala b/flink-scala/src/test/scala/org/apache/flink/api/operator/SelectByFunctionTest.scala
index d6af6bd..291df79 100644
--- a/flink-scala/src/test/scala/org/apache/flink/api/operator/SelectByFunctionTest.scala
+++ b/flink-scala/src/test/scala/org/apache/flink/api/operator/SelectByFunctionTest.scala
@@ -54,7 +54,7 @@ class SelectByFunctionTest {
bigger, maxByTuple.reduce(bigger, smaller))
} catch {
case e : Exception =>
- Assert.fail("No exception should be thrown while comparing both tuples")
+ Assert.fail("No exception should be thrown while comapring both tuples")
}
}
@@ -77,7 +77,7 @@ class SelectByFunctionTest {
bigger, maxByTuple.reduce(bigger, specialCaseBigger))
} catch {
case e : Exception => Assert.fail("No exception should be thrown " +
- "while comparing both tuples")
+ "while comapring both tuples")
}
}
@@ -95,7 +95,7 @@ class SelectByFunctionTest {
bigger, maxByTuple.reduce(bigger, specialCaseBigger))
} catch {
case e : Exception => Assert.fail("No exception should be thrown" +
- " while comparing both tuples")
+ " while comapring both tuples")
}
}
@@ -113,7 +113,7 @@ class SelectByFunctionTest {
bigger, maxByTuple.reduce(bigger, smaller))
} catch {
case e : Exception => Assert.fail("No exception should be thrown " +
- "while comparing both tuples")
+ "while comapring both tuples")
}
}
@@ -132,7 +132,7 @@ class SelectByFunctionTest {
smaller, maxByTuple.reduce(smaller, smaller))
} catch {
case e : Exception => Assert.fail("No exception should be thrown" +
- " while comparing both tuples")
+ " while comapring both tuples")
}
}
@@ -153,7 +153,7 @@ class SelectByFunctionTest {
smaller, minByTuple.reduce(bigger, smaller))
} catch {
case e : Exception => Assert.fail("No exception should be thrown " +
- "while comparing both tuples")
+ "while comapring both tuples")
}
}
@@ -174,7 +174,7 @@ class SelectByFunctionTest {
bigger, minByTuple.reduce(bigger, specialCaseBigger))
} catch {
case e : Exception => Assert.fail("No exception should be thrown " +
- "while comparing both tuples")
+ "while comapring both tuples")
}
}
@@ -195,7 +195,7 @@ class SelectByFunctionTest {
smaller, minByTuple.reduce(smaller, specialCaseSmaller))
} catch {
case e : Exception => Assert.fail("No exception should be thrown" +
- " while comparing both tuples")
+ " while comapring both tuples")
}
}
@@ -213,7 +213,7 @@ class SelectByFunctionTest {
smaller, minByTuple.reduce(bigger, smaller))
} catch {
case e : Exception => Assert.fail("No exception should be thrown" +
- " while comparing both tuples")
+ " while comapring both tuples")
}
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorTest.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorTest.java
index 67004ea..774ab4a 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorTest.java
@@ -17,6 +17,28 @@
*/
package org.apache.flink.streaming.api.operators;
+import static junit.framework.TestCase.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.verify;
+import static org.powermock.api.mockito.PowerMockito.doReturn;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.spy;
+import static org.powermock.api.mockito.PowerMockito.when;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.RunnableFuture;
import org.apache.flink.api.common.state.ValueStateDescriptor;
import org.apache.flink.api.common.typeinfo.BasicTypeInfo;
import org.apache.flink.api.common.typeutils.base.IntSerializer;
@@ -49,29 +71,6 @@ import org.mockito.internal.util.reflection.Whitebox;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.RunnableFuture;
-
-import static junit.framework.TestCase.assertTrue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.doReturn;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.spy;
-import static org.powermock.api.mockito.PowerMockito.when;
-import static org.powermock.api.mockito.PowerMockito.whenNew;
-
/**
* Tests for the facilities provided by {@link AbstractStreamOperator}. This mostly
* tests timers and state and whether they are correctly checkpointed/restored
@@ -511,7 +510,7 @@ public class AbstractStreamOperatorTest {
/**
* Tests that the created StateSnapshotContextSynchronousImpl is closed in case of a failing
- * Operator#snapshotState(StateSnapshotContextSynchronousImpl) call.
+ * Operator#snapshotState(StaetSnapshotContextSynchronousImpl) call.
*/
@Test
public void testFailingSnapshotMethod() throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/BarrierTrackerTest.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/BarrierTrackerTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/BarrierTrackerTest.java
index 8c66205..cbcf45d 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/BarrierTrackerTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/BarrierTrackerTest.java
@@ -526,7 +526,7 @@ public class BarrierTrackerTest {
final long expectedId = checkpointIDs[i++];
if (expectedId < 0) {
- assertEquals("wrong checkpoint id for checkpoint abort", -expectedId, checkpointId);
+ assertEquals("wrong checkpoint id for checkoint abort", -expectedId, checkpointId);
} else {
fail("got 'abortCheckpointOnBarrier()' when expecting an 'triggerCheckpointOnBarrier()'");
}
http://git-wip-us.apache.org/repos/asf/flink/blob/0fe8dfe5/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java
index 5f2b0a9..b4015e5 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java
@@ -74,7 +74,7 @@ public class AccumulatorITCase extends JavaProgramTestBase {
// Test accumulator results
System.out.println("Accumulator results:");
JobExecutionResult res = this.result;
- System.out.println(AccumulatorHelper.getResultsFormatted(res.getAllAccumulatorResults()));
+ System.out.println(AccumulatorHelper.getResultsFormated(res.getAllAccumulatorResults()));
Assert.assertEquals(Integer.valueOf(3), (Integer) res.getAccumulatorResult("num-lines"));
[9/9] flink git commit: Revert "Update Flink version to 1.4-SNAPSHOT"
Posted by sr...@apache.org.
Revert "Update Flink version to 1.4-SNAPSHOT"
This reverts commit fa49915afd6d5755636047a343dd92c092320f16.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/51818a28
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/51818a28
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/51818a28
Branch: refs/heads/release-1.3
Commit: 51818a283006650116a5da95ccba95fb0a1c65af
Parents: 75f7e9a
Author: Stefan Richter <s....@data-artisans.com>
Authored: Sun May 14 15:37:27 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 15:37:27 2017 +0200
----------------------------------------------------------------------
docs/_config.yml | 5 ++---
flink-annotations/pom.xml | 2 +-
flink-clients/pom.xml | 2 +-
flink-connectors/flink-avro/pom.xml | 2 +-
flink-connectors/flink-connector-cassandra/pom.xml | 2 +-
flink-connectors/flink-connector-elasticsearch-base/pom.xml | 2 +-
flink-connectors/flink-connector-elasticsearch/pom.xml | 2 +-
flink-connectors/flink-connector-elasticsearch2/pom.xml | 2 +-
flink-connectors/flink-connector-elasticsearch5/pom.xml | 2 +-
flink-connectors/flink-connector-filesystem/pom.xml | 2 +-
flink-connectors/flink-connector-kafka-0.10/pom.xml | 2 +-
flink-connectors/flink-connector-kafka-0.8/pom.xml | 2 +-
flink-connectors/flink-connector-kafka-0.9/pom.xml | 2 +-
flink-connectors/flink-connector-kafka-base/pom.xml | 2 +-
flink-connectors/flink-connector-kinesis/pom.xml | 2 +-
flink-connectors/flink-connector-nifi/pom.xml | 2 +-
flink-connectors/flink-connector-rabbitmq/pom.xml | 2 +-
flink-connectors/flink-connector-twitter/pom.xml | 2 +-
flink-connectors/flink-hadoop-compatibility/pom.xml | 2 +-
flink-connectors/flink-hbase/pom.xml | 2 +-
flink-connectors/flink-hcatalog/pom.xml | 2 +-
flink-connectors/flink-jdbc/pom.xml | 2 +-
flink-connectors/pom.xml | 2 +-
flink-contrib/flink-connector-wikiedits/pom.xml | 2 +-
flink-contrib/flink-statebackend-rocksdb/pom.xml | 2 +-
flink-contrib/flink-storm-examples/pom.xml | 2 +-
flink-contrib/flink-storm/pom.xml | 2 +-
flink-contrib/flink-streaming-contrib/pom.xml | 2 +-
flink-contrib/flink-tweet-inputformat/pom.xml | 2 +-
flink-contrib/pom.xml | 2 +-
flink-core/pom.xml | 2 +-
flink-dist/pom.xml | 2 +-
flink-examples/flink-examples-batch/pom.xml | 2 +-
flink-examples/flink-examples-streaming/pom.xml | 2 +-
flink-examples/flink-examples-table/pom.xml | 2 +-
flink-examples/pom.xml | 2 +-
flink-fs-tests/pom.xml | 2 +-
flink-java/pom.xml | 2 +-
flink-java8/pom.xml | 2 +-
flink-libraries/flink-cep-scala/pom.xml | 2 +-
flink-libraries/flink-cep/pom.xml | 2 +-
flink-libraries/flink-gelly-examples/pom.xml | 2 +-
flink-libraries/flink-gelly-scala/pom.xml | 2 +-
flink-libraries/flink-gelly/pom.xml | 2 +-
flink-libraries/flink-ml/pom.xml | 2 +-
flink-libraries/flink-python/pom.xml | 2 +-
flink-libraries/flink-table/pom.xml | 2 +-
flink-libraries/pom.xml | 2 +-
flink-mesos/pom.xml | 2 +-
flink-metrics/flink-metrics-core/pom.xml | 2 +-
flink-metrics/flink-metrics-dropwizard/pom.xml | 2 +-
flink-metrics/flink-metrics-ganglia/pom.xml | 2 +-
flink-metrics/flink-metrics-graphite/pom.xml | 2 +-
flink-metrics/flink-metrics-jmx/pom.xml | 2 +-
flink-metrics/flink-metrics-statsd/pom.xml | 2 +-
flink-metrics/pom.xml | 2 +-
flink-optimizer/pom.xml | 2 +-
flink-quickstart/flink-quickstart-java/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
flink-quickstart/flink-quickstart-scala/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
flink-quickstart/pom.xml | 2 +-
flink-runtime-web/pom.xml | 2 +-
flink-runtime/pom.xml | 2 +-
flink-scala-shell/pom.xml | 2 +-
flink-scala/pom.xml | 2 +-
flink-shaded-curator/flink-shaded-curator-recipes/pom.xml | 2 +-
flink-shaded-curator/flink-shaded-curator-test/pom.xml | 2 +-
flink-shaded-curator/pom.xml | 2 +-
flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml | 2 +-
flink-shaded-hadoop/flink-shaded-include-yarn-tests/pom.xml | 2 +-
flink-shaded-hadoop/pom.xml | 2 +-
flink-streaming-java/pom.xml | 2 +-
flink-streaming-scala/pom.xml | 2 +-
flink-test-utils-parent/flink-test-utils-junit/pom.xml | 2 +-
flink-test-utils-parent/flink-test-utils/pom.xml | 2 +-
flink-test-utils-parent/pom.xml | 2 +-
flink-tests/pom.xml | 2 +-
flink-yarn-tests/pom.xml | 2 +-
flink-yarn/pom.xml | 2 +-
pom.xml | 4 ++--
tools/change-version.sh | 4 ++--
tools/force-shading/pom.xml | 2 +-
83 files changed, 86 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index cf5ee10..9167ace 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -26,8 +26,8 @@
# to reference a specific Flink version, because this is the only place where
# we change the version for the complete docs when forking of a release branch
# etc.
-version: "1.4-SNAPSHOT"
-version_short: "1.4" # Used for the top navbar w/o snapshot suffix
+version: "1.3-SNAPSHOT"
+version_short: "1.3" # Used for the top navbar w/o snapshot suffix
is_snapshot_version: true
# This suffix is appended to the Scala-dependent Maven artifact names
@@ -46,7 +46,6 @@ is_latest: true
is_stable: false
previous_docs:
- 1.3: http://ci.apache.org/projects/flink/flink-docs-release-1.3
1.2: http://ci.apache.org/projects/flink/flink-docs-release-1.2
1.1: http://ci.apache.org/projects/flink/flink-docs-release-1.1
1.0: http://ci.apache.org/projects/flink/flink-docs-release-1.0
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/flink-annotations/pom.xml b/flink-annotations/pom.xml
index b375611..f3013a2 100644
--- a/flink-annotations/pom.xml
+++ b/flink-annotations/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-clients/pom.xml
----------------------------------------------------------------------
diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
index 8dde2e9..0e0c146 100644
--- a/flink-clients/pom.xml
+++ b/flink-clients/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-avro/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-avro/pom.xml b/flink-connectors/flink-avro/pom.xml
index 170b344..76914ee 100644
--- a/flink-connectors/flink-avro/pom.xml
+++ b/flink-connectors/flink-avro/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml
index d01c769..3080938 100644
--- a/flink-connectors/flink-connector-cassandra/pom.xml
+++ b/flink-connectors/flink-connector-cassandra/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-elasticsearch-base/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-elasticsearch-base/pom.xml b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
index e183354..32327ff 100644
--- a/flink-connectors/flink-connector-elasticsearch-base/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-elasticsearch/pom.xml b/flink-connectors/flink-connector-elasticsearch/pom.xml
index 07028df..eebdb4b 100644
--- a/flink-connectors/flink-connector-elasticsearch/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-elasticsearch2/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-elasticsearch2/pom.xml b/flink-connectors/flink-connector-elasticsearch2/pom.xml
index ec1b7da..30396dd 100644
--- a/flink-connectors/flink-connector-elasticsearch2/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch2/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-elasticsearch5/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-elasticsearch5/pom.xml b/flink-connectors/flink-connector-elasticsearch5/pom.xml
index 93d7bbe..a0bd328 100644
--- a/flink-connectors/flink-connector-elasticsearch5/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch5/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-filesystem/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
index 28d9962..a37cb68 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-kafka-0.10/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml b/flink-connectors/flink-connector-kafka-0.10/pom.xml
index c17386d..9fb0e61 100644
--- a/flink-connectors/flink-connector-kafka-0.10/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.10/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-kafka-0.8/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml b/flink-connectors/flink-connector-kafka-0.8/pom.xml
index ceccb3e..ff35300 100644
--- a/flink-connectors/flink-connector-kafka-0.8/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-kafka-0.9/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-0.9/pom.xml b/flink-connectors/flink-connector-kafka-0.9/pom.xml
index de4dedb..aa79a1d 100644
--- a/flink-connectors/flink-connector-kafka-0.9/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.9/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-kafka-base/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/pom.xml b/flink-connectors/flink-connector-kafka-base/pom.xml
index a6b2349..263eb9a 100644
--- a/flink-connectors/flink-connector-kafka-base/pom.xml
+++ b/flink-connectors/flink-connector-kafka-base/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-kinesis/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/pom.xml b/flink-connectors/flink-connector-kinesis/pom.xml
index 7515f31..080626f 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-nifi/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-nifi/pom.xml b/flink-connectors/flink-connector-nifi/pom.xml
index 67bfb29..7e9949f 100644
--- a/flink-connectors/flink-connector-nifi/pom.xml
+++ b/flink-connectors/flink-connector-nifi/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-rabbitmq/pom.xml b/flink-connectors/flink-connector-rabbitmq/pom.xml
index f26e57c..6973a0e 100644
--- a/flink-connectors/flink-connector-rabbitmq/pom.xml
+++ b/flink-connectors/flink-connector-rabbitmq/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-connector-twitter/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-twitter/pom.xml b/flink-connectors/flink-connector-twitter/pom.xml
index c683da1..3e68541 100644
--- a/flink-connectors/flink-connector-twitter/pom.xml
+++ b/flink-connectors/flink-connector-twitter/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-hadoop-compatibility/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml
index 003225b..6f20089 100644
--- a/flink-connectors/flink-hadoop-compatibility/pom.xml
+++ b/flink-connectors/flink-hadoop-compatibility/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml
index 6a295a8..4fc0556 100644
--- a/flink-connectors/flink-hbase/pom.xml
+++ b/flink-connectors/flink-hbase/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hcatalog/pom.xml b/flink-connectors/flink-hcatalog/pom.xml
index a975e53..ba0e142 100644
--- a/flink-connectors/flink-hcatalog/pom.xml
+++ b/flink-connectors/flink-hcatalog/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/flink-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-jdbc/pom.xml b/flink-connectors/flink-jdbc/pom.xml
index 38a0163..e96ab69 100644
--- a/flink-connectors/flink-jdbc/pom.xml
+++ b/flink-connectors/flink-jdbc/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/pom.xml b/flink-connectors/pom.xml
index 5af85b8..5d8ca70 100644
--- a/flink-connectors/pom.xml
+++ b/flink-connectors/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-contrib/flink-connector-wikiedits/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-connector-wikiedits/pom.xml b/flink-contrib/flink-connector-wikiedits/pom.xml
index fed8656..976e0dc 100644
--- a/flink-contrib/flink-connector-wikiedits/pom.xml
+++ b/flink-contrib/flink-connector-wikiedits/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-contrib</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-contrib/flink-statebackend-rocksdb/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-statebackend-rocksdb/pom.xml b/flink-contrib/flink-statebackend-rocksdb/pom.xml
index 2148706..bd890d9 100644
--- a/flink-contrib/flink-statebackend-rocksdb/pom.xml
+++ b/flink-contrib/flink-statebackend-rocksdb/pom.xml
@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-contrib</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-contrib/flink-storm-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm-examples/pom.xml b/flink-contrib/flink-storm-examples/pom.xml
index 4d9d76c..d042dde 100644
--- a/flink-contrib/flink-storm-examples/pom.xml
+++ b/flink-contrib/flink-storm-examples/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-contrib</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-contrib/flink-storm/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm/pom.xml b/flink-contrib/flink-storm/pom.xml
index 5189b3b..cc300b3 100644
--- a/flink-contrib/flink-storm/pom.xml
+++ b/flink-contrib/flink-storm/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-contrib</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-contrib/flink-streaming-contrib/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-streaming-contrib/pom.xml b/flink-contrib/flink-streaming-contrib/pom.xml
index 2df0231..a218f12 100644
--- a/flink-contrib/flink-streaming-contrib/pom.xml
+++ b/flink-contrib/flink-streaming-contrib/pom.xml
@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-contrib</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-contrib/flink-tweet-inputformat/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-tweet-inputformat/pom.xml b/flink-contrib/flink-tweet-inputformat/pom.xml
index 5e0d79c..95b6bd8 100644
--- a/flink-contrib/flink-tweet-inputformat/pom.xml
+++ b/flink-contrib/flink-tweet-inputformat/pom.xml
@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-contrib</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-contrib/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/pom.xml b/flink-contrib/pom.xml
index 2277465..75770a4 100644
--- a/flink-contrib/pom.xml
+++ b/flink-contrib/pom.xml
@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index 6b0d778..1efcb29 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 6d8debf..4b8b2c3 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-examples/flink-examples-batch/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-examples-batch/pom.xml b/flink-examples/flink-examples-batch/pom.xml
index 269f5a6..20dc951 100644
--- a/flink-examples/flink-examples-batch/pom.xml
+++ b/flink-examples/flink-examples-batch/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples_2.10</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-examples/flink-examples-streaming/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-examples-streaming/pom.xml b/flink-examples/flink-examples-streaming/pom.xml
index 2bacf25..adc819e 100644
--- a/flink-examples/flink-examples-streaming/pom.xml
+++ b/flink-examples/flink-examples-streaming/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples_2.10</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-examples/flink-examples-table/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-examples-table/pom.xml b/flink-examples/flink-examples-table/pom.xml
index ce1c701..684d883 100644
--- a/flink-examples/flink-examples-table/pom.xml
+++ b/flink-examples/flink-examples-table/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples_2.10</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/pom.xml b/flink-examples/pom.xml
index 409c8f1..a5939f5 100644
--- a/flink-examples/pom.xml
+++ b/flink-examples/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-fs-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index c354c80..84bba0a 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index 24fc0f6..55b3975 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-java8/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java8/pom.xml b/flink-java8/pom.xml
index 8de3b92..fbc5b3a 100644
--- a/flink-java8/pom.xml
+++ b/flink-java8/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-libraries/flink-cep-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep-scala/pom.xml b/flink-libraries/flink-cep-scala/pom.xml
index ca5bbce..57c594e 100644
--- a/flink-libraries/flink-cep-scala/pom.xml
+++ b/flink-libraries/flink-cep-scala/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-libraries</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-libraries/flink-cep/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/pom.xml b/flink-libraries/flink-cep/pom.xml
index 7f89c24..1c9f8be 100644
--- a/flink-libraries/flink-cep/pom.xml
+++ b/flink-libraries/flink-cep/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-libraries</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-libraries/flink-gelly-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/pom.xml b/flink-libraries/flink-gelly-examples/pom.xml
index 009781f..cd8d807 100644
--- a/flink-libraries/flink-gelly-examples/pom.xml
+++ b/flink-libraries/flink-gelly-examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-libraries</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-libraries/flink-gelly-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-scala/pom.xml b/flink-libraries/flink-gelly-scala/pom.xml
index 256fc53..dad7237 100644
--- a/flink-libraries/flink-gelly-scala/pom.xml
+++ b/flink-libraries/flink-gelly-scala/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-libraries</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-libraries/flink-gelly/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/pom.xml b/flink-libraries/flink-gelly/pom.xml
index d656bb3..fa09102 100644
--- a/flink-libraries/flink-gelly/pom.xml
+++ b/flink-libraries/flink-gelly/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-libraries</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-libraries/flink-ml/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-ml/pom.xml b/flink-libraries/flink-ml/pom.xml
index 8aa84d2..bea956e 100644
--- a/flink-libraries/flink-ml/pom.xml
+++ b/flink-libraries/flink-ml/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-libraries</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-libraries/flink-python/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-python/pom.xml b/flink-libraries/flink-python/pom.xml
index 9d2f0c3..8f75f25 100644
--- a/flink-libraries/flink-python/pom.xml
+++ b/flink-libraries/flink-python/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-libraries</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-libraries/flink-table/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml
index 8fa2ed2..c7440ab 100644
--- a/flink-libraries/flink-table/pom.xml
+++ b/flink-libraries/flink-table/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-libraries</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-libraries/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/pom.xml b/flink-libraries/pom.xml
index 5b4cf79..6dbc692 100644
--- a/flink-libraries/pom.xml
+++ b/flink-libraries/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-mesos/pom.xml
----------------------------------------------------------------------
diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
index d03144f..eea5da7 100644
--- a/flink-mesos/pom.xml
+++ b/flink-mesos/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-metrics/flink-metrics-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-core/pom.xml b/flink-metrics/flink-metrics-core/pom.xml
index 5f3a7a50..658847f 100644
--- a/flink-metrics/flink-metrics-core/pom.xml
+++ b/flink-metrics/flink-metrics-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-metrics/flink-metrics-dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-dropwizard/pom.xml b/flink-metrics/flink-metrics-dropwizard/pom.xml
index 2ba12e6..de57729 100644
--- a/flink-metrics/flink-metrics-dropwizard/pom.xml
+++ b/flink-metrics/flink-metrics-dropwizard/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-metrics/flink-metrics-ganglia/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-ganglia/pom.xml b/flink-metrics/flink-metrics-ganglia/pom.xml
index 244dee7..8f39edf 100644
--- a/flink-metrics/flink-metrics-ganglia/pom.xml
+++ b/flink-metrics/flink-metrics-ganglia/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-metrics/flink-metrics-graphite/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-graphite/pom.xml b/flink-metrics/flink-metrics-graphite/pom.xml
index b7d02bd..f8a21a0 100644
--- a/flink-metrics/flink-metrics-graphite/pom.xml
+++ b/flink-metrics/flink-metrics-graphite/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-metrics/flink-metrics-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-jmx/pom.xml b/flink-metrics/flink-metrics-jmx/pom.xml
index d738fc4..8063deb 100644
--- a/flink-metrics/flink-metrics-jmx/pom.xml
+++ b/flink-metrics/flink-metrics-jmx/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-metrics/flink-metrics-statsd/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-statsd/pom.xml b/flink-metrics/flink-metrics-statsd/pom.xml
index 80cfa32..a243b92 100644
--- a/flink-metrics/flink-metrics-statsd/pom.xml
+++ b/flink-metrics/flink-metrics-statsd/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/pom.xml b/flink-metrics/pom.xml
index e1b66c2..2ecf085 100644
--- a/flink-metrics/pom.xml
+++ b/flink-metrics/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-optimizer/pom.xml
----------------------------------------------------------------------
diff --git a/flink-optimizer/pom.xml b/flink-optimizer/pom.xml
index c347082..11e2e16 100644
--- a/flink-optimizer/pom.xml
+++ b/flink-optimizer/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-quickstart/flink-quickstart-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/pom.xml b/flink-quickstart/flink-quickstart-java/pom.xml
index 94574dc..31b45f7 100644
--- a/flink-quickstart/flink-quickstart-java/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/pom.xml
@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-quickstart</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
index 2fa1835..1e525fd 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -30,7 +30,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <flink.version>1.4-SNAPSHOT</flink.version>
+ <flink.version>1.3-SNAPSHOT</flink.version>
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>1.2.17</log4j.version>
</properties>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-quickstart/flink-quickstart-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/pom.xml b/flink-quickstart/flink-quickstart-scala/pom.xml
index 875fcca..4a5bc97 100644
--- a/flink-quickstart/flink-quickstart-scala/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/pom.xml
@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-quickstart</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
index 189bbce..5abe496 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -45,7 +45,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <flink.version>1.4-SNAPSHOT</flink.version>
+ <flink.version>1.3-SNAPSHOT</flink.version>
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>1.2.17</log4j.version>
</properties>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/pom.xml b/flink-quickstart/pom.xml
index 7e1b460..068bbc9 100644
--- a/flink-quickstart/pom.xml
+++ b/flink-quickstart/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-runtime-web/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml
index e7870f3..a50e01f 100644
--- a/flink-runtime-web/pom.xml
+++ b/flink-runtime-web/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 8abdc3c..2b42cc5 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-scala-shell/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index 0aadfc6..cf637d4 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 7be1e29..6c9a933 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml b/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
index fcc2759..5295a1a 100644
--- a/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
+++ b/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-curator</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-shaded-curator/flink-shaded-curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-curator/flink-shaded-curator-test/pom.xml b/flink-shaded-curator/flink-shaded-curator-test/pom.xml
index 751b590..fd9f1ce 100644
--- a/flink-shaded-curator/flink-shaded-curator-test/pom.xml
+++ b/flink-shaded-curator/flink-shaded-curator-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-curator</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-shaded-curator/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-curator/pom.xml b/flink-shaded-curator/pom.xml
index d08320d..be1da9c 100644
--- a/flink-shaded-curator/pom.xml
+++ b/flink-shaded-curator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
index 9ac033e..c750bbd 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-shaded-hadoop/flink-shaded-include-yarn-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/flink-shaded-include-yarn-tests/pom.xml b/flink-shaded-hadoop/flink-shaded-include-yarn-tests/pom.xml
index fe87331..b7b2229 100644
--- a/flink-shaded-hadoop/flink-shaded-include-yarn-tests/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-include-yarn-tests/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-shaded-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index 1d957ab..3df0756 100644
--- a/flink-shaded-hadoop/pom.xml
+++ b/flink-shaded-hadoop/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-streaming-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-java/pom.xml b/flink-streaming-java/pom.xml
index ea987af..013e958 100644
--- a/flink-streaming-java/pom.xml
+++ b/flink-streaming-java/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-streaming-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml
index 4ec12bd..f95ad79 100644
--- a/flink-streaming-scala/pom.xml
+++ b/flink-streaming-scala/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-test-utils-parent/flink-test-utils-junit/pom.xml
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils-junit/pom.xml b/flink-test-utils-parent/flink-test-utils-junit/pom.xml
index c8469cd..aefd62d 100644
--- a/flink-test-utils-parent/flink-test-utils-junit/pom.xml
+++ b/flink-test-utils-parent/flink-test-utils-junit/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-test-utils-parent/flink-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/pom.xml b/flink-test-utils-parent/flink-test-utils/pom.xml
index 36bdceb..14fca07 100644
--- a/flink-test-utils-parent/flink-test-utils/pom.xml
+++ b/flink-test-utils-parent/flink-test-utils/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-test-utils-parent/pom.xml
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/pom.xml b/flink-test-utils-parent/pom.xml
index 48e4550..92d6be3 100644
--- a/flink-test-utils-parent/pom.xml
+++ b/flink-test-utils-parent/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index b67edbb..62feff3 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-yarn-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index f296e8d..4b97596 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/flink-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml
index 5946094..11d238a 100644
--- a/flink-yarn/pom.xml
+++ b/flink-yarn/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db19b9d..f0bf7a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<name>flink</name>
<packaging>pom</packaging>
@@ -121,7 +121,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>force-shading</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</dependency>
<!-- Root dependencies for all projects -->
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/tools/change-version.sh
----------------------------------------------------------------------
diff --git a/tools/change-version.sh b/tools/change-version.sh
index cafefd0..45ed2fa 100755
--- a/tools/change-version.sh
+++ b/tools/change-version.sh
@@ -17,8 +17,8 @@
# limitations under the License.
################################################################################
-OLD="1.3-SNAPSHOT"
-NEW="1.4-SNAPSHOT"
+OLD="1.2-SNAPSHOT"
+NEW="1.3-SNAPSHOT"
HERE=` basename "$PWD"`
http://git-wip-us.apache.org/repos/asf/flink/blob/51818a28/tools/force-shading/pom.xml
----------------------------------------------------------------------
diff --git a/tools/force-shading/pom.xml b/tools/force-shading/pom.xml
index bbad337..3de6a5a 100644
--- a/tools/force-shading/pom.xml
+++ b/tools/force-shading/pom.xml
@@ -38,7 +38,7 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>force-shading</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<packaging>jar</packaging>
[5/9] flink git commit: Revert "[FLINK-6414] [build] Use
scala.binary.version in place of change-scala-version.sh"
Posted by sr...@apache.org.
Revert "[FLINK-6414] [build] Use scala.binary.version in place of change-scala-version.sh"
This reverts commit 3990d75aaedc8e03ef2facf5732c4a0fe52a7cdc.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c5efae54
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c5efae54
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c5efae54
Branch: refs/heads/release-1.3
Commit: c5efae54c6f274b8f247af591316c2b049b94718
Parents: c4c5c77
Author: Stefan Richter <s....@data-artisans.com>
Authored: Sun May 14 15:37:11 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 15:37:11 2017 +0200
----------------------------------------------------------------------
flink-clients/pom.xml | 6 +-
flink-connectors/flink-avro/pom.xml | 6 +-
.../flink-connector-cassandra/pom.xml | 12 +-
.../flink-connector-elasticsearch-base/pom.xml | 10 +-
.../flink-connector-elasticsearch/pom.xml | 12 +-
.../flink-connector-elasticsearch2/pom.xml | 12 +-
.../flink-connector-elasticsearch5/pom.xml | 12 +-
.../flink-connector-filesystem/pom.xml | 14 +--
.../flink-connector-kafka-0.10/pom.xml | 20 ++--
.../flink-connector-kafka-0.8/pom.xml | 18 +--
.../flink-connector-kafka-0.9/pom.xml | 18 +--
.../flink-connector-kafka-base/pom.xml | 16 +--
.../flink-connector-kinesis/pom.xml | 12 +-
flink-connectors/flink-connector-nifi/pom.xml | 10 +-
.../flink-connector-rabbitmq/pom.xml | 8 +-
.../flink-connector-twitter/pom.xml | 4 +-
.../flink-hadoop-compatibility/pom.xml | 6 +-
flink-connectors/flink-hbase/pom.xml | 18 +--
flink-connectors/flink-hcatalog/pom.xml | 2 +-
flink-connectors/flink-jdbc/pom.xml | 4 +-
flink-contrib/flink-connector-wikiedits/pom.xml | 4 +-
.../flink-statebackend-rocksdb/pom.xml | 10 +-
flink-contrib/flink-storm-examples/pom.xml | 24 ++--
flink-contrib/flink-storm/pom.xml | 6 +-
flink-contrib/flink-streaming-contrib/pom.xml | 10 +-
flink-contrib/flink-tweet-inputformat/pom.xml | 6 +-
flink-dist/pom.xml | 42 +++----
flink-dist/src/main/assemblies/bin.xml | 4 +-
flink-dist/src/main/assemblies/opt.xml | 24 ++--
flink-examples/flink-examples-batch/pom.xml | 22 ++--
flink-examples/flink-examples-streaming/pom.xml | 36 +++---
flink-examples/flink-examples-table/pom.xml | 10 +-
flink-examples/pom.xml | 4 +-
flink-fs-tests/pom.xml | 12 +-
flink-java8/pom.xml | 12 +-
flink-libraries/flink-cep-scala/pom.xml | 14 +--
flink-libraries/flink-cep/pom.xml | 12 +-
flink-libraries/flink-gelly-examples/pom.xml | 14 +--
flink-libraries/flink-gelly-scala/pom.xml | 12 +-
flink-libraries/flink-gelly/pom.xml | 8 +-
flink-libraries/flink-ml/pom.xml | 8 +-
flink-libraries/flink-python/pom.xml | 6 +-
flink-libraries/flink-table/pom.xml | 14 +--
flink-mesos/pom.xml | 10 +-
flink-metrics/flink-metrics-datadog/pom.xml | 2 +-
flink-metrics/flink-metrics-dropwizard/pom.xml | 2 +-
flink-metrics/flink-metrics-jmx/pom.xml | 4 +-
flink-metrics/flink-metrics-statsd/pom.xml | 2 +-
flink-optimizer/pom.xml | 4 +-
.../main/resources/archetype-resources/pom.xml | 30 ++---
.../main/resources/archetype-resources/pom.xml | 34 +++---
flink-runtime-web/pom.xml | 8 +-
flink-runtime/pom.xml | 2 +-
flink-scala-shell/pom.xml | 14 +--
flink-scala/pom.xml | 8 +-
flink-streaming-java/pom.xml | 8 +-
flink-streaming-scala/pom.xml | 14 +--
.../flink-test-utils/pom.xml | 8 +-
flink-tests/pom.xml | 36 +++---
flink-yarn-tests/pom.xml | 12 +-
flink-yarn/pom.xml | 10 +-
tools/change-scala-version.sh | 117 +++++++++++++++++++
tools/create_release_files.sh | 10 +-
tools/deploy_to_maven.sh | 8 +-
64 files changed, 501 insertions(+), 376 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-clients/pom.xml
----------------------------------------------------------------------
diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
index deac7fc..8dde2e9 100644
--- a/flink-clients/pom.xml
+++ b/flink-clients/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<name>flink-clients</name>
<packaging>jar</packaging>
@@ -47,13 +47,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-optimizer_${scala.binary.version}</artifactId>
+ <artifactId>flink-optimizer_2.10</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-avro/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-avro/pom.xml b/flink-connectors/flink-avro/pom.xml
index ed99eac..170b344 100644
--- a/flink-connectors/flink-avro/pom.xml
+++ b/flink-connectors/flink-avro/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro_2.10</artifactId>
<name>flink-avro</name>
<packaging>jar</packaging>
@@ -62,14 +62,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml
index 2722c30..d01c769 100644
--- a/flink-connectors/flink-connector-cassandra/pom.xml
+++ b/flink-connectors/flink-connector-cassandra/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-cassandra_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-cassandra_2.10</artifactId>
<name>flink-connector-cassandra</name>
<packaging>jar</packaging>
@@ -94,7 +94,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -136,27 +136,27 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-elasticsearch-base/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-elasticsearch-base/pom.xml b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
index 79b4f50..e183354 100644
--- a/flink-connectors/flink-connector-elasticsearch-base/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch-base_2.10</artifactId>
<name>flink-connector-elasticsearch-base</name>
<packaging>jar</packaging>
@@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -61,14 +61,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -76,7 +76,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-elasticsearch/pom.xml b/flink-connectors/flink-connector-elasticsearch/pom.xml
index 93e4eb6..07028df 100644
--- a/flink-connectors/flink-connector-elasticsearch/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-elasticsearch_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch_2.10</artifactId>
<name>flink-connector-elasticsearch</name>
<packaging>jar</packaging>
@@ -46,14 +46,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch-base_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -61,14 +61,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -76,7 +76,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch-base_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-elasticsearch2/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-elasticsearch2/pom.xml b/flink-connectors/flink-connector-elasticsearch2/pom.xml
index 7e21b8f..ec1b7da 100644
--- a/flink-connectors/flink-connector-elasticsearch2/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch2/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-elasticsearch2_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch2_2.10</artifactId>
<name>flink-connector-elasticsearch2</name>
<packaging>jar</packaging>
@@ -46,14 +46,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch-base_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -68,14 +68,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -83,7 +83,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch-base_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-elasticsearch5/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-elasticsearch5/pom.xml b/flink-connectors/flink-connector-elasticsearch5/pom.xml
index 72a0d18..93d7bbe 100644
--- a/flink-connectors/flink-connector-elasticsearch5/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch5/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-elasticsearch5_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch5_2.10</artifactId>
<name>flink-connector-elasticsearch5</name>
<packaging>jar</packaging>
@@ -46,14 +46,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch-base_2.10</artifactId>
<version>${project.version}</version>
<exclusions>
<!-- Elasticsearch Java Client has been moved to a different module in 5.x -->
@@ -88,14 +88,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -103,7 +103,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-elasticsearch-base_2.10</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-filesystem/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
index 07b0ae1..28d9962 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-filesystem_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-filesystem_2.10</artifactId>
<name>flink-connector-filesystem</name>
<packaging>jar</packaging>
@@ -45,7 +45,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -68,21 +68,21 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
+ <artifactId>flink-hadoop-compatibility_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -90,7 +90,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -98,7 +98,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-kafka-0.10/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml b/flink-connectors/flink-connector-kafka-0.10/pom.xml
index 231b22e..c17386d 100644
--- a/flink-connectors/flink-connector-kafka-0.10/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.10/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-kafka-0.10_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-0.10_2.10</artifactId>
<name>flink-connector-kafka-0.10</name>
<packaging>jar</packaging>
@@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka-0.9_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-0.9_2.10</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
@@ -60,7 +60,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -75,7 +75,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<!-- Projects depending on this project,
@@ -87,7 +87,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -95,7 +95,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka-0.9_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-0.9_2.10</artifactId>
<version>${project.version}</version>
<exclusions>
<!-- exclude Kafka dependencies -->
@@ -110,7 +110,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-base_2.10</artifactId>
<version>${project.version}</version>
<exclusions>
<!-- exclude Kafka dependencies -->
@@ -133,7 +133,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -141,14 +141,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-kafka-0.8/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml b/flink-connectors/flink-connector-kafka-0.8/pom.xml
index 5e2ed2d..ceccb3e 100644
--- a/flink-connectors/flink-connector-kafka-0.8/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-kafka-0.8_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-0.8_2.10</artifactId>
<name>flink-connector-kafka-0.8</name>
<packaging>jar</packaging>
@@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -60,13 +60,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-base_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<!-- Projects depending on this project,
@@ -122,7 +122,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -144,7 +144,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-base_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -152,7 +152,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -160,14 +160,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-kafka-0.9/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-0.9/pom.xml b/flink-connectors/flink-connector-kafka-0.9/pom.xml
index 0140353..de4dedb 100644
--- a/flink-connectors/flink-connector-kafka-0.9/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.9/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-kafka-0.9_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-0.9_2.10</artifactId>
<name>flink-connector-kafka-0.9</name>
<packaging>jar</packaging>
@@ -46,14 +46,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-base_2.10</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
@@ -65,7 +65,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<!-- Projects depending on this project,
@@ -83,7 +83,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -91,7 +91,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-base_2.10</artifactId>
<version>${project.version}</version>
<exclusions>
<!-- exclude 0.8 dependencies -->
@@ -121,7 +121,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -129,14 +129,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-kafka-base/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/pom.xml b/flink-connectors/flink-connector-kafka-base/pom.xml
index 2cc94b0..a6b2349 100644
--- a/flink-connectors/flink-connector-kafka-base/pom.xml
+++ b/flink-connectors/flink-connector-kafka-base/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-base_2.10</artifactId>
<name>flink-connector-kafka-base</name>
<packaging>jar</packaging>
@@ -46,14 +46,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<!-- Projects depending on this project,
@@ -132,7 +132,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -140,14 +140,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -155,7 +155,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -163,7 +163,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-kinesis/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/pom.xml b/flink-connectors/flink-connector-kinesis/pom.xml
index 4628937..7515f31 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-kinesis_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kinesis_2.10</artifactId>
<name>flink-connector-kinesis</name>
<properties>
<aws.sdk.version>1.10.71</aws.sdk.version>
@@ -44,7 +44,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -57,7 +57,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -65,7 +65,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -73,7 +73,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -81,7 +81,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-nifi/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-nifi/pom.xml b/flink-connectors/flink-connector-nifi/pom.xml
index efa7ae7..67bfb29 100644
--- a/flink-connectors/flink-connector-nifi/pom.xml
+++ b/flink-connectors/flink-connector-nifi/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-nifi_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-nifi_2.10</artifactId>
<name>flink-connector-nifi</name>
<packaging>jar</packaging>
@@ -48,26 +48,26 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-rabbitmq/pom.xml b/flink-connectors/flink-connector-rabbitmq/pom.xml
index 38337f4..f26e57c 100644
--- a/flink-connectors/flink-connector-rabbitmq/pom.xml
+++ b/flink-connectors/flink-connector-rabbitmq/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-rabbitmq_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-rabbitmq_2.10</artifactId>
<name>flink-connector-rabbitmq</name>
<packaging>jar</packaging>
@@ -44,7 +44,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -57,7 +57,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -65,7 +65,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-connector-twitter/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-twitter/pom.xml b/flink-connectors/flink-connector-twitter/pom.xml
index 38bfb30..c683da1 100644
--- a/flink-connectors/flink-connector-twitter/pom.xml
+++ b/flink-connectors/flink-connector-twitter/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-twitter_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-twitter_2.10</artifactId>
<name>flink-connector-twitter</name>
<packaging>jar</packaging>
@@ -43,7 +43,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-hadoop-compatibility/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml
index 2dee17d..003225b 100644
--- a/flink-connectors/flink-hadoop-compatibility/pom.xml
+++ b/flink-connectors/flink-hadoop-compatibility/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
+ <artifactId>flink-hadoop-compatibility_2.10</artifactId>
<name>flink-hadoop-compatibility</name>
<packaging>jar</packaging>
@@ -47,7 +47,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -70,7 +70,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml
index 949e27a..6a295a8 100644
--- a/flink-connectors/flink-hbase/pom.xml
+++ b/flink-connectors/flink-hbase/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-hbase_${scala.binary.version}</artifactId>
+ <artifactId>flink-hbase_2.10</artifactId>
<name>flink-hbase</name>
<packaging>jar</packaging>
@@ -89,7 +89,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -98,7 +98,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -107,7 +107,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<!-- Projects depending on this project,
@@ -124,7 +124,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
@@ -206,7 +206,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
@@ -219,13 +219,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
+ <artifactId>flink-hadoop-compatibility_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-include-yarn_${scala.binary.version}</artifactId>
+ <artifactId>flink-shaded-include-yarn_2.10</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -271,7 +271,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hcatalog/pom.xml b/flink-connectors/flink-hcatalog/pom.xml
index a9fbceb..a975e53 100644
--- a/flink-connectors/flink-hcatalog/pom.xml
+++ b/flink-connectors/flink-hcatalog/pom.xml
@@ -44,7 +44,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
+ <artifactId>flink-hadoop-compatibility_2.10</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-connectors/flink-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-jdbc/pom.xml b/flink-connectors/flink-jdbc/pom.xml
index a2bbaf4..38a0163 100644
--- a/flink-connectors/flink-jdbc/pom.xml
+++ b/flink-connectors/flink-jdbc/pom.xml
@@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<!-- Projects depending on this project,
@@ -56,7 +56,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-contrib/flink-connector-wikiedits/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-connector-wikiedits/pom.xml b/flink-contrib/flink-connector-wikiedits/pom.xml
index 20b6db4..fed8656 100644
--- a/flink-contrib/flink-connector-wikiedits/pom.xml
+++ b/flink-contrib/flink-connector-wikiedits/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-connector-wikiedits_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-wikiedits_2.10</artifactId>
<name>flink-connector-wikiedits</name>
<packaging>jar</packaging>
@@ -37,7 +37,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-contrib/flink-statebackend-rocksdb/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-statebackend-rocksdb/pom.xml b/flink-contrib/flink-statebackend-rocksdb/pom.xml
index 527ca18..2148706 100644
--- a/flink-contrib/flink-statebackend-rocksdb/pom.xml
+++ b/flink-contrib/flink-statebackend-rocksdb/pom.xml
@@ -31,7 +31,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
+ <artifactId>flink-statebackend-rocksdb_2.10</artifactId>
<name>flink-statebackend-rocksdb</name>
<packaging>jar</packaging>
@@ -42,14 +42,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -78,7 +78,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -86,7 +86,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-contrib/flink-storm-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm-examples/pom.xml b/flink-contrib/flink-storm-examples/pom.xml
index 6ef0f7b..4d9d76c 100644
--- a/flink-contrib/flink-storm-examples/pom.xml
+++ b/flink-contrib/flink-storm-examples/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-storm-examples_${scala.binary.version}</artifactId>
+ <artifactId>flink-storm-examples_2.10</artifactId>
<name>flink-storm-examples</name>
<packaging>jar</packaging>
@@ -56,19 +56,19 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-storm_${scala.binary.version}</artifactId>
+ <artifactId>flink-storm_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -95,14 +95,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -128,7 +128,7 @@ under the License.
<artifactItems>
<artifactItem>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
@@ -138,7 +138,7 @@ under the License.
</artifactItem>
<artifactItem>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-storm_${scala.binary.version}</artifactId>
+ <artifactId>flink-storm_2.10</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
@@ -326,8 +326,8 @@ under the License.
<!-- Storm's recursive dependencies -->
<include>org.yaml:snakeyaml</include>
<include>com.googlecode.json-simple:json-simple</include>
- <include>org.apache.flink:flink-storm_${scala.binary.version}</include>
- <include>org.apache.flink:flink-storm-examples_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-storm_2.10</include>
+ <include>org.apache.flink:flink-storm-examples_2.10</include>
</includes>
</artifactSet>
<filters>
@@ -354,7 +354,7 @@ under the License.
</includes>
</filter>
<filter>
- <artifact>org.apache.flink:flink-storm-examples_${scala.binary.version}</artifact>
+ <artifact>org.apache.flink:flink-storm-examples_2.10</artifact>
<includes>
<include>org/apache/flink/storm/wordcount/WordCountRemoteBySubmitter.class
</include>
@@ -366,7 +366,7 @@ under the License.
</includes>
</filter>
<filter>
- <artifact>org.apache.flink:flink-storm_${scala.binary.version}</artifact>
+ <artifact>org.apache.flink:flink-storm_2.10</artifact>
<includes>
<include>org/apache/flink/storm/api/*.class</include>
<include>org/apache/flink/storm/util/*.class</include>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-contrib/flink-storm/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm/pom.xml b/flink-contrib/flink-storm/pom.xml
index a10ff68..5189b3b 100644
--- a/flink-contrib/flink-storm/pom.xml
+++ b/flink-contrib/flink-storm/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-storm_${scala.binary.version}</artifactId>
+ <artifactId>flink-storm_2.10</artifactId>
<name>flink-storm</name>
<packaging>jar</packaging>
@@ -65,7 +65,7 @@ under the License.
<!-- Core streaming API -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -174,7 +174,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-contrib/flink-streaming-contrib/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-streaming-contrib/pom.xml b/flink-contrib/flink-streaming-contrib/pom.xml
index 2381d70..2df0231 100644
--- a/flink-contrib/flink-streaming-contrib/pom.xml
+++ b/flink-contrib/flink-streaming-contrib/pom.xml
@@ -31,7 +31,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-streaming-contrib_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-contrib_2.10</artifactId>
<name>flink-streaming-contrib</name>
<packaging>jar</packaging>
@@ -42,19 +42,19 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -62,7 +62,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-contrib/flink-tweet-inputformat/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-tweet-inputformat/pom.xml b/flink-contrib/flink-tweet-inputformat/pom.xml
index 9328bb6..5e0d79c 100644
--- a/flink-contrib/flink-tweet-inputformat/pom.xml
+++ b/flink-contrib/flink-tweet-inputformat/pom.xml
@@ -31,7 +31,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-tweet-inputformat_${scala.binary.version}</artifactId>
+ <artifactId>flink-tweet-inputformat_2.10</artifactId>
<name>flink-tweet-inputformat</name>
<packaging>jar</packaging>
@@ -44,12 +44,12 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 0493b98..6d8debf 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-dist_${scala.binary.version}</artifactId>
+ <artifactId>flink-dist_2.10</artifactId>
<name>flink-dist</name>
<packaging>jar</packaging>
@@ -51,61 +51,61 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime-web_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime-web_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-optimizer_${scala.binary.version}</artifactId>
+ <artifactId>flink-optimizer_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-python_${scala.binary.version}</artifactId>
+ <artifactId>flink-python_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala-shell_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala-shell_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -123,19 +123,19 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-mesos_${scala.binary.version}</artifactId>
+ <artifactId>flink-mesos_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
+ <artifactId>flink-statebackend-rocksdb_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-yarn_${scala.binary.version}</artifactId>
+ <artifactId>flink-yarn_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -163,7 +163,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-gelly-examples_${scala.binary.version}</artifactId>
+ <artifactId>flink-gelly-examples_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -214,42 +214,42 @@ under the License.
<!-- start optional Flink libraries -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-cep_${scala.binary.version}</artifactId>
+ <artifactId>flink-cep_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-cep-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-cep-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-gelly_${scala.binary.version}</artifactId>
+ <artifactId>flink-gelly_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-gelly-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-gelly-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-ml_${scala.binary.version}</artifactId>
+ <artifactId>flink-ml_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-dist/src/main/assemblies/bin.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index 909beb4..c3385e1 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -39,7 +39,7 @@ under the License.
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
- <include>org.apache.flink:flink-python_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-python_2.10</include>
<include>org.slf4j:slf4j-log4j12</include>
<include>log4j:log4j</include>
</includes>
@@ -49,7 +49,7 @@ under the License.
<files>
<!-- copy fat jar -->
<file>
- <source>target/flink-dist_${scala.binary.version}-${project.version}.jar</source>
+ <source>target/flink-dist_2.10-${project.version}.jar</source>
<outputDirectory>lib/</outputDirectory>
<fileMode>0644</fileMode>
</file>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-dist/src/main/assemblies/opt.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index 23846be..0386b92 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -31,47 +31,47 @@
<files>
<!-- CEP -->
<file>
- <source>../flink-libraries/flink-cep/target/flink-cep_${scala.binary.version}-${project.version}.jar</source>
+ <source>../flink-libraries/flink-cep/target/flink-cep_2.10-${project.version}.jar</source>
<outputDirectory>opt/</outputDirectory>
- <destName>flink-cep_${scala.binary.version}-${project.version}.jar</destName>
+ <destName>flink-cep_2.10-${project.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
<file>
- <source>../flink-libraries/flink-cep-scala/target/flink-cep-scala_${scala.binary.version}-${project.version}.jar</source>
+ <source>../flink-libraries/flink-cep-scala/target/flink-cep-scala_2.10-${project.version}.jar</source>
<outputDirectory>opt/</outputDirectory>
- <destName>flink-cep-scala_${scala.binary.version}-${project.version}.jar</destName>
+ <destName>flink-cep-scala_2.10-${project.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
<!-- Gelly -->
<file>
- <source>../flink-libraries/flink-gelly/target/flink-gelly_${scala.binary.version}-${project.version}.jar</source>
+ <source>../flink-libraries/flink-gelly/target/flink-gelly_2.10-${project.version}.jar</source>
<outputDirectory>opt/</outputDirectory>
- <destName>flink-gelly_${scala.binary.version}-${project.version}.jar</destName>
+ <destName>flink-gelly_2.10-${project.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
<file>
- <source>../flink-libraries/flink-gelly-scala/target/flink-gelly-scala_${scala.binary.version}-${project.version}-jar-with-dependencies.jar</source>
+ <source>../flink-libraries/flink-gelly-scala/target/flink-gelly-scala_2.10-${project.version}-jar-with-dependencies.jar</source>
<outputDirectory>opt/</outputDirectory>
- <destName>flink-gelly-scala_${scala.binary.version}-${project.version}.jar</destName>
+ <destName>flink-gelly-scala_2.10-${project.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
<!-- TableAPI-->
<file>
- <source>../flink-libraries/flink-table/target/flink-table_${scala.binary.version}-${project.version}.jar</source>
+ <source>../flink-libraries/flink-table/target/flink-table_2.10-${project.version}.jar</source>
<outputDirectory>opt/</outputDirectory>
- <destName>flink-table_${scala.binary.version}-${project.version}.jar</destName>
+ <destName>flink-table_2.10-${project.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
<!-- ML -->
<file>
- <source>../flink-libraries/flink-ml/target/flink-ml_${scala.binary.version}-${project.version}-jar-with-dependencies.jar</source>
+ <source>../flink-libraries/flink-ml/target/flink-ml_2.10-${project.version}-jar-with-dependencies.jar</source>
<outputDirectory>opt/</outputDirectory>
- <destName>flink-ml_${scala.binary.version}-${project.version}.jar</destName>
+ <destName>flink-ml_2.10-${project.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-examples/flink-examples-batch/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-examples-batch/pom.xml b/flink-examples/flink-examples-batch/pom.xml
index cbff7e2..269f5a6 100644
--- a/flink-examples/flink-examples-batch/pom.xml
+++ b/flink-examples/flink-examples-batch/pom.xml
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples_2.10</artifactId>
<version>1.4-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-batch_2.10</artifactId>
<name>flink-examples-batch</name>
<packaging>jar</packaging>
@@ -41,7 +41,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -363,14 +363,14 @@ under the License.
</goals>
<configuration>
<target>
- <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-KMeans.jar" tofile="${project.basedir}/target/KMeans.jar" />
- <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-ConnectedComponents.jar" tofile="${project.basedir}/target/ConnectedComponents.jar" />
- <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-EnumTriangles.jar" tofile="${project.basedir}/target/EnumTriangles.jar" />
- <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-PageRank.jar" tofile="${project.basedir}/target/PageRank.jar" />
- <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-TransitiveClosure.jar" tofile="${project.basedir}/target/TransitiveClosure.jar" />
- <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-WebLogAnalysis.jar" tofile="${project.basedir}/target/WebLogAnalysis.jar" />
- <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-WordCount.jar" tofile="${project.basedir}/target/WordCount.jar" />
- <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-DistCp.jar" tofile="${project.basedir}/target/DistCp.jar" />
+ <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-KMeans.jar" tofile="${project.basedir}/target/KMeans.jar" />
+ <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-ConnectedComponents.jar" tofile="${project.basedir}/target/ConnectedComponents.jar" />
+ <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-EnumTriangles.jar" tofile="${project.basedir}/target/EnumTriangles.jar" />
+ <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-PageRank.jar" tofile="${project.basedir}/target/PageRank.jar" />
+ <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-TransitiveClosure.jar" tofile="${project.basedir}/target/TransitiveClosure.jar" />
+ <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-WebLogAnalysis.jar" tofile="${project.basedir}/target/WebLogAnalysis.jar" />
+ <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-WordCount.jar" tofile="${project.basedir}/target/WordCount.jar" />
+ <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-DistCp.jar" tofile="${project.basedir}/target/DistCp.jar" />
</target>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-examples/flink-examples-streaming/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-examples-streaming/pom.xml b/flink-examples/flink-examples-streaming/pom.xml
index b52116b..2bacf25 100644
--- a/flink-examples/flink-examples-streaming/pom.xml
+++ b/flink-examples/flink-examples-streaming/pom.xml
@@ -24,12 +24,12 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples_2.10</artifactId>
<version>1.4-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-examples-streaming_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-streaming_2.10</artifactId>
<name>flink-examples-streaming</name>
<packaging>jar</packaging>
@@ -40,31 +40,31 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-twitter_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-twitter_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka-0.8_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-kafka-0.8_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -72,14 +72,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -116,7 +116,7 @@ under the License.
<!-- For WordCount example data -->
<artifactItem>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
@@ -126,7 +126,7 @@ under the License.
<!-- For JSON utilities -->
<artifactItem>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-twitter_${scala.binary.version}</artifactId>
+ <artifactId>flink-connector-twitter_2.10</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
@@ -475,13 +475,13 @@ under the License.
</goals>
<configuration>
<target>
- <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-IncrementalLearning.jar" tofile="${project.basedir}/target/IncrementalLearning.jar" />
- <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-Iteration.jar" tofile="${project.basedir}/target/Iteration.jar" />
- <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-SessionWindowing.jar" tofile="${project.basedir}/target/SessionWindowing.jar" />
- <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-TopSpeedWindowing.jar" tofile="${project.basedir}/target/TopSpeedWindowing.jar" />
- <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-WindowJoin.jar" tofile="${project.basedir}/target/WindowJoin.jar" />
- <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-WordCount.jar" tofile="${project.basedir}/target/WordCount.jar" />
- <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-SocketWindowWordCount.jar" tofile="${project.basedir}/target/SocketWindowWordCount.jar" />
+ <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-IncrementalLearning.jar" tofile="${project.basedir}/target/IncrementalLearning.jar" />
+ <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-Iteration.jar" tofile="${project.basedir}/target/Iteration.jar" />
+ <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-SessionWindowing.jar" tofile="${project.basedir}/target/SessionWindowing.jar" />
+ <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-TopSpeedWindowing.jar" tofile="${project.basedir}/target/TopSpeedWindowing.jar" />
+ <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-WindowJoin.jar" tofile="${project.basedir}/target/WindowJoin.jar" />
+ <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-WordCount.jar" tofile="${project.basedir}/target/WordCount.jar" />
+ <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-SocketWindowWordCount.jar" tofile="${project.basedir}/target/SocketWindowWordCount.jar" />
</target>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-examples/flink-examples-table/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-examples-table/pom.xml b/flink-examples/flink-examples-table/pom.xml
index e59d8c6..ce1c701 100644
--- a/flink-examples/flink-examples-table/pom.xml
+++ b/flink-examples/flink-examples-table/pom.xml
@@ -24,27 +24,27 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples_2.10</artifactId>
<version>1.4-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<name>flink-examples-table</name>
- <artifactId>flink-examples-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-table_2.10</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -78,7 +78,7 @@ under the License.
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <id>flink-table-examples_${scala.binary.version}</id>
+ <id>flink-table-examples_2.10</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/pom.xml b/flink-examples/pom.xml
index 644d9eb..409c8f1 100644
--- a/flink-examples/pom.xml
+++ b/flink-examples/pom.xml
@@ -28,7 +28,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-examples_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples_2.10</artifactId>
<name>flink-examples</name>
<packaging>pom</packaging>
@@ -44,7 +44,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-fs-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index 446d167..c354c80 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-fs-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-fs-tests_2.10</artifactId>
<name>flink-fs-tests</name>
<packaging>jar</packaging>
@@ -45,7 +45,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -53,28 +53,28 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-java8/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java8/pom.xml b/flink-java8/pom.xml
index fb7da02..8de3b92 100644
--- a/flink-java8/pom.xml
+++ b/flink-java8/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-java8_${scala.binary.version}</artifactId>
+ <artifactId>flink-java8_2.10</artifactId>
<name>flink-java8</name>
<packaging>jar</packaging>
@@ -51,13 +51,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -65,14 +65,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-cep_${scala.binary.version}</artifactId>
+ <artifactId>flink-cep_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -116,7 +116,7 @@ under the License.
<artifactItems>
<artifactItem>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-libraries/flink-cep-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep-scala/pom.xml b/flink-libraries/flink-cep-scala/pom.xml
index c9b4a46..ca5bbce 100644
--- a/flink-libraries/flink-cep-scala/pom.xml
+++ b/flink-libraries/flink-cep-scala/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-cep-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-cep-scala_2.10</artifactId>
<name>flink-cep-scala</name>
<packaging>jar</packaging>
@@ -40,13 +40,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-cep_${scala.binary.version}</artifactId>
+ <artifactId>flink-cep_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -83,14 +83,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -98,7 +98,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -106,7 +106,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-cep_${scala.binary.version}</artifactId>
+ <artifactId>flink-cep_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-libraries/flink-cep/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/pom.xml b/flink-libraries/flink-cep/pom.xml
index 35045c0..7f89c24 100644
--- a/flink-libraries/flink-cep/pom.xml
+++ b/flink-libraries/flink-cep/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-cep_${scala.binary.version}</artifactId>
+ <artifactId>flink-cep_2.10</artifactId>
<name>flink-cep</name>
<packaging>jar</packaging>
@@ -47,7 +47,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -62,14 +62,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -77,7 +77,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -85,7 +85,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
+ <artifactId>flink-statebackend-rocksdb_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
[3/9] flink git commit: Revert "[hotfix] [build] Drop transitive
jersey/jettison/servlet dependencies pulled via Hadoop"
Posted by sr...@apache.org.
Revert "[hotfix] [build] Drop transitive jersey/jettison/servlet dependencies pulled via Hadoop"
This reverts commit 104ea244e94aa8be7bd5089c13cd8292905eb6fd.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c4c5c77e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c4c5c77e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c4c5c77e
Branch: refs/heads/release-1.3
Commit: c4c5c77ed2d0639439b49f1ff61fe1b8add5a637
Parents: 0fe8dfe
Author: Stefan Richter <s....@data-artisans.com>
Authored: Sun May 14 15:37:09 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 15:37:09 2017 +0200
----------------------------------------------------------------------
.../flink-shaded-hadoop2/pom.xml | 61 ++++----------------
1 file changed, 11 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c4c5c77e/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
index a1159d6..9ac033e 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
@@ -70,23 +70,20 @@ under the License.
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1</artifactId>
</exclusion>
+
<exclusion>
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -109,10 +106,6 @@ under the License.
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -198,10 +191,6 @@ under the License.
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
</exclusion>
<exclusion>
@@ -213,8 +202,8 @@ under the License.
<artifactId>core</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -237,10 +226,6 @@ under the License.
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -314,10 +299,6 @@ under the License.
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
</exclusion>
<exclusion>
@@ -341,8 +322,8 @@ under the License.
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -365,10 +346,6 @@ under the License.
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -442,10 +419,6 @@ under the License.
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
</exclusion>
<exclusion>
@@ -469,8 +442,8 @@ under the License.
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -493,10 +466,6 @@ under the License.
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -570,10 +539,6 @@ under the License.
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
</exclusion>
<exclusion>
@@ -597,8 +562,8 @@ under the License.
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -621,10 +586,6 @@ under the License.
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
[7/9] flink git commit: Revert "[FLINK-6461] Deprecate web config
defaults in ConfigConstants"
Posted by sr...@apache.org.
Revert "[FLINK-6461] Deprecate web config defaults in ConfigConstants"
This reverts commit 9708550a40127f833728bcc85847035c3b5fbad8.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2baac899
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2baac899
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2baac899
Branch: refs/heads/release-1.3
Commit: 2baac899ff620888f41f11762aadf134a59ff548
Parents: cc6036f
Author: Stefan Richter <s....@data-artisans.com>
Authored: Sun May 14 15:37:22 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 15:37:22 2017 +0200
----------------------------------------------------------------------
.../client/program/StandaloneClusterClient.java | 5 +-
.../flink/configuration/ConfigConstants.java | 65 +++-----------------
.../flink/configuration/JobManagerOptions.java | 7 ---
.../flink/api/java/ExecutionEnvironment.java | 4 ++
.../runtime/webmonitor/WebMonitorConfig.java | 36 ++++++++++-
.../runtime/webmonitor/WebRuntimeMonitor.java | 32 +++++++---
.../webmonitor/WebRuntimeMonitorITCase.java | 13 ++--
.../executiongraph/ExecutionGraphBuilder.java | 5 +-
.../runtime/webmonitor/WebMonitorUtils.java | 6 +-
.../flink/runtime/jobmanager/JobManager.scala | 3 +-
.../environment/StreamExecutionEnvironment.java | 4 ++
.../apache/flink/test/util/TestBaseUtils.java | 5 +-
.../flink/test/web/WebFrontendITCase.java | 5 +-
.../flink/yarn/YarnApplicationMasterRunner.java | 3 +-
14 files changed, 95 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-clients/src/main/java/org/apache/flink/client/program/StandaloneClusterClient.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/StandaloneClusterClient.java b/flink-clients/src/main/java/org/apache/flink/client/program/StandaloneClusterClient.java
index 7517504..fd179c0 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/program/StandaloneClusterClient.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/program/StandaloneClusterClient.java
@@ -18,8 +18,8 @@
package org.apache.flink.client.program;
import org.apache.flink.api.common.JobSubmissionResult;
+import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.runtime.clusterframework.messages.GetClusterStatus;
import org.apache.flink.runtime.clusterframework.messages.GetClusterStatusResponse;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
@@ -53,7 +53,8 @@ public class StandaloneClusterClient extends ClusterClient {
@Override
public String getWebInterfaceURL() {
String host = this.getJobManagerAddress().getHostString();
- int port = getFlinkConfiguration().getInteger(JobManagerOptions.WEB_PORT);
+ int port = getFlinkConfiguration().getInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT);
return "http://" + host + ":" + port;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
index c3704be..92e6b5d 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -1338,81 +1338,36 @@ public final class ConfigConstants {
key("jobmanager.web.address")
.noDefaultValue();
- /**
- * The config key for the port of the JobManager web frontend.
- * Setting this value to {@code -1} disables the web frontend.
- *
- * @deprecated use {@link JobManagerOptions#WEB_PORT} instead
- */
- @Deprecated
+ /** The config key for the port of the JobManager web frontend.
+ * Setting this value to {@code -1} disables the web frontend. */
public static final int DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT = 8081;
- /**
- * Default value to override SSL support for the JobManager web UI
- *
- * @deprecated use {@link JobManagerOptions#WEB_SSL_ENABLED} instead
- */
- @Deprecated
+ /** Default value to override SSL support for the JobManager web UI */
public static final boolean DEFAULT_JOB_MANAGER_WEB_SSL_ENABLED = true;
- /**
- * The default number of archived jobs for the jobmanager
- *
- * @deprecated use {@link JobManagerOptions#WEB_ARCHIVE_COUNT} instead
- */
- @Deprecated
+ /** The default number of archived jobs for the jobmanager */
public static final int DEFAULT_JOB_MANAGER_WEB_ARCHIVE_COUNT = 5;
- /**
- * By default, submitting jobs from the web-frontend is allowed.
- *
- * @deprecated use {@link JobManagerOptions#WEB_SUBMIT_ENABLE} instead
- */
- @Deprecated
+ /** By default, submitting jobs from the web-frontend is allowed. */
public static final boolean DEFAULT_JOB_MANAGER_WEB_SUBMIT_ENABLED = true;
/** @deprecated Config key has been deprecated. Therefore, no default value required. */
@Deprecated
public static final boolean DEFAULT_JOB_MANAGER_WEB_CHECKPOINTS_DISABLE = false;
- /**
- * Default number of checkpoints to remember for recent history.
- *
- * @deprecated use {@link JobManagerOptions#WEB_CHECKPOINTS_HISTORY_SIZE} instead
- */
- @Deprecated
+ /** Default number of checkpoints to remember for recent history. */
public static final int DEFAULT_JOB_MANAGER_WEB_CHECKPOINTS_HISTORY_SIZE = 10;
- /**
- * Time after which cached stats are cleaned up.
- *
- * @@deprecated use {@link JobManagerOptions#WEB_BACKPRESSURE_CLEANUP_INTERVAL} instead
- */
- @Deprecated
+ /** Time after which cached stats are cleaned up. */
public static final int DEFAULT_JOB_MANAGER_WEB_BACK_PRESSURE_CLEAN_UP_INTERVAL = 10 * 60 * 1000;
- /**
- * Time after which available stats are deprecated and need to be refreshed (by resampling).
- *
- * @deprecated use {@link JobManagerOptions#WEB_BACKPRESSURE_REFRESH_INTERVAL} instead
- */
- @Deprecated
+ /** Time after which available stats are deprecated and need to be refreshed (by resampling). */
public static final int DEFAULT_JOB_MANAGER_WEB_BACK_PRESSURE_REFRESH_INTERVAL = 60 * 1000;
- /**
- * Number of samples to take to determine back pressure.
- *
- * @deprecated use {@link JobManagerOptions#WEB_BACKPRESSURE_NUM_SAMPLES} instead
- */
- @Deprecated
+ /** Number of samples to take to determine back pressure. */
public static final int DEFAULT_JOB_MANAGER_WEB_BACK_PRESSURE_NUM_SAMPLES = 100;
- /**
- * Delay between samples to determine back pressure.
- *
- * @deprecated use {@link JobManagerOptions#WEB_BACKPRESSURE_DELAY} instead
- */
- @Deprecated
+ /** Delay between samples to determine back pressure. */
public static final int DEFAULT_JOB_MANAGER_WEB_BACK_PRESSURE_DELAY = 50;
// ------------------------------ Akka Values ------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
index 76b6bed..b924e8e 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
@@ -116,13 +116,6 @@ public class JobManagerOptions {
.defaultValue("*");
/**
- * The config parameter defining the refresh interval for the web-frontend.
- */
- public static final ConfigOption<Long> WEB_REFRESH_INTERVAL =
- key("jobmanager.web.refresh-interval")
- .defaultValue(3000L);
-
- /**
* Config parameter to override SSL support for the JobManager Web UI
*/
public static final ConfigOption<Boolean> WEB_SSL_ENABLED =
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
index 3d8a384..709ef09 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
@@ -1235,6 +1235,10 @@ public abstract class ExecutionEnvironment {
public static ExecutionEnvironment createLocalEnvironmentWithWebUI(Configuration conf) {
checkNotNull(conf, "conf");
+ if (!conf.containsKey(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY)) {
+ int port = ConfigConstants.DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT;
+ conf.setInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, port);
+ }
conf.setBoolean(ConfigConstants.LOCAL_START_WEBSERVER, true);
LocalEnvironment localEnv = new LocalEnvironment(conf);
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
index 77537a2..dba2145 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
@@ -18,11 +18,39 @@
package org.apache.flink.runtime.webmonitor;
+
+import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.JobManagerOptions;
public class WebMonitorConfig {
+ // ------------------------------------------------------------------------
+ // Config Keys
+ // ------------------------------------------------------------------------
+
+ /** The port for the runtime monitor web-frontend server. */
+ public static final String JOB_MANAGER_WEB_PORT_KEY = ConfigConstants.JOB_MANAGER_WEB_PORT_KEY;
+
+ /** The initial refresh interval for the web dashboard */
+ public static final String JOB_MANAGER_WEB_REFRESH_INTERVAL_KEY = "jobmanager.web.refresh-interval";
+
+
+ // ------------------------------------------------------------------------
+ // Default values
+ // ------------------------------------------------------------------------
+
+ /** Default port for the web dashboard (= 8081) */
+ public static final int DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT = ConfigConstants.DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT;
+
+ /** Default refresh interval for the web dashboard (= 3000 msecs) */
+ public static final long DEFAULT_JOB_MANAGER_WEB_REFRESH_INTERVAL = 3000;
+
+
+ // ------------------------------------------------------------------------
+ // Config
+ // ------------------------------------------------------------------------
+
/** The configuration queried by this config object */
private final Configuration config;
@@ -39,15 +67,17 @@ public class WebMonitorConfig {
}
public int getWebFrontendPort() {
- return config.getInteger(JobManagerOptions.WEB_PORT);
+ return config.getInteger(JOB_MANAGER_WEB_PORT_KEY, DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT);
}
public long getRefreshInterval() {
- return config.getLong(JobManagerOptions.WEB_REFRESH_INTERVAL);
+ return config.getLong(JOB_MANAGER_WEB_REFRESH_INTERVAL_KEY, DEFAULT_JOB_MANAGER_WEB_REFRESH_INTERVAL);
}
public boolean isProgramSubmitEnabled() {
- return config.getBoolean(JobManagerOptions.WEB_SUBMIT_ENABLE);
+ return config.getBoolean(
+ ConfigConstants.JOB_MANAGER_WEB_SUBMIT_ENABLED_KEY,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_SUBMIT_ENABLED);
}
public String getAllowOrigin() {
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
index 03b53ad..f83fa27 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
@@ -25,7 +25,6 @@ import io.netty.handler.codec.http.router.Router;
import org.apache.flink.api.common.time.Time;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.runtime.akka.AkkaUtils;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
@@ -192,13 +191,21 @@ public class WebRuntimeMonitor implements WebMonitor {
stackTraceSamples = new StackTraceSampleCoordinator(actorSystem.dispatcher(), 60000);
// Back pressure stats tracker config
- int cleanUpInterval = config.getInteger(JobManagerOptions.WEB_BACKPRESSURE_CLEANUP_INTERVAL);
+ int cleanUpInterval = config.getInteger(
+ ConfigConstants.JOB_MANAGER_WEB_BACK_PRESSURE_CLEAN_UP_INTERVAL,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_BACK_PRESSURE_CLEAN_UP_INTERVAL);
- int refreshInterval = config.getInteger(JobManagerOptions.WEB_BACKPRESSURE_REFRESH_INTERVAL);
+ int refreshInterval = config.getInteger(
+ ConfigConstants.JOB_MANAGER_WEB_BACK_PRESSURE_REFRESH_INTERVAL,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_BACK_PRESSURE_REFRESH_INTERVAL);
- int numSamples = config.getInteger(JobManagerOptions.WEB_BACKPRESSURE_NUM_SAMPLES);
+ int numSamples = config.getInteger(
+ ConfigConstants.JOB_MANAGER_WEB_BACK_PRESSURE_NUM_SAMPLES,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_BACK_PRESSURE_NUM_SAMPLES);
- int delay = config.getInteger(JobManagerOptions.WEB_BACKPRESSURE_DELAY);
+ int delay = config.getInteger(
+ ConfigConstants.JOB_MANAGER_WEB_BACK_PRESSURE_DELAY,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_BACK_PRESSURE_DELAY);
Time delayBetweenSamples = Time.milliseconds(delay);
@@ -212,7 +219,10 @@ public class WebRuntimeMonitor implements WebMonitor {
ExecutionContextExecutor context = ExecutionContext$.MODULE$.fromExecutor(executorService);
// Config to enable https access to the web-ui
- boolean enableSSL = config.getBoolean(JobManagerOptions.WEB_SSL_ENABLED) && SSLUtils.getSSLEnabled(config);
+ boolean enableSSL = config.getBoolean(
+ ConfigConstants.JOB_MANAGER_WEB_SSL_ENABLED,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_SSL_ENABLED) &&
+ SSLUtils.getSSLEnabled(config);
if (enableSSL) {
LOG.info("Enabling ssl for the web frontend");
@@ -300,7 +310,9 @@ public class WebRuntimeMonitor implements WebMonitor {
// DELETE is the preferred way of stopping a job (Rest-conform)
DELETE(router, new JobStoppingHandler());
- int maxCachedEntries = config.getInteger(JobManagerOptions.WEB_CHECKPOINTS_HISTORY_SIZE);
+ int maxCachedEntries = config.getInteger(
+ ConfigConstants.JOB_MANAGER_WEB_CHECKPOINTS_HISTORY_SIZE,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_CHECKPOINTS_HISTORY_SIZE);
CheckpointStatsCache cache = new CheckpointStatsCache(maxCachedEntries);
// Register the checkpoint stats handlers
@@ -513,14 +525,14 @@ public class WebRuntimeMonitor implements WebMonitor {
}
private String getBaseDirStr(Configuration configuration) {
- return configuration.getString(JobManagerOptions.WEB_TMP_DIR);
+ return configuration.getString(ConfigConstants.JOB_MANAGER_WEB_TMPDIR_KEY, System.getProperty("java.io.tmpdir"));
}
private File getUploadDir(Configuration configuration) {
- File baseDir = new File(configuration.getString(JobManagerOptions.WEB_UPLOAD_DIR,
+ File baseDir = new File(configuration.getString(ConfigConstants.JOB_MANAGER_WEB_UPLOAD_DIR_KEY,
getBaseDirStr(configuration)));
- boolean uploadDirSpecified = configuration.contains(JobManagerOptions.WEB_UPLOAD_DIR);
+ boolean uploadDirSpecified = configuration.containsKey(ConfigConstants.JOB_MANAGER_WEB_UPLOAD_DIR_KEY);
return uploadDirSpecified ? baseDir : new File(baseDir, "flink-web-" + UUID.randomUUID());
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
index a51a234..5ccfe90 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
@@ -25,7 +25,6 @@ import org.apache.curator.test.TestingServer;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.HighAvailabilityOptions;
-import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.runtime.akka.AkkaUtils;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
@@ -138,8 +137,8 @@ public class WebRuntimeMonitorITCase extends TestLogger {
Path logFile = Files.createFile(new File(logDir, "jobmanager.log").toPath());
Files.createFile(new File(logDir, "jobmanager.out").toPath());
- config.setInteger(JobManagerOptions.WEB_PORT, 0);
- config.setString(JobManagerOptions.WEB_LOG_PATH, logFile.toString());
+ config.setInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, 0);
+ config.setString(ConfigConstants.JOB_MANAGER_WEB_LOG_PATH_KEY, logFile.toString());
highAvailabilityServices = HighAvailabilityServicesUtils.createAvailableOrEmbeddedServices(
config,
@@ -287,8 +286,8 @@ public class WebRuntimeMonitorITCase extends TestLogger {
Files.createFile(new File(logDir, "jobmanager.out").toPath());
final Configuration config = new Configuration();
- config.setInteger(JobManagerOptions.WEB_PORT, 0);
- config.setString(JobManagerOptions.WEB_LOG_PATH, logFile.toString());
+ config.setInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, 0);
+ config.setString(ConfigConstants.JOB_MANAGER_WEB_LOG_PATH_KEY, logFile.toString());
config.setString(HighAvailabilityOptions.HA_MODE, "ZOOKEEPER");
config.setString(HighAvailabilityOptions.HA_ZOOKEEPER_QUORUM, zooKeeper.getConnectString());
@@ -464,8 +463,8 @@ public class WebRuntimeMonitorITCase extends TestLogger {
// Web frontend on random port
Configuration config = new Configuration();
- config.setInteger(JobManagerOptions.WEB_PORT, 0);
- config.setString(JobManagerOptions.WEB_LOG_PATH, logFile.toString());
+ config.setInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, 0);
+ config.setString(ConfigConstants.JOB_MANAGER_WEB_LOG_PATH_KEY, logFile.toString());
WebRuntimeMonitor webMonitor = new WebRuntimeMonitor(
config,
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java
index 0e76cfb..de0d9d0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java
@@ -25,7 +25,6 @@ import org.apache.flink.configuration.CoreOptions;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.IllegalConfigurationException;
-import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.runtime.JobException;
import org.apache.flink.runtime.checkpoint.CheckpointIDCounter;
@@ -206,7 +205,9 @@ public class ExecutionGraphBuilder {
}
// Maximum number of remembered checkpoints
- int historySize = jobManagerConfig.getInteger(JobManagerOptions.WEB_CHECKPOINTS_HISTORY_SIZE);
+ int historySize = jobManagerConfig.getInteger(
+ ConfigConstants.JOB_MANAGER_WEB_CHECKPOINTS_HISTORY_SIZE,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_CHECKPOINTS_HISTORY_SIZE);
CheckpointStatsTracker checkpointStatsTracker = new CheckpointStatsTracker(
historySize,
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorUtils.java
index dd9527e..2baadb5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorUtils.java
@@ -25,8 +25,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import java.net.URI;
+import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.core.fs.Path;
import org.apache.flink.runtime.execution.ExecutionState;
import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
@@ -80,14 +80,14 @@ public final class WebMonitorUtils {
if (logFilePath == null) {
LOG.warn("Log file environment variable '{}' is not set.", logEnv);
- logFilePath = config.getString(JobManagerOptions.WEB_LOG_PATH);
+ logFilePath = config.getString(ConfigConstants.JOB_MANAGER_WEB_LOG_PATH_KEY, null);
}
// not configured, cannot serve log files
if (logFilePath == null || logFilePath.length() < 4) {
LOG.warn("JobManager log files are unavailable in the web dashboard. " +
"Log file location not found in environment variable '{}' or configuration key '{}'.",
- logEnv, JobManagerOptions.WEB_LOG_PATH.key());
+ logEnv, ConfigConstants.JOB_MANAGER_WEB_LOG_PATH_KEY);
return new LogFileLocation(null, null);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index 57a6415..5092643 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -2532,7 +2532,8 @@ object JobManager {
val restartStrategy = RestartStrategyFactory.createRestartStrategyFactory(configuration)
- val archiveCount = configuration.getInteger(JobManagerOptions.WEB_ARCHIVE_COUNT)
+ val archiveCount = configuration.getInteger(ConfigConstants.JOB_MANAGER_WEB_ARCHIVE_COUNT,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_ARCHIVE_COUNT)
val archiveDir = configuration.getString(JobManagerOptions.ARCHIVE_DIR)
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
index 97117d2..aad3a4b 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
@@ -1661,6 +1661,10 @@ public abstract class StreamExecutionEnvironment {
public static StreamExecutionEnvironment createLocalEnvironmentWithWebUI(Configuration conf) {
checkNotNull(conf, "conf");
+ if (!conf.containsKey(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY)) {
+ int port = ConfigConstants.DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT;
+ conf.setInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, port);
+ }
conf.setBoolean(ConfigConstants.LOCAL_START_WEBSERVER, true);
LocalStreamEnvironment localEnv = new LocalStreamEnvironment(conf);
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java
index 437dd5f..f96ab3d 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java
@@ -30,7 +30,6 @@ import org.apache.flink.api.java.tuple.Tuple;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.HighAvailabilityOptions;
-import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.core.testutils.CommonTestUtils;
import org.apache.flink.runtime.messages.TaskManagerMessages;
@@ -149,8 +148,8 @@ public class TestBaseUtils extends TestLogger {
config.setString(ConfigConstants.AKKA_ASK_TIMEOUT, DEFAULT_AKKA_ASK_TIMEOUT + "s");
config.setString(ConfigConstants.AKKA_STARTUP_TIMEOUT, DEFAULT_AKKA_STARTUP_TIMEOUT);
- config.setInteger(JobManagerOptions.WEB_PORT, 8081);
- config.setString(JobManagerOptions.WEB_LOG_PATH, logFile.toString());
+ config.setInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, 8081);
+ config.setString(ConfigConstants.JOB_MANAGER_WEB_LOG_PATH_KEY, logFile.toString());
config.setString(ConfigConstants.TASK_MANAGER_LOG_PATH_KEY, logFile.toString());
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-tests/src/test/java/org/apache/flink/test/web/WebFrontendITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/web/WebFrontendITCase.java b/flink-tests/src/test/java/org/apache/flink/test/web/WebFrontendITCase.java
index 538ac98..003eb0c 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/web/WebFrontendITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/web/WebFrontendITCase.java
@@ -24,15 +24,12 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.math3.optim.nonlinear.vector.JacobianMultivariateVectorOptimizer;
import org.apache.flink.api.common.JobID;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobgraph.JobVertex;
-import org.apache.flink.runtime.jobmanager.JobManagerCliOptions;
import org.apache.flink.runtime.minicluster.LocalFlinkMiniCluster;
import org.apache.flink.runtime.testutils.StoppableInvokable;
import org.apache.flink.runtime.webmonitor.WebMonitorUtils;
@@ -87,7 +84,7 @@ public class WebFrontendITCase extends TestLogger {
Files.createFile(logFile.toPath());
Files.createFile(outFile.toPath());
- config.setString(JobManagerOptions.WEB_LOG_PATH, logFile.getAbsolutePath());
+ config.setString(ConfigConstants.JOB_MANAGER_WEB_LOG_PATH_KEY, logFile.getAbsolutePath());
config.setString(ConfigConstants.TASK_MANAGER_LOG_PATH_KEY, logFile.getAbsolutePath());
cluster = new LocalFlinkMiniCluster(config, false);
http://git-wip-us.apache.org/repos/asf/flink/blob/2baac899/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
index 64417f6..b62f957 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
@@ -372,7 +372,8 @@ public class YarnApplicationMasterRunner {
LOG);
String protocol = "http://";
- if (config.getBoolean(JobManagerOptions.WEB_SSL_ENABLED) && SSLUtils.getSSLEnabled(config)) {
+ if (config.getBoolean(ConfigConstants.JOB_MANAGER_WEB_SSL_ENABLED,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_SSL_ENABLED) && SSLUtils.getSSLEnabled(config)) {
protocol = "https://";
}
final String webMonitorURL = webMonitor == null ? null :
[8/9] flink git commit: Revert "[FLINK-5978] Move JM WebFrontend
address ConfigOption to JMOptions"
Posted by sr...@apache.org.
Revert "[FLINK-5978] Move JM WebFrontend address ConfigOption to JMOptions"
This reverts commit 60deaef08a8aa2a1a1cdc98acf45c066e96cd1ad.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/75f7e9ac
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/75f7e9ac
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/75f7e9ac
Branch: refs/heads/release-1.3
Commit: 75f7e9ac09097a940e271187f7ab78af89c2f954
Parents: 2baac89
Author: Stefan Richter <s....@data-artisans.com>
Authored: Sun May 14 15:37:25 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 15:37:25 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/configuration/ConfigConstants.java | 7 +------
.../org/apache/flink/configuration/JobManagerOptions.java | 7 -------
.../org/apache/flink/runtime/webmonitor/WebMonitorConfig.java | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/75f7e9ac/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
index 92e6b5d..61c1b27 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -1328,12 +1328,7 @@ public final class ConfigConstants {
// ------------------------- JobManager Web Frontend ----------------------
- /**
- * The config key for the address of the JobManager web frontend.
- *
- * @deprecated use {@link JobManagerOptions#WEB_FRONTEND_ADDRESS} instead
- */
- @Deprecated
+ /** The config key for the address of the JobManager web frontend. */
public static final ConfigOption<String> DEFAULT_JOB_MANAGER_WEB_FRONTEND_ADDRESS =
key("jobmanager.web.address")
.noDefaultValue();
http://git-wip-us.apache.org/repos/asf/flink/blob/75f7e9ac/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
index b924e8e..140ba2e 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
@@ -94,13 +94,6 @@ public class JobManagerOptions {
// ------------------------------------------------------------------------
/**
- * Config parameter defining the runtime monitor web-frontend server address.
- */
- public static final ConfigOption<String> WEB_FRONTEND_ADDRESS =
- key("jobmanager.web.address")
- .noDefaultValue();
-
- /**
* The port for the runtime monitor web-frontend server.
*/
public static final ConfigOption<Integer> WEB_PORT =
http://git-wip-us.apache.org/repos/asf/flink/blob/75f7e9ac/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
index dba2145..d95d13a 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
@@ -63,7 +63,7 @@ public class WebMonitorConfig {
}
public String getWebFrontendAddress() {
- return config.getValue(JobManagerOptions.WEB_FRONTEND_ADDRESS);
+ return config.getValue(ConfigConstants.DEFAULT_JOB_MANAGER_WEB_FRONTEND_ADDRESS);
}
public int getWebFrontendPort() {
[4/9] flink git commit: Revert "[FLINK-6414] [build] Use
scala.binary.version in place of change-scala-version.sh"
Posted by sr...@apache.org.
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-libraries/flink-gelly-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/pom.xml b/flink-libraries/flink-gelly-examples/pom.xml
index 68ad050..009781f 100644
--- a/flink-libraries/flink-gelly-examples/pom.xml
+++ b/flink-libraries/flink-gelly-examples/pom.xml
@@ -27,7 +27,7 @@
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-gelly-examples_${scala.binary.version}</artifactId>
+ <artifactId>flink-gelly-examples_2.10</artifactId>
<name>flink-gelly-examples</name>
<packaging>jar</packaging>
@@ -42,22 +42,22 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-gelly_${scala.binary.version}</artifactId>
+ <artifactId>flink-gelly_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-gelly-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-gelly-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -94,14 +94,14 @@
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-libraries/flink-gelly-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-scala/pom.xml b/flink-libraries/flink-gelly-scala/pom.xml
index 35b2188..256fc53 100644
--- a/flink-libraries/flink-gelly-scala/pom.xml
+++ b/flink-libraries/flink-gelly-scala/pom.xml
@@ -28,7 +28,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>flink-gelly-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-gelly-scala_2.10</artifactId>
<name>flink-gelly-scala</name>
<packaging>jar</packaging>
@@ -38,21 +38,21 @@ under the License.
<!-- core dependencies -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-gelly_${scala.binary.version}</artifactId>
+ <artifactId>flink-gelly_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -87,7 +87,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -95,7 +95,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-libraries/flink-gelly/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/pom.xml b/flink-libraries/flink-gelly/pom.xml
index d620a66..d656bb3 100644
--- a/flink-libraries/flink-gelly/pom.xml
+++ b/flink-libraries/flink-gelly/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-gelly_${scala.binary.version}</artifactId>
+ <artifactId>flink-gelly_2.10</artifactId>
<name>flink-gelly</name>
<packaging>jar</packaging>
@@ -47,7 +47,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -62,7 +62,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -77,7 +77,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-optimizer_${scala.binary.version}</artifactId>
+ <artifactId>flink-optimizer_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-libraries/flink-ml/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-ml/pom.xml b/flink-libraries/flink-ml/pom.xml
index 0f203b9..8aa84d2 100644
--- a/flink-libraries/flink-ml/pom.xml
+++ b/flink-libraries/flink-ml/pom.xml
@@ -28,7 +28,7 @@
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-ml_${scala.binary.version}</artifactId>
+ <artifactId>flink-ml_2.10</artifactId>
<name>flink-ml</name>
<packaging>jar</packaging>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -86,14 +86,14 @@
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-libraries/flink-python/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-python/pom.xml b/flink-libraries/flink-python/pom.xml
index 5b6405e..9d2f0c3 100644
--- a/flink-libraries/flink-python/pom.xml
+++ b/flink-libraries/flink-python/pom.xml
@@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-python_${scala.binary.version}</artifactId>
+ <artifactId>flink-python_2.10</artifactId>
<name>flink-python</name>
<packaging>jar</packaging>
@@ -69,7 +69,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -78,7 +78,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-libraries/flink-table/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml
index a34fa1b..8fa2ed2 100644
--- a/flink-libraries/flink-table/pom.xml
+++ b/flink-libraries/flink-table/pom.xml
@@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table_2.10</artifactId>
<name>flink-table</name>
<packaging>jar</packaging>
@@ -38,7 +38,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -114,14 +114,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -137,20 +137,20 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
+ <artifactId>flink-statebackend-rocksdb_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-mesos/pom.xml
----------------------------------------------------------------------
diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
index a1ef900..d03144f 100644
--- a/flink-mesos/pom.xml
+++ b/flink-mesos/pom.xml
@@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-mesos_${scala.binary.version}</artifactId>
+ <artifactId>flink-mesos_2.10</artifactId>
<name>flink-mesos</name>
<packaging>jar</packaging>
@@ -38,13 +38,13 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -130,7 +130,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -138,7 +138,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-metrics/flink-metrics-datadog/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-datadog/pom.xml b/flink-metrics/flink-metrics-datadog/pom.xml
index 1b1d9ad..e2bd6fa 100644
--- a/flink-metrics/flink-metrics-datadog/pom.xml
+++ b/flink-metrics/flink-metrics-datadog/pom.xml
@@ -63,7 +63,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-metrics/flink-metrics-dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-dropwizard/pom.xml b/flink-metrics/flink-metrics-dropwizard/pom.xml
index 631d68e..2ba12e6 100644
--- a/flink-metrics/flink-metrics-dropwizard/pom.xml
+++ b/flink-metrics/flink-metrics-dropwizard/pom.xml
@@ -58,7 +58,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-metrics/flink-metrics-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-jmx/pom.xml b/flink-metrics/flink-metrics-jmx/pom.xml
index 1e8ecc8..d738fc4 100644
--- a/flink-metrics/flink-metrics-jmx/pom.xml
+++ b/flink-metrics/flink-metrics-jmx/pom.xml
@@ -49,7 +49,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -65,7 +65,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-metrics/flink-metrics-statsd/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-statsd/pom.xml b/flink-metrics/flink-metrics-statsd/pom.xml
index 5b77f8d..80cfa32 100644
--- a/flink-metrics/flink-metrics-statsd/pom.xml
+++ b/flink-metrics/flink-metrics-statsd/pom.xml
@@ -51,7 +51,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-optimizer/pom.xml
----------------------------------------------------------------------
diff --git a/flink-optimizer/pom.xml b/flink-optimizer/pom.xml
index 499487b..c347082 100644
--- a/flink-optimizer/pom.xml
+++ b/flink-optimizer/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-optimizer_${scala.binary.version}</artifactId>
+ <artifactId>flink-optimizer_2.10</artifactId>
<name>flink-optimizer</name>
<packaging>jar</packaging>
@@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
index 9991d2c..2fa1835 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -82,12 +82,12 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${flink.version}</version>
</dependency>
@@ -124,13 +124,13 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
@@ -201,20 +201,20 @@ under the License.
<exclude>org.apache.flink:flink-shaded-curator-recipes</exclude>
<exclude>org.apache.flink:flink-core</exclude>
<exclude>org.apache.flink:flink-java</exclude>
- <exclude>org.apache.flink:flink-scala_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-runtime_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-optimizer_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-clients_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-avro_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-examples-batch_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-examples-streaming_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-streaming-java_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-streaming-scala_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-scala-shell_${scala.binary.version}</exclude>
+ <exclude>org.apache.flink:flink-scala_2.10</exclude>
+ <exclude>org.apache.flink:flink-runtime_2.10</exclude>
+ <exclude>org.apache.flink:flink-optimizer_2.10</exclude>
+ <exclude>org.apache.flink:flink-clients_2.10</exclude>
+ <exclude>org.apache.flink:flink-avro_2.10</exclude>
+ <exclude>org.apache.flink:flink-examples-batch_2.10</exclude>
+ <exclude>org.apache.flink:flink-examples-streaming_2.10</exclude>
+ <exclude>org.apache.flink:flink-streaming-java_2.10</exclude>
+ <exclude>org.apache.flink:flink-streaming-scala_2.10</exclude>
+ <exclude>org.apache.flink:flink-scala-shell_2.10</exclude>
<exclude>org.apache.flink:flink-python</exclude>
<exclude>org.apache.flink:flink-metrics-core</exclude>
<exclude>org.apache.flink:flink-metrics-jmx</exclude>
- <exclude>org.apache.flink:flink-statebackend-rocksdb_${scala.binary.version}</exclude>
+ <exclude>org.apache.flink:flink-statebackend-rocksdb_2.10</exclude>
<!-- Also exclude very big transitive dependencies of Flink
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
index 2139c6b..189bbce 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -78,17 +78,17 @@ under the License.
<!-- Apache Flink dependencies -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${flink.version}</version>
</dependency>
@@ -116,19 +116,19 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
@@ -202,20 +202,20 @@ under the License.
<exclude>org.apache.flink:flink-shaded-curator-recipes</exclude>
<exclude>org.apache.flink:flink-core</exclude>
<exclude>org.apache.flink:flink-java</exclude>
- <exclude>org.apache.flink:flink-scala_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-runtime_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-optimizer_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-clients_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-avro_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-examples-batch_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-examples-streaming_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-streaming-java_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-streaming-scala_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-scala-shell_${scala.binary.version}</exclude>
+ <exclude>org.apache.flink:flink-scala_2.10</exclude>
+ <exclude>org.apache.flink:flink-runtime_2.10</exclude>
+ <exclude>org.apache.flink:flink-optimizer_2.10</exclude>
+ <exclude>org.apache.flink:flink-clients_2.10</exclude>
+ <exclude>org.apache.flink:flink-avro_2.10</exclude>
+ <exclude>org.apache.flink:flink-examples-batch_2.10</exclude>
+ <exclude>org.apache.flink:flink-examples-streaming_2.10</exclude>
+ <exclude>org.apache.flink:flink-streaming-java_2.10</exclude>
+ <exclude>org.apache.flink:flink-streaming-scala_2.10</exclude>
+ <exclude>org.apache.flink:flink-scala-shell_2.10</exclude>
<exclude>org.apache.flink:flink-python</exclude>
<exclude>org.apache.flink:flink-metrics-core</exclude>
<exclude>org.apache.flink:flink-metrics-jmx</exclude>
- <exclude>org.apache.flink:flink-statebackend-rocksdb_${scala.binary.version}</exclude>
+ <exclude>org.apache.flink:flink-statebackend-rocksdb_2.10</exclude>
<!-- Also exclude very big transitive dependencies of Flink
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-runtime-web/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml
index 8a4671b..e7870f3 100644
--- a/flink-runtime-web/pom.xml
+++ b/flink-runtime-web/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-runtime-web_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime-web_2.10</artifactId>
<name>flink-runtime-web</name>
<packaging>jar</packaging>
@@ -42,12 +42,12 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -99,7 +99,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index a13a985..8abdc3c 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<name>flink-runtime</name>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-scala-shell/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index c9acbec..0aadfc6 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-scala-shell_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala-shell_2.10</artifactId>
<name>flink-scala-shell</name>
<packaging>jar</packaging>
@@ -44,19 +44,19 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -82,7 +82,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -214,14 +214,14 @@ under the License.
<id>scala-2.10</id>
<activation>
<property>
- <!-- only required for Scala 2.10 -->
+ <!-- this is the default scala profile -->
<name>!scala-2.11</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.scalamacros</groupId>
- <artifactId>quasiquotes_2.10</artifactId>
+ <artifactId>quasiquotes_${scala.binary.version}</artifactId>
<version>${scala.macros.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 7fad487..7be1e29 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -28,7 +28,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<name>flink-scala</name>
<packaging>jar</packaging>
@@ -82,7 +82,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -241,14 +241,14 @@ under the License.
<id>scala-2.10</id>
<activation>
<property>
- <!-- only required for Scala 2.10 -->
+ <!-- this is the default scala profile -->
<name>!scala-2.11</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.scalamacros</groupId>
- <artifactId>quasiquotes_2.10</artifactId>
+ <artifactId>quasiquotes_${scala.binary.version}</artifactId>
<version>${scala.macros.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-streaming-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-java/pom.xml b/flink-streaming-java/pom.xml
index 46142de..ea987af 100644
--- a/flink-streaming-java/pom.xml
+++ b/flink-streaming-java/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<name>flink-streaming-java</name>
<packaging>jar</packaging>
@@ -46,13 +46,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -85,7 +85,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-streaming-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml
index 586dca7..4ec12bd 100644
--- a/flink-streaming-scala/pom.xml
+++ b/flink-streaming-scala/pom.xml
@@ -28,7 +28,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-scala_2.10</artifactId>
<name>flink-streaming-scala</name>
<packaging>jar</packaging>
@@ -38,13 +38,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -85,14 +85,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -100,7 +100,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -108,7 +108,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-test-utils-parent/flink-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/pom.xml b/flink-test-utils-parent/flink-test-utils/pom.xml
index 4f53794..36bdceb 100644
--- a/flink-test-utils-parent/flink-test-utils/pom.xml
+++ b/flink-test-utils-parent/flink-test-utils/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<name>flink-test-utils</name>
<packaging>jar</packaging>
@@ -45,21 +45,21 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index 3c0b184..b67edbb 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests_2.10</artifactId>
<name>flink-tests</name>
<packaging>jar</packaging>
@@ -54,28 +54,28 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-optimizer_${scala.binary.version}</artifactId>
+ <artifactId>flink-optimizer_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime-web_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime-web_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime-web_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime-web_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -83,7 +83,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -97,14 +97,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -112,21 +112,21 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-batch_${scala.binary.version}</artifactId>
+ <artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -141,14 +141,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
+ <artifactId>flink-hadoop-compatibility_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
+ <artifactId>flink-hadoop-compatibility_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -156,7 +156,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -164,14 +164,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-optimizer_${scala.binary.version}</artifactId>
+ <artifactId>flink-optimizer_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -179,7 +179,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -224,7 +224,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
+ <artifactId>flink-statebackend-rocksdb_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-yarn-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index 626d886..f296e8d 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -33,7 +33,7 @@ under the License.
We need the YARN fat jar build by flink-dist for the tests.
-->
- <artifactId>flink-yarn-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-yarn-tests_2.10</artifactId>
<name>flink-yarn-tests</name>
<packaging>jar</packaging>
@@ -43,14 +43,14 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -59,21 +59,21 @@ under the License.
<!-- Needed for the streaming wordcount example -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-yarn_${scala.binary.version}</artifactId>
+ <artifactId>flink-yarn_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-yarn_${scala.binary.version}</artifactId>
+ <artifactId>flink-yarn_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/flink-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml
index e97fee5..5946094 100644
--- a/flink-yarn/pom.xml
+++ b/flink-yarn/pom.xml
@@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-yarn_${scala.binary.version}</artifactId>
+ <artifactId>flink-yarn_2.10</artifactId>
<name>flink-yarn</name>
<packaging>jar</packaging>
@@ -37,7 +37,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
@@ -49,7 +49,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
@@ -61,7 +61,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -98,7 +98,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
+ <artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/tools/change-scala-version.sh
----------------------------------------------------------------------
diff --git a/tools/change-scala-version.sh b/tools/change-scala-version.sh
new file mode 100755
index 0000000..56c48c6
--- /dev/null
+++ b/tools/change-scala-version.sh
@@ -0,0 +1,117 @@
+#!/usr/bin/env bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This shell script is from Apache Spark with some modification.
+
+set -e
+
+VALID_VERSIONS=( 2.10 2.11 )
+
+usage() {
+ echo "Usage: $(basename $0) [-h|--help] <scala version to be used>
+where :
+ -h| --help Display this help text
+ valid scala version values : ${VALID_VERSIONS[*]}
+" 1>&2
+ exit 1
+}
+
+if [[ ($# -ne 1) || ( $1 == "--help") || $1 == "-h" ]]; then
+ usage
+fi
+
+TO_VERSION=$1
+
+check_scala_version() {
+ for i in ${VALID_VERSIONS[*]}; do [ $i = "$1" ] && return 0; done
+ echo "Invalid Scala version: $1. Valid versions: ${VALID_VERSIONS[*]}" 1>&2
+ exit 1
+}
+
+check_scala_version "$TO_VERSION"
+
+if [ $TO_VERSION = "2.11" ]; then
+ FROM_SUFFIX="_2\.10"
+ TO_SUFFIX="_2\.11"
+else
+ FROM_SUFFIX="_2\.11"
+ TO_SUFFIX="_2\.10"
+fi
+
+sed_i() {
+ sed -e "$1" "$2" > "$2.tmp" && mv "$2.tmp" "$2"
+}
+
+export -f sed_i
+
+echo "sed_i 's/\(artifactId>flink.*'$FROM_SUFFIX'\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}";
+
+BASEDIR=$(dirname $0)/..
+find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(artifactId>flink.*\)'$FROM_SUFFIX'<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" \;
+
+# fix for examples
+find "$BASEDIR/flink-examples/flink-examples-batch" -name 'pom.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(<copy file=\".*flink-examples-batch\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \;
+
+find "$BASEDIR/flink-examples/flink-examples-streaming" -name 'pom.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(<copy file=\".*flink-examples-streaming\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \;
+
+# fix for quickstart
+find "$BASEDIR/flink-quickstart" -name 'pom.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(<exclude>org\.apache\.flink:flink-.*\)'$FROM_SUFFIX'<\/exclude>/\1'$TO_SUFFIX'<\/exclude>/g' {}" \;
+
+# fix for flink-dist (bin.xml)
+find "$BASEDIR/flink-dist" -name 'bin.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(<source>.*flink-dist\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \;
+find "$BASEDIR/flink-dist" -name 'bin.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(<include>org\.apache\.flink:flink-.*\)'$FROM_SUFFIX'<\/include>/\1'$TO_SUFFIX'<\/include>/g' {}" \;
+
+# fix for flink-dist (opt.xml)
+find "$BASEDIR/flink-dist" -name 'opt.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(<source>.*flink-.*\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \;
+find "$BASEDIR/flink-dist" -name 'opt.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(<destName>flink-.*\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \;
+
+# fix for shading curator with Scala 2.11
+find "$BASEDIR/flink-runtime" -name 'pom.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(<include>org\.apache\.flink:flink-shaded-curator.*\)'$FROM_SUFFIX'<\/include>/\1'$TO_SUFFIX'<\/include>/g' {}" \;
+
+if [ "$TO_VERSION" == "2.11" ]; then
+ # set the profile activation to !scala-2.11 in parent pom, so that it activates by default
+ bash -c "sed_i 's/<name>scala-2.11<\/name>/<name>!scala-2.11<\/name>/g' $BASEDIR/pom.xml" \;
+ # set the profile activation in all sub modules to scala-2.11 (so that they are disabled by default)
+ find $BASEDIR/flink-* -name 'pom.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/<name>!scala-2.11<\/name>/<name>scala-2.11<\/name>/g' {}" \;
+
+ # set the name of the shading artifact properly
+ bash -c "sed_i 's/\(shading-artifact.name>flink-shaded[a-z0-9\-]*\)'$FROM_SUFFIX'<\/shading-artifact.name>/\1'$TO_SUFFIX'<\/shading-artifact.name>/g' $BASEDIR/pom.xml" \;
+fi
+
+if [ "$TO_VERSION" == "2.10" ]; then
+ # do the opposite as above
+ bash -c "sed_i 's/<name>!scala-2.11<\/name>/<name>scala-2.11<\/name>/g' $BASEDIR/pom.xml" \;
+ # also for the other files
+ find $BASEDIR/flink-* -name 'pom.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/<name>scala-2.11<\/name>/<name>!scala-2.11<\/name>/g' {}" \;
+
+ # unset shading artifact name
+ bash -c "sed_i 's/\(shading-artifact.name>flink-shaded[a-z0-9\-]*\)'$FROM_SUFFIX'<\/shading-artifact.name>/\1'$TO_SUFFIX'<\/shading-artifact.name>/g' $BASEDIR/pom.xml" \;
+fi
+
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/tools/create_release_files.sh
----------------------------------------------------------------------
diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh
index 40d038c..f4c4673 100755
--- a/tools/create_release_files.sh
+++ b/tools/create_release_files.sh
@@ -216,9 +216,10 @@ make_binary_release() {
# make distribution
cd "${dir_name}"
+ ./tools/change-scala-version.sh ${SCALA_VERSION}
# enable release profile here (to check for the maven version)
- $MVN clean package $FLAGS -DskipTests -Prelease,scala-${SCALA_VERSION} -Dgpg.skip
+ $MVN clean package $FLAGS -DskipTests -Prelease -Dgpg.skip
cd flink-dist/target/flink-*-bin/
tar czf "${dir_name}.tgz" flink-*
@@ -242,12 +243,15 @@ deploy_to_maven() {
cp ../../deploysettings.xml .
echo "Deploying Scala 2.11 version"
- $MVN clean deploy -Prelease,docs-and-source,scala-2.11 --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
+ cd tools && ./change-scala-version.sh 2.11 && cd ..
+
+ $MVN clean deploy -Prelease,docs-and-source --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
# It is important to first deploy scala 2.11 and then scala 2.10 so that the quickstarts (which are independent of the scala version)
# are depending on scala 2.10.
echo "Deploying Scala 2.10 version"
- $MVN clean deploy -Prelease,docs-and-source,scala-2.10 --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
+ cd tools && ./change-scala-version.sh 2.10 && cd ..
+ $MVN clean deploy -Dgpg.executable=$GPG -Prelease,docs-and-source --settings deploysettings.xml -DskipTests -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
}
copy_data() {
http://git-wip-us.apache.org/repos/asf/flink/blob/c5efae54/tools/deploy_to_maven.sh
----------------------------------------------------------------------
diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh
index 32acc5a..16d529e 100755
--- a/tools/deploy_to_maven.sh
+++ b/tools/deploy_to_maven.sh
@@ -89,14 +89,18 @@ if [[ $CURRENT_FLINK_VERSION == *SNAPSHOT* ]] ; then
# hadoop2 scala 2.10
echo "deploy standard version (hadoop2) for scala 2.10"
- mvn ${MVN_SNAPSHOT_OPTS} -Pscala-2.10
+ mvn ${MVN_SNAPSHOT_OPTS}
deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2"
# hadoop2 scala 2.11
echo "deploy hadoop2 version (standard) for scala 2.11"
- mvn ${MVN_SNAPSHOT_OPTS} -Pscala-2.11
+ ./tools/change-scala-version.sh 2.11
+ mvn ${MVN_SNAPSHOT_OPTS}
deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2_2.11"
+ echo "Changing back to scala 2.10"
+ ./tools/change-scala-version.sh 2.10
+
exit 0
else
exit 1
[6/9] flink git commit: Revert "[FLINK-6509] [tests] Perform
TestingListener#waitForNewLeader under lock"
Posted by sr...@apache.org.
Revert "[FLINK-6509] [tests] Perform TestingListener#waitForNewLeader under lock"
This reverts commit d88a62f9c0030a35ffdec5c252c8428ab8960521.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/cc6036fd
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/cc6036fd
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/cc6036fd
Branch: refs/heads/release-1.3
Commit: cc6036fd50b243ff075ce17aef3b26680571bb14
Parents: c5efae5
Author: Stefan Richter <s....@data-artisans.com>
Authored: Sun May 14 15:37:16 2017 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Sun May 14 15:37:16 2017 +0200
----------------------------------------------------------------------
.../apache/flink/runtime/leaderelection/TestingListener.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/cc6036fd/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/TestingListener.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/TestingListener.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/TestingListener.java
index 8571505..87decc7 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/TestingListener.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/TestingListener.java
@@ -51,11 +51,11 @@ public class TestingListener implements LeaderRetrievalListener {
long start = System.currentTimeMillis();
long curTimeout;
- synchronized (lock) {
- while (
+ while (
exception == null &&
- (address == null || address.equals(oldAddress)) &&
- (curTimeout = timeout - System.currentTimeMillis() + start) > 0) {
+ (address == null || address.equals(oldAddress)) &&
+ (curTimeout = timeout - System.currentTimeMillis() + start) > 0) {
+ synchronized (lock) {
try {
lock.wait(curTimeout);
} catch (InterruptedException e) {