You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/05/10 11:37:44 UTC
[1/2] storm git commit: STORM-3063: Fix minor pom issues
Repository: storm
Updated Branches:
refs/heads/master 290458c12 -> 5deba40fc
STORM-3063: Fix minor pom issues
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9749c60d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9749c60d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9749c60d
Branch: refs/heads/master
Commit: 9749c60d387e124f022cf023f12d7884d31b6afd
Parents: 02639f4
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Sun May 6 13:54:06 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Wed May 9 18:37:30 2018 +0200
----------------------------------------------------------------------
pom.xml | 24 +++++++++++++++++++-----
storm-core/pom.xml | 4 ----
2 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9749c60d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c486ac6..7430f60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,11 +231,6 @@
</developers>
-
- <prerequisites>
- <maven>3.0.0</maven>
- </prerequisites>
-
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</developerConnection>
@@ -1275,6 +1270,25 @@
<useStandardDocletOptions>true</useStandardDocletOptions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.0</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/storm/blob/9749c60d/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 26109f9..179e0b9 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -280,10 +280,6 @@
<artifactId>java-hamcrest</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
[2/2] storm git commit: Merge branch 'STORM-3063' of
https://github.com/srdo/storm into asfgit-master
Posted by sr...@apache.org.
Merge branch 'STORM-3063' of https://github.com/srdo/storm into asfgit-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5deba40f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5deba40f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5deba40f
Branch: refs/heads/master
Commit: 5deba40fca0f88f61d2086cb902318ad9bb044f1
Parents: 290458c 9749c60
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Thu May 10 13:37:17 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Thu May 10 13:37:17 2018 +0200
----------------------------------------------------------------------
pom.xml | 24 +++++++++++++++++++-----
storm-core/pom.xml | 4 ----
2 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------