You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2017/11/13 11:03:56 UTC
[2/2] flink git commit: [FLINK-7702] Add maven-bundle-plugin to root
pom
[FLINK-7702] Add maven-bundle-plugin to root pom
Before, we had it in places that require it. This doesn't work when
running mvn javadoc:aggregate because this will only run for the root
pom and can then not find the "bundle" dependencies.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2929eda7
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2929eda7
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2929eda7
Branch: refs/heads/master
Commit: 2929eda7e244c1cd7250645702a808af967fae84
Parents: 07af8c1
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Fri Nov 10 18:13:26 2017 +0100
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Fri Nov 10 18:13:26 2017 +0100
----------------------------------------------------------------------
flink-connectors/flink-connector-filesystem/pom.xml | 13 -------------
flink-connectors/flink-connector-kafka-0.9/pom.xml | 11 -----------
flink-connectors/flink-connector-kafka-base/pom.xml | 11 -----------
flink-test-utils-parent/flink-test-utils/pom.xml | 12 ------------
flink-yarn-tests/pom.xml | 12 ------------
pom.xml | 15 +++++++++++++++
6 files changed, 15 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2929eda7/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 a80ae47..f1e7473 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -139,19 +139,6 @@ under the License.
<build>
<plugins>
-
- <!--
- https://issues.apache.org/jira/browse/DIRSHARED-134
- Required to pull the Mini-KDC transitive dependency
- -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- <inherited>true</inherited>
- <extensions>true</extensions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/flink/blob/2929eda7/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 7867bf8..d976dce 100644
--- a/flink-connectors/flink-connector-kafka-0.9/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.9/pom.xml
@@ -209,17 +209,6 @@ under the License.
<forkCount>1</forkCount>
</configuration>
</plugin>
- <!--
- https://issues.apache.org/jira/browse/DIRSHARED-134
- Required to pull the Mini-KDC transitive dependency
- -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- <inherited>true</inherited>
- <extensions>true</extensions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/2929eda7/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 9153a4c..7330c54 100644
--- a/flink-connectors/flink-connector-kafka-base/pom.xml
+++ b/flink-connectors/flink-connector-kafka-base/pom.xml
@@ -214,17 +214,6 @@ under the License.
</execution>
</executions>
</plugin>
- <!--
- https://issues.apache.org/jira/browse/DIRSHARED-134
- Required to pull the Mini-KDC transitive dependency
- -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- <inherited>true</inherited>
- <extensions>true</extensions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/2929eda7/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 4281c1a..d13febc 100644
--- a/flink-test-utils-parent/flink-test-utils/pom.xml
+++ b/flink-test-utils-parent/flink-test-utils/pom.xml
@@ -113,18 +113,6 @@ under the License.
<build>
<plugins>
- <!--
- https://issues.apache.org/jira/browse/DIRSHARED-134
- Required to pull the Mini-KDC transitive dependency
- -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- <inherited>true</inherited>
- <extensions>true</extensions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/flink/blob/2929eda7/flink-yarn-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index 3020bac..f9535e4 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -346,18 +346,6 @@ under the License.
</plugin>
<!--
- https://issues.apache.org/jira/browse/DIRSHARED-134
- Required to pull the Mini-KDC transitive dependency
- -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- <inherited>true</inherited>
- <extensions>true</extensions>
- </plugin>
-
- <!--
Copy batch and streaming examples programs in to the flink-yarn-tests/target/programs
directory to be run during YARN integration tests.
-->
http://git-wip-us.apache.org/repos/asf/flink/blob/2929eda7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fbdb87f..8741901 100644
--- a/pom.xml
+++ b/pom.xml
@@ -891,6 +891,21 @@ under the License.
<build>
<plugins>
+ <!--
+ We need to include this here because some of our modules have transitive dependencies
+ on jdbm1, which is of type "bundle". This only works if you include the
+ maven-bundle-plugin (see https://issues.apache.org/jira/browse/DIRSHARED-134). We need
+ the plugin in the root pom because Javadoc aggregation runs only in the root pom and
+ not the specific poms. Not having this here was the cause for FLINK-7702.
+ -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>