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/05 12:10:39 UTC
[flink] branch master updated: [FLINK-12353][tools] Collect japicmp
output under tools/japicmp-output
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
The following commit(s) were added to refs/heads/master by this push:
new dc872ee [FLINK-12353][tools] Collect japicmp output under tools/japicmp-output
dc872ee is described below
commit dc872ee808e622959bcbe5a7cc3fadd80e697598
Author: Yun Tang <my...@live.com>
AuthorDate: Fri Jul 5 20:10:25 2019 +0800
[FLINK-12353][tools] Collect japicmp output under tools/japicmp-output
---
.gitignore | 1 +
pom.xml | 7 ++++++-
tools/collect_japicmp_reports.sh | 31 -------------------------------
3 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
index 876a676..22fac14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ out/
tools/flink
tools/flink-*
tools/releasing/release
+tools/japicmp-output
diff --git a/pom.xml b/pom.xml
index e4737a6..b5047f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,6 +141,8 @@ under the License.
<generated.docs.dir>./docs/_includes/generated</generated.docs.dir>
<hive.version>2.3.4</hive.version>
<hivemetastore.hadoop.version>2.7.2</hivemetastore.hadoop.version>
+ <jamicmp.referenceVersion>1.8.0</jamicmp.referenceVersion>
+ <japicmp.outputDir>tools/japicmp-output</japicmp.outputDir>
</properties>
<dependencies>
@@ -1370,6 +1372,8 @@ under the License.
<!-- Tools: watchdog -->
<exclude>tools/artifacts/**</exclude>
<exclude>tools/flink*/**</exclude>
+ <!-- Tools: japicmp output -->
+ <exclude>tools/japicmp-output/**</exclude>
<!-- artifacts created during release process -->
<exclude>tools/releasing/release/**</exclude>
<!-- manually installed version on travis -->
@@ -1778,7 +1782,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>${project.artifactId}</artifactId>
- <version>1.8.0</version>
+ <version>${jamicmp.referenceVersion}</version>
<type>${project.packaging}</type>
</dependency>
</oldVersion>
@@ -1819,6 +1823,7 @@ under the License.
<!-- Don't break build on newly added maven modules -->
<ignoreNonResolvableArtifacts>true</ignoreNonResolvableArtifacts>
</parameter>
+ <projectBuildDir>${rootDir}/${japicmp.outputDir}/${project.artifactId}</projectBuildDir>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
diff --git a/tools/collect_japicmp_reports.sh b/tools/collect_japicmp_reports.sh
deleted file mode 100755
index 6ff1238..0000000
--- a/tools/collect_japicmp_reports.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-#
-# 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.
-#
-
-
-HERE=` basename "$PWD"`
-if [[ "$HERE" != "tools" ]]; then
- echo "Please only execute in the tools/ directory";
- exit 1;
-fi
-
-cp ../flink-core/target/japicmp/japicmp.html flink-core.html
-cp ../flink-java/target/japicmp/japicmp.html flink-java.html
-cp ../flink-scala/target/japicmp/japicmp.html flink-scala.html
-cp ../flink-streaming-java/target/japicmp/japicmp.html flink-streaming-java.html
-