Skip to content

Commit

Permalink
[ZEPPELIN-4700] Cleanup Maven warnings & unify plugin management
Browse files Browse the repository at this point in the history
### What is this PR for?

This commit declares all plugins in the `pluginManagement` section and unifies versions of
all plugins - they are now declared as properties in the top-level `pom.xml`.  All other
`pom.xml` files shouldn't specify version explicitly.

### What type of PR is it?
Improvement

### What is the Jira issue?

* ZEPPELIN-4700

### How should this be tested?
* One build was clean: https://travis-ci.org/github/alexott/zeppelin/builds/668812389, but after removing the not necessary files from commit, some tests began to fail: https://travis-ci.org/github/alexott/zeppelin/builds/669129366 - not sure if it's a case of flaky tests (yes, it looks like it the case - after restart of failed builds - they are all green)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Alex Ott <[email protected]>

Closes apache#3707 from alexott/ZEPPELIN-4700 and squashes the following commits:

6de1eb3 [Alex Ott] [ZEPPELIN-4700] Cleanup Maven warnings & unify plugin management
  • Loading branch information
alexott committed Apr 9, 2020
1 parent 0430161 commit 8815eec
Show file tree
Hide file tree
Showing 33 changed files with 210 additions and 172 deletions.
7 changes: 0 additions & 7 deletions cassandra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
<achilles.version>3.2.4-Zeppelin</achilles.version>
<jna.version>4.2.0</jna.version>

<!-- plugin versions -->
<plugin.scala.version>2.15.2</plugin.scala.version>
<plugin.scalatest.version>1.0</plugin.scalatest.version>
<plugin.scalate.version>1.7.1</plugin.scalate.version>
<interpreter.name>cassandra</interpreter.name>
</properties>

Expand Down Expand Up @@ -199,7 +195,6 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>${plugin.scala.version}</version>
<executions>
<execution>
<id>compile</id>
Expand Down Expand Up @@ -227,7 +222,6 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>${plugin.scalatest.version}</version>
<executions>
<execution>
<id>test</id>
Expand All @@ -241,7 +235,6 @@
<plugin>
<groupId>org.scalatra.scalate</groupId>
<artifactId>maven-scalate-plugin_${scala.binary.version}</artifactId>
<version>${plugin.scalate.version}</version>
<executions>
<execution>
<id>compile</id>
Expand Down
22 changes: 1 addition & 21 deletions flink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.12</scala.version>

<!--plugin versions-->
<plugin.scalamaven.version>3.2.2</plugin.scalamaven.version>
<plugin.eclipse.version>2.8</plugin.eclipse.version>
<plugin.buildhelper.version>1.7</plugin.buildhelper.version>
<plugin.scalastyle.version>0.5.0</plugin.scalastyle.version>

<flink.bin.download.url>https://archive.apache.org/dist/flink/flink-${flink.version}/flink-${flink.version}-bin-scala_${scala.binary.version}.tgz</flink.bin.download.url>
</properties>

Expand Down Expand Up @@ -559,7 +553,6 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<executions>
<execution>
<id>eclipse-add-source</id>
Expand Down Expand Up @@ -635,6 +628,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>false</skip>
<forkMode>always</forkMode>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<!-- set sun.zip.disableMemoryMapping=true because of
Expand All @@ -649,12 +643,10 @@
</configuration>
</plugin>


<!-- Eclipse Integration -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>${plugin.eclipse.version}</version>
<configuration>
<downloadSources>true</downloadSources>
<projectnatures>
Expand All @@ -679,7 +671,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${plugin.buildhelper.version}</version>
<executions>
<!-- Add src/main/scala to eclipse build path -->
<execution>
Expand Down Expand Up @@ -710,16 +701,6 @@
</executions>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
<environmentVariables>
<FLINK_CONF_DIR>${project.build.directory}/test-classes</FLINK_CONF_DIR>
</environmentVariables>
</configuration>
</plugin>

<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
Expand All @@ -732,7 +713,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${plugin.shade.version}</version>
<configuration>
<filters>
<filter>
Expand Down
1 change: 0 additions & 1 deletion ignite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>${plugin.scala.version}</version>
<configuration>
<scalaVersion>${ignite.scala.version}</scalaVersion>
</configuration>
Expand Down
5 changes: 0 additions & 5 deletions livy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@
<livy.version>0.5.0-incubating</livy.version>
<spark.version>2.1.0</spark.version>
<hadoop.version>2.6.0</hadoop.version>
<!--plugin versions-->
<plugin.failsafe.version>2.16</plugin.failsafe.version>
<plugin.antrun.version>1.8</plugin.antrun.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -319,7 +316,6 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${plugin.failsafe.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -343,7 +339,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${plugin.antrun.version}</version>
<executions>
<!-- Cleans up files that tests append to (because we have two test plugins). -->
<execution>
Expand Down
1 change: 0 additions & 1 deletion neo4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<executions>
<execution>
<id>enforce</id>
Expand Down
Loading

0 comments on commit 8815eec

Please sign in to comment.