You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/02/10 22:47:55 UTC
[05/10] isis git commit: ISIS-1288: updates to mvn plugin dependencies
ISIS-1288: updates to mvn plugin dependencies
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b95bbf7c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b95bbf7c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b95bbf7c
Branch: refs/heads/master
Commit: b95bbf7cb2c99123b40166a879607bc80bbce287
Parents: 05f1315
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:26:06 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:26:06 2016 +0000
----------------------------------------------------------------------
core/maven-plugin/pom.xml | 54 ++++++++++++++++--------------------------
1 file changed, 20 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b95bbf7c/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 4456432..f1850b3 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -40,6 +40,14 @@
<maven>3.0.4</maven>
</prerequisites>
+ <properties>
+ <maven-core.version>3.0.5</maven-core.version>
+ <maven-project.version>3.0-alpha-2</maven-project.version>
+ <maven-plugin-annotations.version>3.2</maven-plugin-annotations.version>
+ <plexus-sec-dispatcher.version>1.3</plexus-sec-dispatcher.version>
+ <plexus-utils.version>2.1</plexus-utils.version>
+ </properties>
+
<build>
<pluginManagement>
@@ -90,28 +98,6 @@
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.5</version>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- -->
</plugins>
</build>
@@ -136,19 +122,19 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>2.1</version>
+ <version>${plexus-utils.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.2</version>
+ <version>${maven-plugin-annotations.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -160,7 +146,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -172,7 +158,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -184,7 +170,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -196,7 +182,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -208,7 +194,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -220,7 +206,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>3.0-alpha-2</version>
+ <version>${maven-project.version}</version>
<exclusions>
<!-- for dependency convergence -->
<exclusion>
@@ -253,7 +239,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -285,7 +271,7 @@
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
- <version>1.3</version>
+ <version>${plexus-sec-dispatcher.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -297,7 +283,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
- <version>3.0-alpha-2</version>
+ <version>${maven-project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>