Move some versions up into parent/pom
Conflicts:
parent/pom.xml
rt/rs/extensions/search/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0e41d571
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0e41d571
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0e41d571
Branch: refs/heads/2.7.x-fixes
Commit: 0e41d5719589d0d9b4ca15074f15ded4247908fe
Parents: c2c9ced
Author: Daniel Kulp <[email protected]>
Authored: Wed Apr 2 13:41:05 2014 -0400
Committer: Daniel Kulp <[email protected]>
Committed: Fri Apr 4 10:06:21 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 4 ++++
rt/rs/extensions/search/pom.xml | 1 -
rt/rs/security/oauth-parent/oauth/pom.xml | 2 +-
rt/rs/security/oauth-parent/pom.xml | 1 -
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e41d571/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b46b30a..acb60a5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -102,6 +102,9 @@
<cxf.httpcomponents.core.version.range>[4.2.1,4.3.0)</cxf.httpcomponents.core.version.range>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>
+ <cxf.logback.classic.version>1.0.13</cxf.logback.classic.version>
+ <cxf.log4j.version>1.2.17</cxf.log4j.version>
+ <cxf.lucene.version>4.0.0-BETA</cxf.lucene.version>
<cxf.mina.version>2.0.7</cxf.mina.version>
<cxf.javax.annotation-api.version>1.2-b04</cxf.javax.annotation-api.version>
<cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
@@ -132,6 +135,7 @@
<cxf.msv.version>2011.1</cxf.msv.version>
<cxf.neethi.version>3.0.3</cxf.neethi.version>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
+ <cxf.oauth.version>20100527</cxf.oauth.version>
<cxf.opensaml.version>2.6.1</cxf.opensaml.version>
<cxf.opensaml.osgi.version>2.6.1_1</cxf.opensaml.osgi.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e41d571/rt/rs/extensions/search/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 900cb93..b521cf6 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -36,7 +36,6 @@
<properties>
<hibernate.em.version>4.1.0.Final</hibernate.em.version>
<hsqldb.version>1.8.0.10</hsqldb.version>
- <cxf.lucene.version>4.0.0-BETA</cxf.lucene.version>
<cxf.osgi.import>
org.apache.cxf.jaxrs.impl.tl
</cxf.osgi.import>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e41d571/rt/rs/security/oauth-parent/oauth/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/pom.xml
b/rt/rs/security/oauth-parent/oauth/pom.xml
index b9693df..cfa1020 100644
--- a/rt/rs/security/oauth-parent/oauth/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-provider</artifactId>
- <version>${oauth.version}</version>
+ <version>${cxf.oauth.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e41d571/rt/rs/security/oauth-parent/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/pom.xml
b/rt/rs/security/oauth-parent/pom.xml
index 2ba2884..ccab779 100644
--- a/rt/rs/security/oauth-parent/pom.xml
+++ b/rt/rs/security/oauth-parent/pom.xml
@@ -34,7 +34,6 @@
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
<properties>
- <oauth.version>20100527</oauth.version>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
</cxf.osgi.import>
