Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2011-08-02 09:32:13 -0400
committerChristopher Frost2011-08-02 09:32:13 -0400
commit87d65d8ffe631274ad2893b4bf9863bb9f515df3 (patch)
tree56c4a4b930e85fc41c4ea90b6c21da8bd5d85e62
parenta4880259e3cb8c687d75ed4193d2e3e8a9760ef9 (diff)
downloadorg.eclipse.virgo.kernel-87d65d8ffe631274ad2893b4bf9863bb9f515df3.tar.gz
org.eclipse.virgo.kernel-87d65d8ffe631274ad2893b4bf9863bb9f515df3.tar.xz
org.eclipse.virgo.kernel-87d65d8ffe631274ad2893b4bf9863bb9f515df3.zip
Updating ivy files to 2.0 and a better layout
-rw-r--r--build-kernel/build.xml2
-rw-r--r--build-kernel/kernel-ivy.xml15
-rw-r--r--build-kernel/lib-ivy.xml3
-rw-r--r--build-kernel/repository-ext-ivy.xml39
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.artifact/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.authentication/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.core/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml8
-rw-r--r--org.eclipse.virgo.kernel.deployer/ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.model/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.osgi/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.osgicommand/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.services/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.shell/ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.shutdown/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.smoketest/ivy.xml5
-rw-r--r--org.eclipse.virgo.kernel.stubs/ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.userregion/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/ivy.xml3
-rw-r--r--org.eclipse.virgo.kernel/ivy.xml6
26 files changed, 65 insertions, 94 deletions
diff --git a/build-kernel/build.xml b/build-kernel/build.xml
index f1b8ad8f..a03904c9 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -57,7 +57,7 @@
<!-- Workaround for the issue that exclude does not work properly for Equinox in kernel-ivy.xml -->
<delete file="${package.output.dir}/lib/kernel/org.eclipse.osgi-${org.eclipse.osgi}.jar"/>
- <ivy:resolve resolveId="copy.path" file="${basedir}/kernel-ivy.xml" transitive="true"/>
+ <ivy:resolve resolveId="copy.path" file="${basedir}/repository-ext-ivy.xml" transitive="true"/>
<ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/repository/ext/[artifact]-[revision].[ext]" conf="repository-ext" type="jar"/>
<mkdir dir="${package.output.dir}/config"/>
diff --git a/build-kernel/kernel-ivy.xml b/build-kernel/kernel-ivy.xml
index 4a9bd2e0..e1e140fc 100644
--- a/build-kernel/kernel-ivy.xml
+++ b/build-kernel/kernel-ivy.xml
@@ -1,20 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
<conf name="lib-kernel" visibility="public" description="Dependencies to be packaged in lib/kernel"/>
- <conf name="repository-ext" visibility="public" description="Dependencies to be packaged in repository/ext"/>
</configurations>
<dependencies>
- <!-- lib/kernel -->
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel" rev="latest.integration" conf="lib-kernel->runtime"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="lib-kernel->runtime"/>
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.userregionfactory" rev="latest.integration" conf="lib-kernel->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.org.apache.commons.logging" rev="${org.slf4j}" conf="lib-kernel->runtime"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="lib-kernel->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="lib-kernel->runtime"/>
@@ -27,20 +23,11 @@
<dependency org="org.apache.felix" name="org.apache.felix.gogo.shell" rev="${org.apache.felix.gogo}" conf="lib-kernel->runtime" />
<dependency org="org.apache.mina" name="com.springsource.org.apache.mina.core" rev="${com.springsource.org.apache.mina.core}" conf="lib-kernel->runtime" />
<dependency org="org.apache.mina" name="com.springsource.org.apache.sshd.core" rev="${com.springsource.org.apache.sshd.core}" conf="lib-kernel->runtime" />
-
- <!-- repository-ext -->
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="repository-ext->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.extender" rev="${org.springframework.osgi}" conf="repository-ext->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.io" rev="${org.springframework.osgi}" conf="repository-ext->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.ds" rev="${org.eclipse.equinox.ds}" conf="repository-ext->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="repository-ext->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="repository-ext->runtime"/>
<!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work.
This is due to the transitive dependency from org.eclipse.virgo.osgi.equinox on org.eclipse.osgi
See build.xml for a workaround. -->
<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
- <exclude org="org.eclipse.virgo.util" conf="repository-ext"/>
<exclude org="org.eclipse.virgo.osgi" module="org.eclipse.virgo.osgi.extensions.equinox"/>
<exclude org="org.eclipse.virgo.osgi" module="org.eclipse.virgo.osgi.launcher"/>
<exclude org="org.aspectj" module="com.springsource.org.aspectj.runtime"/>
diff --git a/build-kernel/lib-ivy.xml b/build-kernel/lib-ivy.xml
index eb52dffe..e8de44fc 100644
--- a/build-kernel/lib-ivy.xml
+++ b/build-kernel/lib-ivy.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="com.springsource" module="${ant.project.name}" />
diff --git a/build-kernel/repository-ext-ivy.xml b/build-kernel/repository-ext-ivy.xml
new file mode 100644
index 00000000..e36ec212
--- /dev/null
+++ b/build-kernel/repository-ext-ivy.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
+
+ <info organisation="org.eclipse.virgo" module="${ant.project.name}" />
+
+ <configurations>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+ <conf name="repository-ext" visibility="public" description="Dependencies to be packaged in repository/ext"/>
+ </configurations>
+
+ <dependencies>
+ <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="repository-ext->runtime"/>
+ <dependency org="org.springframework.osgi" name="org.springframework.osgi.extender" rev="${org.springframework.osgi}" conf="repository-ext->runtime"/>
+ <dependency org="org.springframework.osgi" name="org.springframework.osgi.io" rev="${org.springframework.osgi}" conf="repository-ext->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.ds" rev="${org.eclipse.equinox.ds}" conf="repository-ext->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="repository-ext->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="repository-ext->runtime"/>
+
+ <!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work.
+ This is due to the transitive dependency from org.eclipse.virgo.osgi.equinox on org.eclipse.osgi
+ See build.xml for a workaround. -->
+ <exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
+ <exclude org="org.eclipse.virgo.util" conf="repository-ext"/>
+ <exclude org="org.eclipse.virgo.osgi" module="org.eclipse.virgo.osgi.extensions.equinox"/>
+ <exclude org="org.eclipse.virgo.osgi" module="org.eclipse.virgo.osgi.launcher"/>
+ <exclude org="org.aspectj" module="com.springsource.org.aspectj.runtime"/>
+ <exclude org="org.jboss.logging"/>
+ <exclude org="org.jboss.util"/>
+ <exclude org="org.jboss.vfs"/>
+ <exclude org="org.apache.commons" module="com.springsource.org.apache.commons.logging"/>
+ <exclude org="org.springframework" module="org.springframework.context.support"/>
+
+ <override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
+ <override org="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}"/>
+ <override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
+ <override org="org.springframework" rev="${org.springframework}"/>
+ </dependencies>
+
+</ivy-module>
diff --git a/org.eclipse.virgo.kernel.agent.dm/ivy.xml b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
index a0e22ebb..7621e786 100644
--- a/org.eclipse.virgo.kernel.agent.dm/ivy.xml
+++ b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel'/>
diff --git a/org.eclipse.virgo.kernel.artifact/ivy.xml b/org.eclipse.virgo.kernel.artifact/ivy.xml
index db786ab2..31f2606d 100644
--- a/org.eclipse.virgo.kernel.artifact/ivy.xml
+++ b/org.eclipse.virgo.kernel.artifact/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel'/>
diff --git a/org.eclipse.virgo.kernel.authentication/ivy.xml b/org.eclipse.virgo.kernel.authentication/ivy.xml
index 2225ce05..3e82e806 100644
--- a/org.eclipse.virgo.kernel.authentication/ivy.xml
+++ b/org.eclipse.virgo.kernel.authentication/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel'/>
diff --git a/org.eclipse.virgo.kernel.core/ivy.xml b/org.eclipse.virgo.kernel.core/ivy.xml
index b1c84c3e..92e47561 100644
--- a/org.eclipse.virgo.kernel.core/ivy.xml
+++ b/org.eclipse.virgo.kernel.core/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel'/>
diff --git a/org.eclipse.virgo.kernel.deployer.dm/ivy.xml b/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
index f0ed87a7..219408dc 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}" />
diff --git a/org.eclipse.virgo.kernel.deployer.test/ivy.xml b/org.eclipse.virgo.kernel.deployer.test/ivy.xml
index d1723eb8..4fa09c7f 100644
--- a/org.eclipse.virgo.kernel.deployer.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.test/ivy.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
diff --git a/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml b/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml
index 1998ec28..7ddf0014 100644
--- a/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.server" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.deployer/ivy.xml b/org.eclipse.virgo.kernel.deployer/ivy.xml
index e6a96781..01469e67 100644
--- a/org.eclipse.virgo.kernel.deployer/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer/ivy.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
diff --git a/org.eclipse.virgo.kernel.dmfragment/ivy.xml b/org.eclipse.virgo.kernel.dmfragment/ivy.xml
index 7c5cab03..31776994 100644
--- a/org.eclipse.virgo.kernel.dmfragment/ivy.xml
+++ b/org.eclipse.virgo.kernel.dmfragment/ivy.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
diff --git a/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml b/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml
index b89cf23e..9ae1bcb5 100644
--- a/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml
+++ b/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
diff --git a/org.eclipse.virgo.kernel.model/ivy.xml b/org.eclipse.virgo.kernel.model/ivy.xml
index b242c85f..5e4942ff 100644
--- a/org.eclipse.virgo.kernel.model/ivy.xml
+++ b/org.eclipse.virgo.kernel.model/ivy.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info module="${ant.project.name}" organisation="org.eclipse.virgo.kernel"/>
diff --git a/org.eclipse.virgo.kernel.osgi/ivy.xml b/org.eclipse.virgo.kernel.osgi/ivy.xml
index f0645376..3cb34468 100644
--- a/org.eclipse.virgo.kernel.osgi/ivy.xml
+++ b/org.eclipse.virgo.kernel.osgi/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel' />
diff --git a/org.eclipse.virgo.kernel.osgicommand/ivy.xml b/org.eclipse.virgo.kernel.osgicommand/ivy.xml
index a0e9dbea..74d015bc 100644
--- a/org.eclipse.virgo.kernel.osgicommand/ivy.xml
+++ b/org.eclipse.virgo.kernel.osgicommand/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}'/>
diff --git a/org.eclipse.virgo.kernel.services/ivy.xml b/org.eclipse.virgo.kernel.services/ivy.xml
index c019f54d..41260389 100644
--- a/org.eclipse.virgo.kernel.services/ivy.xml
+++ b/org.eclipse.virgo.kernel.services/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}' />
diff --git a/org.eclipse.virgo.kernel.shell/ivy.xml b/org.eclipse.virgo.kernel.shell/ivy.xml
index 0aac2083..c6e9568d 100644
--- a/org.eclipse.virgo.kernel.shell/ivy.xml
+++ b/org.eclipse.virgo.kernel.shell/ivy.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
diff --git a/org.eclipse.virgo.kernel.shutdown/ivy.xml b/org.eclipse.virgo.kernel.shutdown/ivy.xml
index 0b173e07..ce36c073 100644
--- a/org.eclipse.virgo.kernel.shutdown/ivy.xml
+++ b/org.eclipse.virgo.kernel.shutdown/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}'/>
diff --git a/org.eclipse.virgo.kernel.smoketest/ivy.xml b/org.eclipse.virgo.kernel.smoketest/ivy.xml
index 70269097..ae65507b 100644
--- a/org.eclipse.virgo.kernel.smoketest/ivy.xml
+++ b/org.eclipse.virgo.kernel.smoketest/ivy.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}" />
diff --git a/org.eclipse.virgo.kernel.stubs/ivy.xml b/org.eclipse.virgo.kernel.stubs/ivy.xml
index 973aa0b1..578f770d 100644
--- a/org.eclipse.virgo.kernel.stubs/ivy.xml
+++ b/org.eclipse.virgo.kernel.stubs/ivy.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index 2efda9d7..0f871ebb 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
diff --git a/org.eclipse.virgo.kernel.userregion/ivy.xml b/org.eclipse.virgo.kernel.userregion/ivy.xml
index 92e2847b..e1c00dad 100644
--- a/org.eclipse.virgo.kernel.userregion/ivy.xml
+++ b/org.eclipse.virgo.kernel.userregion/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}' />
diff --git a/org.eclipse.virgo.kernel.userregionfactory/ivy.xml b/org.eclipse.virgo.kernel.userregionfactory/ivy.xml
index 748fe2d1..a5931357 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/ivy.xml
+++ b/org.eclipse.virgo.kernel.userregionfactory/ivy.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}'/>
diff --git a/org.eclipse.virgo.kernel/ivy.xml b/org.eclipse.virgo.kernel/ivy.xml
index 2f8adbe1..35cb36ed 100644
--- a/org.eclipse.virgo.kernel/ivy.xml
+++ b/org.eclipse.virgo.kernel/ivy.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>

Back to the top