You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/07/03 16:00:47 UTC
[8/8] karaf git commit: Merge remote-tracking branch
'kemitix/update-poms-and-remove-dependencyhelper30'
Merge remote-tracking branch 'kemitix/update-poms-and-remove-dependencyhelper30'
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bfd98f95
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bfd98f95
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bfd98f95
Branch: refs/heads/master
Commit: bfd98f95d35b4650dc652ede518e1da9bdc4c7d1
Parents: 09accaf c29b9ca
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Jul 3 17:56:33 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jul 3 17:56:33 2017 +0200
----------------------------------------------------------------------
pom.xml | 7 +
tooling/karaf-maven-plugin/pom.xml | 62 ++-
.../karaf/tooling/utils/Dependency30Helper.java | 406 -------------------
.../karaf/tooling/utils/Dependency31Helper.java | 3 -
.../tooling/utils/DependencyHelperFactory.java | 48 +--
.../karaf/tooling/features/MavenUtilTest.java | 36 --
tooling/karaf-services-maven-plugin/pom.xml | 2 +-
tooling/pom.xml | 4 +
8 files changed, 91 insertions(+), 477 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bfd98f95/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3d6b825,a4313e8..346f328
--- a/pom.xml
+++ b/pom.xml
@@@ -251,11 -249,12 +251,13 @@@
<hibernate.validator.version>5.3.4.Final</hibernate.validator.version>
<jansi.version>1.16</jansi.version>
<javassist.version>3.9.0.GA</javassist.version>
- <jline.version>3.3.0</jline.version>
+ <jline.version>3.3.1</jline.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>
- <maven.version>2.0.9</maven.version>
- <maven-project.version>2.0.9</maven-project.version>
+ <maven.version>3.0.3</maven.version>
+ <maven.wagon.version>2.10</maven.wagon.version>
++ <maven-project.version>3.0.3</maven-project.version>
+ <maven-plugin-annotations.version>3.3</maven-plugin-annotations.version>
<org.osgi.service.jdbc.version>1.0.0</org.osgi.service.jdbc.version>
<org.osgi.service.jpa.version>1.0.0</org.osgi.service.jpa.version>
<osgi.version>6.0.0</osgi.version>
@@@ -1065,50 -1064,10 +1067,55 @@@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${maven-project.version}</version>
+ </dependency>
+ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-dependency-tree</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>${maven.wagon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>${maven.wagon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>${maven.wagon.version}</version>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/bfd98f95/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bfd98f95/tooling/karaf-services-maven-plugin/pom.xml
----------------------------------------------------------------------