You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2014/10/28 00:02:47 UTC
[1/3] git commit: mechanically replace URIs so TLS is used by default
for Maven Central
Repository: ant-ivy
Updated Branches:
refs/heads/2.4.x 453a13406 -> 0d55ab15c
mechanically replace URIs so TLS is used by default for Maven Central
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/53d5beee
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/53d5beee
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/53d5beee
Branch: refs/heads/2.4.x
Commit: 53d5beee60bbd33f706900388a6c083bcbf31896
Parents: 453a134
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Aug 12 12:29:18 2014 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Mon Oct 27 23:20:45 2014 +0100
----------------------------------------------------------------------
doc/install.html | 2 +-
doc/principle.html | 2 +-
doc/resolver/ibiblio.html | 2 +-
doc/resolver/mirrored.html | 2 +-
doc/resolver/packager.html | 2 +-
doc/samples/build-install.xml | 2 +-
doc/samples/build.xml | 2 +-
.../build-a-ivy-repository/settings/ivysettings-advanced.xml | 2 +-
src/example/go-ivy/build.xml | 2 +-
.../ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java | 4 ++--
src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java | 2 +-
src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl | 2 +-
src/java/org/apache/ivy/util/ChecksumHelper.java | 2 +-
test/java/org/apache/ivy/osgi/obr/OBRParserTest.java | 2 +-
.../ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java | 2 +-
test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java | 4 ++--
.../org/apache/ivy/plugins/resolver/IBiblioResolverTest.java | 2 +-
test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt | 4 ++--
.../org/apache/ivy/plugins/resolver/mirrorlist-failover.txt | 4 ++--
test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt | 2 +-
.../java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java | 2 +-
test/test-obr/sources.xml | 6 +++---
22 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/doc/install.html
----------------------------------------------------------------------
diff --git a/doc/install.html b/doc/install.html
index 162332b..34f69e5 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -64,7 +64,7 @@ If you want to use Ivy only in your ant build scripts, and have an internet conn
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without any special installation -->
- <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/doc/principle.html
----------------------------------------------------------------------
diff --git a/doc/principle.html b/doc/principle.html
index 3188172..14e95e2 100644
--- a/doc/principle.html
+++ b/doc/principle.html
@@ -36,7 +36,7 @@ Ivy needs to be configured to be able to resolve your dependencies. This configu
The configuration is also responsible for indicating which resolver should be used to resolve which module. This configuration is dependent only on your environment, i.e. where the modules and artifacts can be found.
-A default configuration is used by ivy when none is given. This configuration uses an <a href="resolver/ibiblio.html">ibiblio resolver</a> pointing to http://repo1.maven.org/maven2/ to resolve all modules.
+A default configuration is used by ivy when none is given. This configuration uses an <a href="resolver/ibiblio.html">ibiblio resolver</a> pointing to https://repo1.maven.org/maven2/ to resolve all modules.
<h1>Resolve</h1>
The resolve time is the moment when ivy actually resolves the dependencies of one module. It first needs to access the ivy file of the module for which it resolves the dependencies.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/doc/resolver/ibiblio.html
----------------------------------------------------------------------
diff --git a/doc/resolver/ibiblio.html b/doc/resolver/ibiblio.html
index f38e1b1..80057c4 100644
--- a/doc/resolver/ibiblio.html
+++ b/doc/resolver/ibiblio.html
@@ -37,7 +37,7 @@
<span class="since">since 1.4</span> When using the m2compatible flag, you can disable the use of poms by setting the usepoms flag to false. It is then roughly equivalent to a url resolver configured like this:
<code type="xml">
<url name="test" m2compatible="true">
- <artifact pattern="http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+ <artifact pattern="https://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
</url>
</code>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/doc/resolver/mirrored.html
----------------------------------------------------------------------
diff --git a/doc/resolver/mirrored.html b/doc/resolver/mirrored.html
index 27ac6b7..f8bfb19 100644
--- a/doc/resolver/mirrored.html
+++ b/doc/resolver/mirrored.html
@@ -65,7 +65,7 @@ This resolver shares the <a href="../settings/resolvers.html#common">common attr
Having the file mavenrepolist.txt content:
<code>
-http://repo1.maven.org/maven2/
+https://repo1.maven.org/maven2/
http://repo2.maven.org/maven2/
</code>
And the piece of settings:
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/doc/resolver/packager.html
----------------------------------------------------------------------
diff --git a/doc/resolver/packager.html b/doc/resolver/packager.html
index e8a4cbf..abe3ffe 100644
--- a/doc/resolver/packager.html
+++ b/doc/resolver/packager.html
@@ -338,7 +338,7 @@ The m2resource XML tag supports the following attributes:
<tr>
<td>repo</td>
<td>Maven repository URL</td>
- <td>No; defaults to http://repo1.maven.org/maven2/ </td>
+ <td>No; defaults to https://repo1.maven.org/maven2/ </td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/doc/samples/build-install.xml
----------------------------------------------------------------------
diff --git a/doc/samples/build-install.xml b/doc/samples/build-install.xml
index ab36c48..8f7183a 100644
--- a/doc/samples/build-install.xml
+++ b/doc/samples/build-install.xml
@@ -48,7 +48,7 @@
<url name="public">
<ivy pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/ivy-[revision].xml"/>
<artifact pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/[revision]/[artifact].[ext]"/>
- <artifact pattern="http://repo1.maven.org/maven/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ <artifact pattern="https://repo1.maven.org/maven/[module]/[type]s/[artifact]-[revision].[ext]"/>
</url>
</resolvers>
</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/doc/samples/build.xml
----------------------------------------------------------------------
diff --git a/doc/samples/build.xml b/doc/samples/build.xml
index 1f5f567..a7dbbcd 100644
--- a/doc/samples/build.xml
+++ b/doc/samples/build.xml
@@ -50,7 +50,7 @@
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without any special installation -->
<echo message="installing ivy..."/>
- <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
----------------------------------------------------------------------
diff --git a/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml b/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
index f20f53a..09ca0d4 100644
--- a/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
+++ b/src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
@@ -25,7 +25,7 @@
You can override this property to use one of the mirrors listed on
http://docs.codehaus.org/display/MAVENUSER/Mirrors+Repositories
-->
- <property name="ibiblio-maven2-root" value="http://repo1.maven.org/maven2/" override="false" />
+ <property name="ibiblio-maven2-root" value="https://repo1.maven.org/maven2/" override="false" />
<namespaces>
<namespace name="maven2">
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/src/example/go-ivy/build.xml
----------------------------------------------------------------------
diff --git a/src/example/go-ivy/build.xml b/src/example/go-ivy/build.xml
index de52c29..d92b11f 100644
--- a/src/example/go-ivy/build.xml
+++ b/src/example/go-ivy/build.xml
@@ -50,7 +50,7 @@
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without any special installation -->
<echo message="installing ivy..."/>
- <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
index 0eebff8..bbce2b4 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
@@ -285,7 +285,7 @@ public class PomModuleDescriptorBuilder {
dep.getArtifactId(), version);
// Some POMs depend on theirselfves, don't add this dependency: Ivy doesn't allow this!
- // Example: http://repo2.maven.org/maven2/net/jini/jsk-platform/2.1/jsk-platform-2.1.pom
+ // Example: https://repo1.maven.org/maven2/net/jini/jsk-platform/2.1/jsk-platform-2.1.pom
ModuleRevisionId mRevId = ivyModuleDescriptor.getModuleRevisionId();
if ((mRevId != null) && mRevId.getModuleId().equals(moduleRevId.getModuleId())) {
return;
@@ -353,7 +353,7 @@ public class PomModuleDescriptorBuilder {
// Some POMs depend on themselves through their parent pom, don't add this dependency
// since Ivy doesn't allow this!
// Example:
- // http://repo2.maven.org/maven2/com/atomikos/atomikos-util/3.6.4/atomikos-util-3.6.4.pom
+ // https://repo1.maven.org/maven2/com/atomikos/atomikos-util/3.6.4/atomikos-util-3.6.4.pom
ModuleId dependencyId = descriptor.getDependencyId();
ModuleRevisionId mRevId = ivyModuleDescriptor.getModuleRevisionId();
if ((mRevId != null) && mRevId.getModuleId().equals(dependencyId)) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
index b746a1c..8072e3f 100644
--- a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
@@ -69,7 +69,7 @@ public class IBiblioResolver extends URLResolver {
public static final String DEFAULT_ROOT = "http://www.ibiblio.org/maven/";
- public static final String DEFAULT_M2_ROOT = "http://repo1.maven.org/maven2/";
+ public static final String DEFAULT_M2_ROOT = "https://repo1.maven.org/maven2/";
private String root = null;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl b/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl
index 2f7d58e..f42e7d3 100644
--- a/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl
+++ b/src/java/org/apache/ivy/plugins/resolver/packager/packager.xsl
@@ -24,7 +24,7 @@
<xsl:param name="restricted"/>
<xsl:param name="quiet"/>
- <xsl:variable name="maven2repo" select="'http://repo1.maven.org/maven2/'"/>
+ <xsl:variable name="maven2repo" select="'https://repo1.maven.org/maven2/'"/>
<xsl:template match="/packager-module">
<xsl:comment> GENERATED FILE - DO NOT EDIT </xsl:comment>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/src/java/org/apache/ivy/util/ChecksumHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/ChecksumHelper.java b/src/java/org/apache/ivy/util/ChecksumHelper.java
index cddfdb8..56aa936 100644
--- a/src/java/org/apache/ivy/util/ChecksumHelper.java
+++ b/src/java/org/apache/ivy/util/ChecksumHelper.java
@@ -67,7 +67,7 @@ public final class ChecksumHelper {
expected = csFileContent.substring(0, spaceIndex);
// IVY-1155: support some strange formats like this one:
- // http://repo2.maven.org/maven2/org/apache/pdfbox/fontbox/0.8.0-incubator/fontbox-0.8.0-incubator.jar.md5
+ // https://repo1.maven.org/maven2/org/apache/pdfbox/fontbox/0.8.0-incubator/fontbox-0.8.0-incubator.jar.md5
if (expected.endsWith(":")) {
StringBuffer result = new StringBuffer();
char[] chars = csFileContent.substring(spaceIndex + 1).toCharArray();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java b/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
index 345a846..56dbac5 100644
--- a/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
+++ b/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
@@ -59,7 +59,7 @@ public class OBRParserTest extends TestCase {
String url0 = md.getAllArtifacts()[0].getUrl().toExternalForm();
String type1 = md.getAllArtifacts()[1].getType();
String url1 = md.getAllArtifacts()[1].getUrl().toExternalForm();
- String jarUrl = "http://repo1.maven.org/maven2/org/apache/felix/"
+ String jarUrl = "https://repo1.maven.org/maven2/org/apache/felix/"
+ "org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar";
String srcUrl = "http://oscar-osgi.sf.net/obr2/org.apache.felix.bundlerepository/"
+ "org.apache.felix.bundlerepository-1.0.3-src.jar";
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
index fd11176..0d83910 100644
--- a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
+++ b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
@@ -65,7 +65,7 @@ public class UpdateSiteAndIbiblioResolverTest extends TestCase {
resolver2 = new IBiblioResolver();
resolver2.setName("maven2");
- settings.setVariable("ivy.ibiblio.default.artifact.root", "http://repo1.maven.org/maven2/");
+ settings.setVariable("ivy.ibiblio.default.artifact.root", "https://repo1.maven.org/maven2/");
settings.setVariable("ivy.ibiblio.default.artifact.pattern",
"[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
resolver2.setSettings(settings);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java b/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java
index e96bfbd..131de90 100644
--- a/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java
+++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java
@@ -34,9 +34,9 @@ public class IBiblioHelper {
public static String getIBiblioMirror() throws Exception {
if (!_checked) {
- String[] mirrors = new String[] {"http://repo1.maven.org/maven/REPOSITORY-V1.txt",
+ String[] mirrors = new String[] {"https://repo1.maven.org/maven/REPOSITORY-V1.txt",
"http://www.ibiblio.org/maven"};
- String[] mirrorsRoot = new String[] {"http://repo1.maven.org/maven",
+ String[] mirrorsRoot = new String[] {"https://repo1.maven.org/maven",
"http://www.ibiblio.org/maven"};
long best = -1;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
index 5166c04..de79421 100644
--- a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
@@ -124,7 +124,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest {
assertNotNull(l);
assertEquals(1, l.size());
assertEquals(
- "http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]",
+ "https://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]",
l.get(0));
resolver = (IBiblioResolver) _settings.getResolver("ibiblioD");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt
index 68062ae..d33fc2c 100644
--- a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt
+++ b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-fail.txt
@@ -1,2 +1,2 @@
-http://repo1.maven.org/_this_should_not_exist/
-http://repo1.maven.org/_this_should_not_exist_either/
\ No newline at end of file
+https://repo1.maven.org/_this_should_not_exist/
+https://repo1.maven.org/_this_should_not_exist_either/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt
index 2ad245f..6944735 100644
--- a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt
+++ b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-failover.txt
@@ -1,2 +1,2 @@
-http://repo1.maven.org/_this_should_not_exist/
-http://repo1.maven.org/maven2/
\ No newline at end of file
+https://repo1.maven.org/_this_should_not_exist/
+https://repo1.maven.org/maven2/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt
index 75c67b2..ad4a8a9 100644
--- a/test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt
+++ b/test/java/org/apache/ivy/plugins/resolver/mirrorlist-solo.txt
@@ -1 +1 @@
-http://repo1.maven.org/maven2/
\ No newline at end of file
+https://repo1.maven.org/maven2/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
index 1a8adc5..630a973 100644
--- a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
+++ b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
@@ -55,7 +55,7 @@ public class HttpclientURLHandlerTest extends TestCase {
URLHandler handler = new HttpClientHandler();
URLInfo info = handler
.getURLInfo(new URL(
- "http://repo1.maven.org/maven2/commons-lang/commons-lang/[1.0,3.0[/commons-lang-[1.0,3.0[.pom"));
+ "https://repo1.maven.org/maven2/commons-lang/commons-lang/[1.0,3.0[/commons-lang-[1.0,3.0[.pom"));
assertEquals(URLHandler.UNAVAILABLE, info);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/53d5beee/test/test-obr/sources.xml
----------------------------------------------------------------------
diff --git a/test/test-obr/sources.xml b/test/test-obr/sources.xml
index e4ddcc5..7bb94ac 100644
--- a/test/test-obr/sources.xml
+++ b/test/test-obr/sources.xml
@@ -17,7 +17,7 @@
under the License.
-->
<repository name='Felix-Releases' lastmodified='20120203022437.168'>
- <resource id='org.apache.felix.bundlerepository/1.0.3' symbolicname='org.apache.felix.bundlerepository' presentationname='Apache Felix Bundle Repository' uri='http://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar' version='1.0.3'>
+ <resource id='org.apache.felix.bundlerepository/1.0.3' symbolicname='org.apache.felix.bundlerepository' presentationname='Apache Felix Bundle Repository' uri='https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar' version='1.0.3'>
<description>Bundle repository service.</description>
<size>130451</size>
<documentation>http://oscar-osgi.sf.net/obr2/org.apache.felix.bundlerepository/</documentation>
@@ -41,7 +41,7 @@
<require name='package' filter='(&(package=org.osgi.framework)(version>=1.3.0))' extend='false' multiple='false' optional='false'>Import package org.osgi.framework ;version=1.3.0</require>
<require name='package' filter='(&(package=org.osgi.service.obr)(version>=1.0.0))' extend='false' multiple='false' optional='false'>Import package org.osgi.service.obr ;version=1.0.0</require>
</resource>
- <resource id='org.apache.felix.eventadmin/1.0.0' symbolicname='org.apache.felix.eventadmin' presentationname='Apache Felix EventAdmin' uri='http://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar' version='1.0.0'>
+ <resource id='org.apache.felix.eventadmin/1.0.0' symbolicname='org.apache.felix.eventadmin' presentationname='Apache Felix EventAdmin' uri='https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar' version='1.0.0'>
<description>This bundle provides an implementation of the OSGi R4 EventAdmin service.</description>
<size>73643</size>
<source>http://felix.apache.org/site/downloads.cgi</source>
@@ -68,4 +68,4 @@
<require name='package' filter='(&(package=org.osgi.framework)(version>=1.3.0))' extend='false' multiple='false' optional='false'>Import package org.osgi.framework ;version=1.3.0</require>
<require name='package' filter='(&(package=org.osgi.service.event)(version>=1.1.0))' extend='false' multiple='false' optional='false'>Import package org.osgi.service.event ;version=1.1.0</require>
</resource>
-</repository>
\ No newline at end of file
+</repository>
[3/3] git commit: getModuleDescriptorParser now takes a file as
argument. Currently ivy use XmlModuleDescriptorParser in
DefaultResolutionCacheManager and DefaultRepositoryCacheManager by default
like in previous versions
Posted by hi...@apache.org.
getModuleDescriptorParser now takes a file as argument. Currently ivy use XmlModuleDescriptorParser in DefaultResolutionCacheManager and DefaultRepositoryCacheManager by default like in previous versions
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/0d55ab15
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/0d55ab15
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/0d55ab15
Branch: refs/heads/2.4.x
Commit: 0d55ab15c62bd0b06454e8b609abe847de393253
Parents: d287c24
Author: Jean-Louis Boudart <je...@gmail.com>
Authored: Thu Jul 3 19:27:00 2014 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Mon Oct 27 23:32:57 2014 +0100
----------------------------------------------------------------------
.../ivy/core/cache/DefaultRepositoryCacheManager.java | 11 +++++++++--
.../ivy/core/cache/DefaultResolutionCacheManager.java | 11 +++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0d55ab15/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
index b9439a4..55f498d 100644
--- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
+++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
@@ -722,7 +722,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv
if (ivyFile.exists()) {
// found in cache !
try {
- ModuleDescriptorParser parser = getModuleDescriptorParser();
+ ModuleDescriptorParser parser = getModuleDescriptorParser(ivyFile);
ModuleDescriptor depMD = getMdFromCache(parser, options, ivyFile);
String resolverName = getSavedResolverName(depMD);
String artResolverName = getSavedArtResolverName(depMD);
@@ -790,7 +790,14 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv
return null;
}
- protected ModuleDescriptorParser getModuleDescriptorParser() {
+ /**
+ * Choose write module descriptor parser for a given moduleDescriptor
+ *
+ * @param moduleDescriptorFile
+ * a given module descriptor
+ * @return
+ */
+ protected ModuleDescriptorParser getModuleDescriptorParser(File moduleDescriptorFile) {
return XmlModuleDescriptorParser.getInstance();
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0d55ab15/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
index 5ad338c..2683702 100644
--- a/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
+++ b/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
@@ -155,10 +155,17 @@ public class DefaultResolutionCacheManager implements ResolutionCacheManager, Iv
ParserSettings pSettings = new CacheParserSettings(settings, paths);
URL ivyFileURL = ivyFile.toURI().toURL();
- return getModuleDescriptorParser().parseDescriptor(pSettings, ivyFileURL, false);
+ return getModuleDescriptorParser(ivyFile).parseDescriptor(pSettings, ivyFileURL, false);
}
- protected ModuleDescriptorParser getModuleDescriptorParser() {
+ /**
+ * Choose write module descriptor parser for a given moduleDescriptor
+ *
+ * @param moduleDescriptorFile
+ * a given module descriptor
+ * @return
+ */
+ protected ModuleDescriptorParser getModuleDescriptorParser(File moduleDescriptorFile) {
return XmlModuleDescriptorParser.getInstance();
}
[2/3] git commit: IMPROVEMENT: Generate POMs with /xsd/maven-4.0.0.xsd reference instead of old /maven-v4_0_0.xsd (IVY-1491) (thanks to Hervé Boutemy)
Posted by hi...@apache.org.
IMPROVEMENT: Generate POMs with /xsd/maven-4.0.0.xsd reference instead of old /maven-v4_0_0.xsd (IVY-1491) (thanks to Hervé Boutemy)
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/d287c24b
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/d287c24b
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/d287c24b
Branch: refs/heads/2.4.x
Commit: d287c24bfcf71466331801dbeac1b0a8a28753a5
Parents: 53d5bee
Author: Maarten Coene <ma...@apache.org>
Authored: Tue Oct 21 00:01:20 2014 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Mon Oct 27 23:32:26 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 5 +++--
doc/use/makepom.html | 2 +-
src/etc/makepom/pom.template | 2 +-
src/java/org/apache/ivy/plugins/parser/m2/pom.template | 2 +-
test/java/org/apache/ivy/plugins/parser/m2/mule-1.3.3.pom | 2 +-
.../apache/ivy/plugins/parser/m2/spring-hibernate3-2.0.2.pom | 2 +-
test/java/org/apache/ivy/plugins/parser/m2/test-large-pom.pom | 2 +-
test/java/org/apache/ivy/plugins/parser/m2/test-transitive.pom | 2 +-
.../ivy/plugins/parser/m2/test-write-compile-dependencies.xml | 2 +-
.../ivy/plugins/parser/m2/test-write-dependencies-optional.xml | 2 +-
.../parser/m2/test-write-dependencies-with-classifier.xml | 2 +-
.../plugins/parser/m2/test-write-dependencies-with-scope.xml | 2 +-
.../ivy/plugins/parser/m2/test-write-dependencies-with-type.xml | 2 +-
.../org/apache/ivy/plugins/parser/m2/test-write-packaging.xml | 2 +-
.../ivy/plugins/parser/m2/test-write-simple-dependencies.xml | 2 +-
.../java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml | 2 +-
.../ivy/plugins/parser/m2/wicket-1.3-incubating-SNAPSHOT.pom | 2 +-
17 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index db74b49..5cc39c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -54,7 +54,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
John Gibson
Mitch Gitman
Scott Goldstein
- Pierre H�gnestrand
+ Pierre Hägnestrand
Scott Hebert
Tobias Himstedt
Aaron Hachez
@@ -143,6 +143,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
2.4.x
=====================================
+- IMPROVEMENT: Generate POMs with /xsd/maven-4.0.0.xsd reference instead of old /maven-v4_0_0.xsd (IVY-1491) (thanks to Hervé Boutemy)
- IMPROVEMENT: Add support for packed jar within an OSGi bundle
- IMPROVEMENT: ModuleRules.getRule is O(n) leading to resolution slowness (IVY-1465) (Thanks to Zhong Wang aka Kewpie)
- IMPROVEMENT: ivy:makepom will generate an exclusion when transitive=false on a dependency (IVY-1470)
@@ -828,7 +829,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
- FIX: IOException during publish causes NullPointerException (IVY-371)
- FIX: Comments in ivy.xml duplicated (IVY-336) (thanks to Gilles Scokart)
- FIX: Ivy failure when the ivy.xml file contains non US-ASCII characters (IVY-346) (thanks to Gilles Scokart)
-- FIX: Urlresolver is not possible to use dynamic revisions on nonstandard repository structure (IVY-350) (thanks to Pierre H�gnestrand)
+- FIX: Urlresolver is not possible to use dynamic revisions on nonstandard repository structure (IVY-350) (thanks to Pierre Hägnestrand)
version 1.4.1 - 2006-11-09
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/doc/use/makepom.html
----------------------------------------------------------------------
diff --git a/doc/use/makepom.html b/doc/use/makepom.html
index 3a5ef2c..2585734 100644
--- a/doc/use/makepom.html
+++ b/doc/use/makepom.html
@@ -58,7 +58,7 @@ The default template that ships with Ivy looks like this:
${ivy.pom.license}
${ivy.pom.header}
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>${ivy.pom.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/src/etc/makepom/pom.template
----------------------------------------------------------------------
diff --git a/src/etc/makepom/pom.template b/src/etc/makepom/pom.template
index 1d6ae3f..1fe333d 100644
--- a/src/etc/makepom/pom.template
+++ b/src/etc/makepom/pom.template
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/src/java/org/apache/ivy/plugins/parser/m2/pom.template
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/pom.template b/src/java/org/apache/ivy/plugins/parser/m2/pom.template
index 50f4e9b..d0d4bd9 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/pom.template
+++ b/src/java/org/apache/ivy/plugins/parser/m2/pom.template
@@ -20,7 +20,7 @@ SKIP_LINE ***************************************************************
${ivy.pom.license}
${ivy.pom.header}
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>${ivy.pom.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/mule-1.3.3.pom
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/mule-1.3.3.pom b/test/java/org/apache/ivy/plugins/parser/m2/mule-1.3.3.pom
index a220183..141a03a 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/mule-1.3.3.pom
+++ b/test/java/org/apache/ivy/plugins/parser/m2/mule-1.3.3.pom
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- Version -->
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/spring-hibernate3-2.0.2.pom
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/spring-hibernate3-2.0.2.pom b/test/java/org/apache/ivy/plugins/parser/m2/spring-hibernate3-2.0.2.pom
index 5845c3c..5f4e5de 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/spring-hibernate3-2.0.2.pom
+++ b/test/java/org/apache/ivy/plugins/parser/m2/spring-hibernate3-2.0.2.pom
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework</groupId>
<artifactId>spring-hibernate3</artifactId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-large-pom.pom
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-large-pom.pom b/test/java/org/apache/ivy/plugins/parser/m2/test-large-pom.pom
index 20bcb0d..a705c97 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-large-pom.pom
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-large-pom.pom
@@ -24,7 +24,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-transitive.pom
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-transitive.pom b/test/java/org/apache/ivy/plugins/parser/m2/test-transitive.pom
index f4f4949..a5e69a9 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-transitive.pom
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-transitive.pom
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>apache</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml b/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml
index 0e4406c..163e23b 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
index f458dd3..e3c574a 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-classifier.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-classifier.xml b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-classifier.xml
index a616727..cf67277 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-classifier.xml
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-classifier.xml
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml
index 37528c3..9fd6144 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-type.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-type.xml b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-type.xml
index 0999a0f..125154c 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-type.xml
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-type.xml
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml b/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml
index b1ef8ff..5e5de5d 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml b/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml
index 0513571..e2a84e2 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml b/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml
index 175c530..4d5e867 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml
+++ b/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache</groupId>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d287c24b/test/java/org/apache/ivy/plugins/parser/m2/wicket-1.3-incubating-SNAPSHOT.pom
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/wicket-1.3-incubating-SNAPSHOT.pom b/test/java/org/apache/ivy/plugins/parser/m2/wicket-1.3-incubating-SNAPSHOT.pom
index 044bd9b..b53079c 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/wicket-1.3-incubating-SNAPSHOT.pom
+++ b/test/java/org/apache/ivy/plugins/parser/m2/wicket-1.3-incubating-SNAPSHOT.pom
@@ -35,7 +35,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>