Fix a few dependencies

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1095241 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 5 insertions, 3 deletions

diff --git a/sca-java-2.x/trunk/modules/databinding-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/databinding-axiom/META-INF/MANIFEST.MF
index 545f8432ed..81274e19be 100644
--- a/sca-java-2.x/trunk/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/databinding-axiom/META-INF/MANIFEST.MF
@@ -16,6 +16,7 @@ Import-Package: javax.xml.namespace,
  javax.xml.stream,

  org.apache.axiom.om,

  org.apache.axiom.om.impl.builder,

+ org.apache.axiom.om.util;resolution:=optional,

  org.apache.tuscany.sca.databinding;version="2.0.0",

  org.apache.tuscany.sca.databinding.axiom;version="2.0.0",

  org.apache.tuscany.sca.databinding.impl;version="2.0.0",

diff --git a/sca-java-2.x/trunk/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java b/sca-java-2.x/trunk/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java
index 874013e886..2deec4a23e 100644
--- a/sca-java-2.x/trunk/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java
+++ b/sca-java-2.x/trunk/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;

 

 import org.apache.axiom.om.OMElement;

-import org.apache.axiom.om.impl.llom.util.AXIOMUtil;

+import org.apache.axiom.om.util.AXIOMUtil;

 import org.apache.tuscany.sca.interfacedef.Operation;

 import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;

 import org.apache.tuscany.sca.interfacedef.util.ElementInfo;

diff --git a/sca-java-2.x/trunk/modules/node-api/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/node-api/META-INF/MANIFEST.MF
index 4c51f30ed5..3828b3f978 100644
--- a/sca-java-2.x/trunk/modules/node-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/node-api/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Bundle-Version: 2.0.0
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Node API

-Import-Package: org.apache.tuscany.sca.assembly,

+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",

+ org.apache.tuscany.sca.core;version="2.0.0",

  org.apache.tuscany.sca.node;version="2.0.0",

  org.apache.tuscany.sca.node.configuration;version="2.0.0",

  org.oasisopen.sca;version="2.0.0"

diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml
index 048f4b7d52..f0dd822c86 100644
--- a/sca-java-2.x/trunk/pom.xml
+++ b/sca-java-2.x/trunk/pom.xml
@@ -677,7 +677,7 @@ org.apache.tuscany.sca.assembly:org.apache.tuscany.sca.assembly.builder:org.apac
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0-beta-1</version>
+        <version>1.0</version>
         <executions>
           <execution>
             <id>enforce-plugin-versions</id>