You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/04/22 08:49:28 UTC
camel git commit: Upgrade maven-assembly-plugin and removed cruft
Repository: camel
Updated Branches:
refs/heads/master c775f9cea -> 56d87de36
Upgrade maven-assembly-plugin and removed cruft
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/56d87de3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/56d87de3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/56d87de3
Branch: refs/heads/master
Commit: 56d87de36afc4f92aa6b193f315344aaeaa7d922
Parents: c775f9c
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Apr 22 10:43:08 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 22 10:43:08 2017 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 50 +----------------------------------------------
parent/pom.xml | 1 +
2 files changed, 2 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/56d87de3/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index dd67838..3297096 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -2325,55 +2325,6 @@
<artifactId>camel-route-parser</artifactId>
</dependency>
- <!-- TODO: these dependencies should not be needed
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- <optional>true</optional>
- </dependency>
- -->
-
</dependencies>
<build>
@@ -2405,6 +2356,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin-version}</version>
<executions>
<execution>
<id>bin</id>
http://git-wip-us.apache.org/repos/asf/camel/blob/56d87de3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0019b59..2b2a52c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -430,6 +430,7 @@
<maven-antrun-plugin-version>1.6</maven-antrun-plugin-version>
<maven-archetype-plugin-version>2.0</maven-archetype-plugin-version>
<maven-archetype-packaging-version>2.0</maven-archetype-packaging-version>
+ <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
<maven-bundle-version>${maven-bundle-plugin-version}</maven-bundle-version>
<maven-bundle-plugin-version>3.3.0</maven-bundle-plugin-version>
<maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version>