You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/08/02 20:38:39 UTC
[5/5] flink git commit: [FLINK-2434] [pom] Fix pattern for exclusion
of org.apache.hadoop:hadoop-yarn-common:jersey-test-framework-grizzly2
[FLINK-2434] [pom] Fix pattern for exclusion of org.apache.hadoop:hadoop-yarn-common:jersey-test-framework-grizzly2
This closes #955
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d73cb736
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d73cb736
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d73cb736
Branch: refs/heads/master
Commit: d73cb7369f2259e0e3a07221c659ceffa67230d5
Parents: b3dc3f0
Author: caofangkun <ca...@gmail.com>
Authored: Thu Jul 30 16:07:40 2015 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Aug 2 18:26:14 2015 +0200
----------------------------------------------------------------------
flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml | 2 +-
flink-shaded-hadoop/flink-shaded-include-yarn/pom.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d73cb736/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml
index 649fbbd..83422f9 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml
@@ -118,7 +118,7 @@ under the License.
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2+</artifactId>
+ <artifactId>jersey-test-framework-grizzly2</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/d73cb736/flink-shaded-hadoop/flink-shaded-include-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/flink-shaded-include-yarn/pom.xml b/flink-shaded-hadoop/flink-shaded-include-yarn/pom.xml
index 6e2c6b9..03a27ed 100644
--- a/flink-shaded-hadoop/flink-shaded-include-yarn/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-include-yarn/pom.xml
@@ -250,7 +250,7 @@ under the License.
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2+</artifactId>
+ <artifactId>jersey-test-framework-grizzly2</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
@@ -394,7 +394,7 @@ under the License.
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2+</artifactId>
+ <artifactId>jersey-test-framework-grizzly2</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
@@ -538,7 +538,7 @@ under the License.
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2+</artifactId>
+ <artifactId>jersey-test-framework-grizzly2</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
@@ -682,7 +682,7 @@ under the License.
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2+</artifactId>
+ <artifactId>jersey-test-framework-grizzly2</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey.jersey-test-framework</groupId>