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 2015/07/03 12:03:51 UTC
[1/2] camel git commit: [CAMEL-8928] spring-security not part of the
camel BOM
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 86cc66f92 -> 99dce53f8
refs/heads/master 38af95578 -> 2feb85a86
[CAMEL-8928] spring-security not part of the camel BOM
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/99dce53f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/99dce53f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/99dce53f
Branch: refs/heads/camel-2.15.x
Commit: 99dce53f8547b5f715c23a111eaf9714f69273c7
Parents: 86cc66f
Author: Thomas Diesler <th...@jboss.com>
Authored: Fri Jul 3 11:07:45 2015 +0200
Committer: Thomas Diesler <th...@jboss.com>
Committed: Fri Jul 3 11:07:45 2015 +0200
----------------------------------------------------------------------
components/camel-spring-security/pom.xml | 2 --
parent/pom.xml | 10 ++++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/99dce53f/components/camel-spring-security/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml
index 5633601..0f0b1e8 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>${spring-security-version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -64,7 +63,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>${spring-security-version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/99dce53f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 01a4cc4..7f71d7c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2082,6 +2082,16 @@
<artifactId>spring-osgi-mock</artifactId>
<version>${spring-osgi-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${spring-security-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring-security-version}</version>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
[2/2] camel git commit: [CAMEL-8928] spring-security not part of the
camel BOM
Posted by da...@apache.org.
[CAMEL-8928] spring-security not part of the camel BOM
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2feb85a8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2feb85a8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2feb85a8
Branch: refs/heads/master
Commit: 2feb85a86893dd456bcfd7a38fa7720736e21dca
Parents: 38af955
Author: Thomas Diesler <th...@jboss.com>
Authored: Fri Jul 3 11:07:45 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jul 3 12:09:50 2015 +0200
----------------------------------------------------------------------
components/camel-spring-security/pom.xml | 2 --
parent/pom.xml | 10 ++++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2feb85a8/components/camel-spring-security/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml
index 017ed9a..52b12db 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>${spring-security-version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -64,7 +63,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>${spring-security-version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/2feb85a8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 86cca78..af8141c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2122,6 +2122,16 @@
<artifactId>spring-osgi-mock</artifactId>
<version>${spring-osgi-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${spring-security-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring-security-version}</version>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>