Change MANIFEST.MF version to 2.0 to match trunk build. It turns out this isn't so striaght forward to do as there are quite a few permutations you need to search/replace to catch all the occurances of 1.4 so this is going to make doing releases a bit harder so we may need to find a better way

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

4 files changed, 52 insertions, 52 deletions

diff --git a/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF
index 6378fdb1ee..b420f7f79d 100644
--- a/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Export-Package: org.apache.tuscany.sca.interfacedef.java.jaxws;uses:="
  rs,org.apache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.in

  terfacedef,org.apache.tuscany.sca.interfacedef.java.introspect,javax.

  xml.bind.annotation,org.apache.tuscany.sca.databinding.jaxb,org.apach

- e.tuscany.sca.interfacedef.impl,javax.xml.ws";version="1.4"

+ e.tuscany.sca.interfacedef.impl,javax.xml.ws";version="2.0"

 Tool: Bnd-0.0.255

 Bundle-Name: Apache Tuscany Java Interface for JAXWS

 Created-By: 1.6.0_07 (Sun Microsystems Inc.)

 Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 1.4

+Bundle-Version: 2.0

 Bnd-LastModified: 1225397232156

 Bundle-ManifestVersion: 2

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

@@ -27,24 +27,24 @@ Import-Package: javax.jws,
  javax.xml.transform.stream;resolution:=optional,

  javax.xml.ws,

  

- org.apache.tuscany.sca.assembly;version="1.4.0",

- org.apache.tuscany.sca.databinding;version="1.4",

- org.apache.tuscany.sca.databinding.annotation;version="1.4",

- org.apache.tuscany.sca.databinding.javabeans;version="1.4.0",

- org.apache.tuscany.sca.databinding.jaxb;version="1.4",

- org.apache.tuscany.sca.interfacedef;version="1.4",

- org.apache.tuscany.sca.interfacedef.impl;version="1.4",

- org.apache.tuscany.sca.interfacedef.java;version="1.4",

- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",

- org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",

- org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",

- org.apache.tuscany.sca.interfacedef.util;version="1.4",

- org.apache.tuscany.sca.policy;version="1.4.0",

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

+ org.apache.tuscany.sca.databinding;version="2.0",

+ org.apache.tuscany.sca.databinding.annotation;version="2.0",

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

+ org.apache.tuscany.sca.databinding.jaxb;version="2.0",

+ org.apache.tuscany.sca.interfacedef;version="2.0",

+ org.apache.tuscany.sca.interfacedef.impl;version="2.0",

+ org.apache.tuscany.sca.interfacedef.java;version="2.0",

+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0",

+ org.apache.tuscany.sca.interfacedef.java.introspect;version="2.0",

+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="2.0",

+ org.apache.tuscany.sca.interfacedef.util;version="2.0",

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

  

  org.objectweb.asm;version="3.1",

  org.objectweb.asm.util;version="3.1";resolution:=optional,

- org.osoa.sca;version="1.4",

- org.osoa.sca.annotations;version="1.4";resolution:=optional

+ org.osoa.sca;version="2.0",

+ org.osoa.sca.annotations;version="2.0";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.jaxws

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/java/sca/modules/interface-java-xml/META-INF/MANIFEST.MF b/java/sca/modules/interface-java-xml/META-INF/MANIFEST.MF
index 806a7730dc..1cf2b0cc0c 100644
--- a/java/sca/modules/interface-java-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-java-xml/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0

 Private-Package: org.apache.tuscany.sca.interfacedef.java.xml;version=

- "1.4"

+ "2.0"

 Tool: Bnd-0.0.255

 Bundle-Name: Apache Tuscany SCA Java Interface XML Model

 Created-By: 1.6.0_07 (Sun Microsystems Inc.)

 Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 1.4

+Bundle-Version: 2.0

 Bnd-LastModified: 1225397167906

 Bundle-ManifestVersion: 2

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

 Bundle-Description: Apache Tuscany SCA Java Interface XML Model

 Import-Package: javax.xml.namespace,

  javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="1.4";resolution:=optional,

- org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,

- org.apache.tuscany.sca.contribution.processor;version="1.4",

- org.apache.tuscany.sca.contribution.resolver;version="1.4",

- org.apache.tuscany.sca.core;version="1.4",

- org.apache.tuscany.sca.definitions;version="1.4";resolution:=optional,

- org.apache.tuscany.sca.interfacedef;version="1.4",

- org.apache.tuscany.sca.interfacedef.java;version="1.4",

- org.apache.tuscany.sca.monitor;version="1.4",

- org.apache.tuscany.sca.policy;version="1.4.0"

+ org.apache.tuscany.sca.assembly;version="2.0";resolution:=optional,

+ org.apache.tuscany.sca.assembly.builder;version="2.0";resolution:=optional,

+ org.apache.tuscany.sca.contribution.processor;version="2.0",

+ org.apache.tuscany.sca.contribution.resolver;version="2.0",

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

+ org.apache.tuscany.sca.definitions;version="2.0";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef;version="2.0",

+ org.apache.tuscany.sca.interfacedef.java;version="2.0",

+ org.apache.tuscany.sca.monitor;version="2.0",

