Skip to content

Commit

Permalink
[FLINK-7702] Add maven-bundle-plugin to root pom
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
aljoscha committed Nov 10, 2017
1 parent 07af8c1 commit 2929eda
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 59 deletions.
13 changes: 0 additions & 13 deletions flink-connectors/flink-connector-filesystem/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 0 additions & 11 deletions flink-connectors/flink-connector-kafka-0.9/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
11 changes: 0 additions & 11 deletions flink-connectors/flink-connector-kafka-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 0 additions & 12 deletions flink-test-utils-parent/flink-test-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions flink-yarn-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -345,18 +345,6 @@ under the License.
</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>

<!--
Copy batch and streaming examples programs in to the flink-yarn-tests/target/programs
directory to be run during YARN integration tests.
Expand Down
15 changes: 15 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 2929eda

Please sign in to comment.