You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/07/18 11:04:26 UTC
[flink] branch master updated (c52f14b -> 07ce142)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from c52f14b [FLINK-13319][catalog][docs] Add chinese version
new 5c36c65 [FLINK-12578][build] Use secure MapR repository by default
new 07ce142 [FLINK-12578][build] Add fallback unsafe MapR repository
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-filesystems/flink-mapr-fs/pom.xml | 22 +++++++++++++++++++++-
pom.xml | 2 +-
tools/travis_watchdog.sh | 4 +++-
3 files changed, 25 insertions(+), 3 deletions(-)
[flink] 01/02: [FLINK-12578][build] Use secure MapR repository by
default
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5c36c650e6520d92191ce2da33f7dcae774319f6
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu Jul 18 13:00:50 2019 +0200
[FLINK-12578][build] Use secure MapR repository by default
---
flink-filesystems/flink-mapr-fs/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flink-filesystems/flink-mapr-fs/pom.xml b/flink-filesystems/flink-mapr-fs/pom.xml
index 74b9170..5238423 100644
--- a/flink-filesystems/flink-mapr-fs/pom.xml
+++ b/flink-filesystems/flink-mapr-fs/pom.xml
@@ -35,7 +35,7 @@ under the License.
<repositories>
<repository>
<id>mapr-releases</id>
- <url>http://repository.mapr.com/maven/</url>
+ <url>https://repository.mapr.com/maven/</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
diff --git a/pom.xml b/pom.xml
index 1911d85..3f7cd8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1006,7 +1006,7 @@ under the License.
<!-- MapR -->
<repository>
<id>mapr-releases</id>
- <url>http://repository.mapr.com/maven/</url>
+ <url>https://repository.mapr.com/maven/</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
[flink] 02/02: [FLINK-12578][build] Add fallback unsafe MapR
repository
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 07ce142259a08eaec2e044c31d5beaa7b19ae6b6
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu Jul 18 13:01:11 2019 +0200
[FLINK-12578][build] Add fallback unsafe MapR repository
---
flink-filesystems/flink-mapr-fs/pom.xml | 20 ++++++++++++++++++++
tools/travis_watchdog.sh | 4 +++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/flink-filesystems/flink-mapr-fs/pom.xml b/flink-filesystems/flink-mapr-fs/pom.xml
index 5238423..e32954c 100644
--- a/flink-filesystems/flink-mapr-fs/pom.xml
+++ b/flink-filesystems/flink-mapr-fs/pom.xml
@@ -41,6 +41,26 @@ under the License.
</repository>
</repositories>
+ <profiles>
+ <profile>
+ <id>unsafe-mapr-repo</id>
+ <activation>
+ <property>
+ <name>unsafe-mapr-repo</name>
+ </property>
+ </activation>
+ <repositories>
+ <!-- MapR -->
+ <repository>
+ <id>mapr-releases</id>
+ <url>http://repository.mapr.com/maven/</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ <releases><enabled>true</enabled></releases>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
diff --git a/tools/travis_watchdog.sh b/tools/travis_watchdog.sh
index b6214fa..b9b2b7d 100755
--- a/tools/travis_watchdog.sh
+++ b/tools/travis_watchdog.sh
@@ -59,8 +59,10 @@ MVN_TEST_MODULES=$(get_test_modules_for_stage ${TEST})
#
# -nsu option forbids downloading snapshot artifacts. The only snapshot artifacts we depend are from
# Flink, which however should all be built locally. see FLINK-7230
+#
+# We use -Punsafe-mapr-repo since the https version fails on Travis for some reason.
MVN_LOGGING_OPTIONS="-Dlog.dir=${ARTIFACTS_DIR} -Dlog4j.configuration=file://$LOG4J_PROPERTIES -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-MVN_COMMON_OPTIONS="-nsu -Dflink.forkCount=2 -Dflink.forkCountTestPackage=2 -Dfast -B -Pskip-webui-build $MVN_LOGGING_OPTIONS"
+MVN_COMMON_OPTIONS="-nsu -Dflink.forkCount=2 -Dflink.forkCountTestPackage=2 -Dfast -B -Pskip-webui-build -Punsafe-mapr-repo $MVN_LOGGING_OPTIONS"
MVN_COMPILE_OPTIONS="-DskipTests"
MVN_TEST_OPTIONS="$MVN_LOGGING_OPTIONS -Dflink.tests.with-openssl"