+ org.apache.tuscany.sca.policy;version="2.0.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.xml

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/java/sca/modules/interface-java/META-INF/MANIFEST.MF b/java/sca/modules/interface-java/META-INF/MANIFEST.MF
index a2f58302b3..10df0680f0 100644
--- a/java/sca/modules/interface-java/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface-java/META-INF/MANIFEST.MF
@@ -4,35 +4,35 @@ Export-Package: org.apache.tuscany.sca.interfacedef.java.impl;uses:="o
  apache.tuscany.sca.policy,org.apache.tuscany.sca.interfacedef.java,or

  g.apache.tuscany.sca.interfacedef,javax.xml.namespace,org.apache.tusc

  any.sca.interfacedef.java.introspect,org.apache.tuscany.sca.interface

- def.impl";version="1.4",org.apache.tuscany.sca.interfacedef.java.intr

+ def.impl";version="2.0",org.apache.tuscany.sca.interfacedef.java.intr

  ospect;uses:="org.apache.tuscany.sca.interfacedef.java,org.apache.tus

- cany.sca.interfacedef";version="1.4",org.apache.tuscany.sca.interface

+ cany.sca.interfacedef";version="2.0",org.apache.tuscany.sca.interface

  def.java;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sc

  a.interfacedef.java.impl,org.apache.tuscany.sca.interfacedef.java.int

  rospect,org.apache.tuscany.sca.core,org.apache.tuscany.sca.policy,org

  .apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.extensibility

- ,javax.xml.namespace";version="1.4"

+ ,javax.xml.namespace";version="2.0"

 Tool: Bnd-0.0.255

 Bundle-Name: Apache Tuscany SCA Java Interface Model

 Created-By: 1.6.0_07 (Sun Microsystems Inc.)

 Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 1.4

+Bundle-Version: 2.0

 Bnd-LastModified: 1225397130359

 Bundle-ManifestVersion: 2

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

 Bundle-Description: Apache Tuscany SCA Java Interface Model

 Import-Package: javax.xml.namespace,

- org.apache.tuscany.sca.assembly;version="1.4",

- org.apache.tuscany.sca.core;version="1.4",

- org.apache.tuscany.sca.extensibility;version="1.4",

- org.apache.tuscany.sca.interfacedef;version="1.4",

- org.apache.tuscany.sca.interfacedef.impl;version="1.4",

- org.apache.tuscany.sca.interfacedef.java;version="1.4",

- org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",

- org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",

- org.apache.tuscany.sca.interfacedef.util;version="1.4",

- org.apache.tuscany.sca.policy;version="1.4",

- org.osoa.sca.annotations;version="1.4"

+ org.apache.tuscany.sca.assembly;version="2.0",

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

+ org.apache.tuscany.sca.extensibility;version="2.0",

+ org.apache.tuscany.sca.interfacedef;version="2.0",

+ org.apache.tuscany.sca.interfacedef.impl;version="2.0",

+ org.apache.tuscany.sca.interfacedef.java;version="2.0",

+ org.apache.tuscany.sca.interfacedef.java.impl;version="2.0",

+ org.apache.tuscany.sca.interfacedef.java.introspect;version="2.0",

+ org.apache.tuscany.sca.interfacedef.util;version="2.0",

+ org.apache.tuscany.sca.policy;version="2.0",

+ org.osoa.sca.annotations;version="2.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/java/sca/modules/interface/META-INF/MANIFEST.MF b/java/sca/modules/interface/META-INF/MANIFEST.MF
index 50d1eb711a..a5f7a82cf3 100644
--- a/java/sca/modules/interface/META-INF/MANIFEST.MF
+++ b/java/sca/modules/interface/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.interfacedef.util;uses:="javax.

  xml.transform,org.apache.tuscany.sca.interfacedef.impl,org.apache.tus

  cany.sca.interfacedef,javax.xml.datatype,javax.xml.namespace";version

- ="1.4",org.apache.tuscany.sca.interfacedef.impl;uses:="org.apache.tus

+ ="2.0",org.apache.tuscany.sca.interfacedef.impl;uses:="org.apache.tus

  cany.sca.interfacedef.util,org.apache.tuscany.sca.policy,org.apache.t

- uscany.sca.interfacedef";version="1.4",org.apache.tuscany.sca.interfa

+ uscany.sca.interfacedef";version="2.0",org.apache.tuscany.sca.interfa

  cedef;uses:="org.apache.tuscany.sca.interfacedef.util,org.apache.tusc

- any.sca.policy";version="1.4"

+ any.sca.policy";version="2.0"

 Tool: Bnd-0.0.255

 Bundle-Name: Apache Tuscany SCA Interface Model

 Created-By: 1.6.0_07 (Sun Microsystems Inc.)

 Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 1.4

+Bundle-Version: 2.0

 Bnd-LastModified: 1225397086703

 Bundle-ManifestVersion: 2

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

 Bundle-Description: Apache Tuscany SCA Interface Model

 Import-Package: javax.xml.datatype,javax.xml.namespace,javax.xml.trans

- form,org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.tus

- cany.sca.interfacedef.impl;version="1.4",org.apache.tuscany.sca.inter

- facedef.util;version="1.4",org.apache.tuscany.sca.policy;version="1.4

+ form,org.apache.tuscany.sca.interfacedef;version="2.0",org.apache.tus

+ cany.sca.interfacedef.impl;version="2.0",org.apache.tuscany.sca.inter

+ facedef.util;version="2.0",org.apache.tuscany.sca.policy;version="2.0

  ",org.apache.tuscany.sca.core;ve

- rsion="1.4";resolution:=optional

+ rsion="2.0";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.interface

 Bundle-DocURL: http://www.apache.org/