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:48 UTC
[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)
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>