This is an automated email from the ASF dual-hosted git repository.
jnioche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 8db4c4fac [STORM-3963] Add m2e plugin to storm-shaded-deps and few
minor pom.xml fixes.
new 7c5ae53ee Merge pull request #3573 from bipinprasad/storm-3963
8db4c4fac is described below
commit 8db4c4fac7a5113d94fb78415700eca8fc1a0df6
Author: bipinprasad <[email protected]>
AuthorDate: Tue Aug 29 08:03:30 2023 -0700
[STORM-3963] Add m2e plugin to storm-shaded-deps and few minor pom.xml
fixes.
---
examples/storm-kafka-client-examples/pom.xml | 1 -
examples/storm-perf/pom.xml | 1 -
examples/storm-solr-examples/pom.xml | 7 +++---
external/storm-kafka-client/pom.xml | 1 -
external/storm-solr/pom.xml | 4 ++--
pom.xml | 1 -
storm-client/pom.xml | 1 -
storm-core/pom.xml | 6 +-----
storm-server/pom.xml | 1 -
storm-shaded-deps/pom.xml | 32 ++++++++++++++++++++++++++--
10 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/examples/storm-kafka-client-examples/pom.xml
b/examples/storm-kafka-client-examples/pom.xml
index d564ca60f..b8f28cf06 100644
--- a/examples/storm-kafka-client-examples/pom.xml
+++ b/examples/storm-kafka-client-examples/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${storm.kafka.client.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/examples/storm-perf/pom.xml b/examples/storm-perf/pom.xml
index 86fb8db1e..0b66450cf 100644
--- a/examples/storm-perf/pom.xml
+++ b/examples/storm-perf/pom.xml
@@ -24,7 +24,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.storm</groupId>
<artifactId>storm-perf</artifactId>
<packaging>jar</packaging>
<name>Storm Perf</name>
diff --git a/examples/storm-solr-examples/pom.xml
b/examples/storm-solr-examples/pom.xml
index 793daf0dd..18d11e824 100644
--- a/examples/storm-solr-examples/pom.xml
+++ b/examples/storm-solr-examples/pom.xml
@@ -29,7 +29,7 @@
<properties>
<!-- Required downgrade by solr-core 5.5.5 -->
- <guava.version>17.0</guava.version>
+ <guava.version.downgrade.solr>17.0</guava.version.downgrade.solr>
</properties>
<dependencies>
@@ -57,8 +57,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -67,7 +66,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <version>${guava.version.downgrade.solr}</version>
</dependency>
</dependencies>
diff --git a/external/storm-kafka-client/pom.xml
b/external/storm-kafka-client/pom.xml
index 36a92c1fb..29b9d0414 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -58,7 +58,6 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${storm.kafka.client.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
diff --git a/external/storm-solr/pom.xml b/external/storm-solr/pom.xml
index dfd4441b0..4f69bba65 100644
--- a/external/storm-solr/pom.xml
+++ b/external/storm-solr/pom.xml
@@ -38,7 +38,7 @@
<properties>
<solr.version>5.5.5</solr.version>
<!-- Required downgrade by solr-core 5.5.5 -->
- <guava.version>17.0</guava.version>
+ <guava.version.downgrade.solr>17.0</guava.version.downgrade.solr>
</properties>
<dependencies>
@@ -122,7 +122,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <version>${guava.version.downgrade.solr}</version>
</dependency>
<!--test dependencies -->
<dependency>
diff --git a/pom.xml b/pom.xml
index ae69b27d8..f341c3dcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1469,7 +1469,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>v@{project.version}</tagNameFormat>
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 77261b956..9f4286a64 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -187,7 +187,6 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
<executions>
<execution>
<id>copy-dependencies</id>
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index f7047f098..6180f4782 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
- <version>${kryo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
@@ -199,7 +198,6 @@
-->
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
- <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.directory.server</groupId>
@@ -306,9 +304,7 @@
<testNamespace>${clojure.test.set}</testNamespace>
</testNamespaces>
<testDeclaredNamespaceOnly>${clojure.test.declared.namespace.only}</testDeclaredNamespaceOnly>
- <configuration>
-
<clojureOptions>-Dstorm.home=${project.basedir}/target/testhome</clojureOptions>
- </configuration>
+
<clojureOptions>-Dstorm.home=${project.basedir}/target/testhome</clojureOptions>
</configuration>
</execution>
</executions>
diff --git a/storm-server/pom.xml b/storm-server/pom.xml
index 9ec15b0b2..2fd88db0b 100644
--- a/storm-server/pom.xml
+++ b/storm-server/pom.xml
@@ -133,7 +133,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/storm-shaded-deps/pom.xml b/storm-shaded-deps/pom.xml
index 3c51f74ea..ae903b269 100644
--- a/storm-shaded-deps/pom.xml
+++ b/storm-shaded-deps/pom.xml
@@ -27,7 +27,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.storm</groupId>
<artifactId>storm-shaded-deps</artifactId>
<packaging>jar</packaging>
<name>Shaded Deps for Storm Client</name>
@@ -337,7 +336,7 @@
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<executions>
<execution>
<id>workaround-makeItVisibleOnIntellij</id>
@@ -358,5 +357,34 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e
settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-checkstyle-plugin</artifactId>
+ <versionRange>[3.0.0,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
