[MRELEASE-1032] add https://m.a.o/xsd/maven-4.0.0.xsd

apache · Nov 23, 2019 · fa7a561 · fa7a561
1 parent 36b2fba
commit fa7a561
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...se-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java b/...se-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
@@ -195,7 +195,7 @@ private void writePom( File pomFile, Document document, ReleaseDescriptor releas
             if ( rootElement.getAttribute( "schemaLocation", xsiNamespace ) == null )
             {
                 rootElement.setAttribute( "schemaLocation", "http://maven.apache.org/POM/" + modelVersion
-                    + " http://maven.apache.org/maven-v" + modelVersion.replace( '.', '_' ) + ".xsd", xsiNamespace );
+                    + " https://maven.apache.org/xsd/maven-" + modelVersion + ".xsd", xsiNamespace );
             }
 
             // the empty namespace is considered equal to the POM namespace, so match them up to avoid extra xmlns=""

diff --git a/...ger/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom-with-schema.xml b/...ger/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom-with-schema.xml
@@ -16,7 +16,7 @@
   ~ 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>groupId</groupId>
   <artifactId>artifactId</artifactId>

diff --git a/...rc/test/resources/projects/rewrite-for-development/basic-pom/expected-pom-with-schema.xml b/...rc/test/resources/projects/rewrite-for-development/basic-pom/expected-pom-with-schema.xml
@@ -16,7 +16,7 @@
   ~ 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>groupId</groupId>
   <artifactId>artifactId</artifactId>

diff --git a/...er/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom-with-schema.xml b/...er/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom-with-schema.xml
@@ -16,7 +16,7 @@
   ~ 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>groupId</groupId>
   <artifactId>artifactId</artifactId>