Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 69e44ccf3 -> a24292326
Expand the asm version range as we'll need v5 to be able to support Java8.
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bfcf3608
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bfcf3608
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bfcf3608
Branch: refs/heads/2.7.x-fixes
Commit: bfcf36080d9a0062d70f432657c837c9b1b6dc84
Parents: 69e44cc
Author: Daniel Kulp <[email protected]>
Authored: Wed Mar 26 14:13:58 2014 -0400
Committer: Daniel Kulp <[email protected]>
Committed: Wed Apr 2 02:07:33 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfcf3608/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9fda29b..2e902be 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -59,8 +59,7 @@
<cxf.asm.artifactId>asm</cxf.asm.artifactId>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.asm.bundle.version>3.3.1_1</cxf.asm.bundle.version>
- <cxf.osgi.asm.version>[2.0,5)</cxf.osgi.asm.version>
-
+ <cxf.osgi.asm.version>[2.0,6)</cxf.osgi.asm.version>
<!-- OSGi related properties -->
<cxf.fragment.host />
<cxf.bundle.activator />