You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2016/11/01 00:37:53 UTC
activemq git commit: Fix warnings in Eclipse IDE;
remove deprecated prerequisites in maven3
Repository: activemq
Updated Branches:
refs/heads/master d9940eaf2 -> a8a650cbe
Fix warnings in Eclipse IDE; remove deprecated prerequisites in maven3
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a8a650cb
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a8a650cb
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a8a650cb
Branch: refs/heads/master
Commit: a8a650cbeea13308a96bd1fe4945cc88bd10b39e
Parents: d9940ea
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Mon Oct 31 20:37:45 2016 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Mon Oct 31 20:37:45 2016 -0400
----------------------------------------------------------------------
activemq-karaf-itest/pom.xml | 1 -
activemq-leveldb-store/pom.xml | 1 -
activemq-osgi/pom.xml | 1 -
activemq-spring/pom.xml | 1 -
assembly/pom.xml | 1 -
pom.xml | 58 +++++++++++++++----------------------
6 files changed, 24 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/a8a650cb/activemq-karaf-itest/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index e43d6e4..14c65ed 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -93,7 +93,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.core-version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq/blob/a8a650cb/activemq-leveldb-store/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 8ff615f..32d5677 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -137,7 +137,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.core-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq/blob/a8a650cb/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 8306031..130ec11 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -227,7 +227,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>${maven-dependency-plugin-version}</version>
<executions>
<execution>
<id>unpack</id>
http://git-wip-us.apache.org/repos/asf/activemq/blob/a8a650cb/activemq-spring/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 4f998d2..cda5019 100755
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -108,7 +108,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.core-version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/activemq/blob/a8a650cb/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7147587..bf586db 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -73,7 +73,6 @@
<dependency>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-junit</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq/blob/a8a650cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 101955c..10dabc9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -184,10 +184,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <prerequisites>
- <maven>3.1.1</maven>
- </prerequisites>
-
<url>http://activemq.apache.org</url>
<issueManagement>
@@ -1318,17 +1314,30 @@
</action>
</pluginExecution>
<pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <versionRange>[3.1,)</versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <versionRange>[3.1,)</versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
@@ -1351,25 +1360,6 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[3.0.2,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
<executions>