You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2017/07/19 11:19:21 UTC
karaf git commit: [KARAF-5264] Clean up maven dependencies
Repository: karaf
Updated Branches:
refs/heads/master d9d013b6c -> 47193f74f
[KARAF-5264] Clean up maven dependencies
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/47193f74
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/47193f74
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/47193f74
Branch: refs/heads/master
Commit: 47193f74f610dc3d267df77bb517c77342456b44
Parents: d9d013b
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Wed Jul 19 13:19:04 2017 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Wed Jul 19 13:19:04 2017 +0200
----------------------------------------------------------------------
assemblies/features/standard/pom.xml | 6 +++
.../standard/src/main/feature/feature.xml | 1 +
demos/command/pom.xml | 6 ---
itests/pom.xml | 2 +-
maven/core/pom.xml | 8 +++-
pom.xml | 43 +++++++++++++++-----
shell/table/pom.xml | 1 -
tooling/karaf-maven-plugin/pom.xml | 4 ++
tooling/karaf-services-maven-plugin/pom.xml | 4 ++
tooling/utils/pom.xml | 3 +-
util/pom.xml | 1 -
webconsole/console/pom.xml | 1 -
12 files changed, 56 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/assemblies/features/standard/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index e1a75b6..2f2ad69 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -168,6 +168,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.httplite.complete</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- package deps -->
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index d120d88..32aaa9d 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -959,6 +959,7 @@
<feature name="maven" description="Commands for Maven configuration of services from pax-url-aether" version="${project.version}">
<feature>shell</feature>
<bundle start-level="30" start="true">mvn:org.apache.karaf.maven/org.apache.karaf.maven.core/${project.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
<config name="org.apache.karaf.command.acl.maven">
#
# This configuration file defines the ACLs for maven configuration commands
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/demos/command/pom.xml
----------------------------------------------------------------------
diff --git a/demos/command/pom.xml b/demos/command/pom.xml
index 7fe5eb9..f2fe160 100644
--- a/demos/command/pom.xml
+++ b/demos/command/pom.xml
@@ -46,12 +46,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 68c4618..44f0840 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -192,7 +192,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>16.0.1</version>
+ <version>${guava.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/maven/core/pom.xml
----------------------------------------------------------------------
diff --git a/maven/core/pom.xml b/maven/core/pom.xml
index 403835e..0b6906a 100644
--- a/maven/core/pom.xml
+++ b/maven/core/pom.xml
@@ -63,8 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-embedder</artifactId>
- <version>3.0.3</version>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -113,6 +112,10 @@
!org.codehaus.plexus*,
!org.sonatype.aether*,
!org.sonatype.guice*,
+ !org.eclipse.aether*,
+ !org.eclipse.sisu*,
+ !javax.inject*,
+ !com.google.common.collect,
*,
</Import-Package>
<Private-Package>
@@ -122,6 +125,7 @@
org.apache.maven.settings.*;-split-package:=merge-first,
org.apache.maven.execution;-split-package:=merge-first,
org.apache.maven.model;-split-package:=merge-first,
+ org.apache.maven.building;-split-package:=merge-first,
org.codehaus.plexus.component.annotations,
org.sonatype.plexus.components.sec.dispatcher*,
org.sonatype.plexus.components.cipher,
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5ad6487..6d6b8d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,8 +158,10 @@
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>2.6</commons-lang.version>
+ <commons-lang3.version>3.5</commons-lang3.version>
+ <commons-logging.version>1.1.3</commons-logging.version>
<commons-pool.version>1.6</commons-pool.version>
- <commons-io.version>2.4</commons-io.version>
+ <commons-io.version>2.5</commons-io.version>
<dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
<eclipselink.version>2.6.4</eclipselink.version>
@@ -175,6 +177,7 @@
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
<easymock.version>3.4</easymock.version>
+ <objenesis.version>2.6</objenesis.version>
<equinox.groupId>org.eclipse.platform</equinox.groupId>
<equinox.artifactId>org.eclipse.osgi</equinox.artifactId>
<equinox.version>3.11.3</equinox.version>
@@ -240,6 +243,7 @@
<aries.transaction.blueprint.version2>2.1.0</aries.transaction.blueprint.version2>
<aries.util.version>1.1.3</aries.util.version>
+ <guava.version>20.0</guava.version>
<narayana.version>5.6.3.Final</narayana.version>
<hibernate.annotations.common.version>3.3.0.ga</hibernate.annotations.common.version>
<hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version>
@@ -254,10 +258,9 @@
<jline.version>3.3.1</jline.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>
- <maven.version>3.0.3</maven.version>
+ <maven.version>3.5.0</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>
+ <maven-plugin-annotations.version>3.5</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>
@@ -293,7 +296,7 @@
<xerces.version>2.11.0_1</xerces.version>
<xalan.bundle.version>2.7.2_3</xalan.bundle.version>
<xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>
- <javax.mail.version>1.4.5</javax.mail.version>
+ <javax.mail.version>1.4.7</javax.mail.version>
<winsw.version>1.18</winsw.version>
@@ -1072,11 +1075,6 @@
</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>
@@ -1372,6 +1370,11 @@
<version>${easymock.version}</version>
</dependency>
<dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>${objenesis.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
<version>${servicemix.specs.version}</version>
@@ -1711,6 +1714,26 @@
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/shell/table/pom.xml
----------------------------------------------------------------------
diff --git a/shell/table/pom.xml b/shell/table/pom.xml
index 2350ea8..0b1f14d 100644
--- a/shell/table/pom.xml
+++ b/shell/table/pom.xml
@@ -46,7 +46,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index a3538e9..ec6cc30 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -121,6 +121,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/tooling/karaf-services-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml
index fc8129d..62a61b2 100644
--- a/tooling/karaf-services-maven-plugin/pom.xml
+++ b/tooling/karaf-services-maven-plugin/pom.xml
@@ -117,6 +117,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/tooling/utils/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/utils/pom.xml b/tooling/utils/pom.xml
index 0d13a78..5cd4a96 100644
--- a/tooling/utils/pom.xml
+++ b/tooling/utils/pom.xml
@@ -35,12 +35,11 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>16.0.1</version>
+ <version>${guava.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/util/pom.xml
----------------------------------------------------------------------
diff --git a/util/pom.xml b/util/pom.xml
index 195d965..672b39a 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -60,7 +60,6 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.7</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/karaf/blob/47193f74/webconsole/console/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml
index a31661b..0ca490e 100644
--- a/webconsole/console/pom.xml
+++ b/webconsole/console/pom.xml
@@ -80,7 +80,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>