You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2015/02/12 12:01:03 UTC
[1/2] archiva git commit: inherit from parent pom
Repository: archiva
Updated Branches:
refs/heads/master 62813d417 -> e16894724
inherit from parent pom
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/0b22f0e1
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/0b22f0e1
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/0b22f0e1
Branch: refs/heads/master
Commit: 0b22f0e1f8e66a756c92a2d86b5c09c5eb7cb822
Parents: 62813d4
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Feb 12 21:58:28 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Feb 12 21:58:28 2015 +1100
----------------------------------------------------------------------
archiva-cli/pom.xml | 2 --
archiva-modules/archiva-karaf/archiva-features/pom.xml | 2 +-
pom.xml | 6 ------
3 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b22f0e1/archiva-cli/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 3e8e9b3..e729854 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -94,7 +94,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<phase>package</phase>
@@ -127,7 +126,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
<configuration>
<archive>
<manifest>
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b22f0e1/archiva-modules/archiva-karaf/archiva-features/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml
index 68fb6f6..e8faf88 100644
--- a/archiva-modules/archiva-karaf/archiva-features/pom.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml
@@ -136,7 +136,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
- <version>2.2.4</version>
+ <version>2.4.1</version>
<configuration>
<file>${project.build.directory}/classes/features.xml</file>
<karafConfig>${project.build.directory}/classes/config.properties</karafConfig>
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b22f0e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 01db89b..84c0f91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1820,13 +1820,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5</version>
<configuration>
<localCheckout>true</localCheckout>
<useReleaseProfile>false</useReleaseProfile>
[2/2] archiva git commit: inherit from parent pom
Posted by ol...@apache.org.
inherit from parent pom
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/e1689472
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/e1689472
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/e1689472
Branch: refs/heads/master
Commit: e16894724fb8d6668841a9ed6d2384f1678324f4
Parents: 0b22f0e
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Feb 12 22:00:46 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Feb 12 22:00:46 2015 +1100
----------------------------------------------------------------------
pom.xml | 15 ---------------
1 file changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/e1689472/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84c0f91..0ee4514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1789,21 +1789,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>1.7</version>