This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MNG-6778 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 3aa421a944c1f397a454f936c1a6bb5c620710cd Author: Christian Wansart <christian.wans...@openknowledge.de> AuthorDate: Thu Nov 7 16:16:39 2019 +0100 - Use https for maven schemaLocations --- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml | 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml | 2 +- .../src/test/projects/default-maven/cyclic-reference/module-a/pom.xml | 2 +- .../src/test/projects/default-maven/cyclic-reference/module-b/pom.xml | 2 +- maven-core/src/test/projects/default-maven/cyclic-reference/pom.xml | 2 +- .../test/projects/lifecycle-executor/project-with-inheritance/pom.xml | 2 +- .../lifecycle-executor/project-with-multiple-executions/pom.xml | 2 +- .../src/test/projects/plugin-manager/project-with-inheritance/pom.xml | 2 +- .../src/test/resources-project-builder/dependency-inheritance/pom.xml | 2 +- .../test/resources-project-builder/dependency-inheritance/sub/pom.xml | 2 +- maven-core/src/test/resources-project-builder/profile-plugins/pom.xml | 2 +- .../test/resources-project-builder/properties-no-duplication/pom.xml | 2 +- .../resources-project-builder/properties-no-duplication/sub/pom.xml | 2 +- maven-core/src/test/resources/canonical-pom.xml | 2 +- maven-core/src/test/resources/dependencyManagement-pom.xml | 2 +- maven-core/src/test/resources/distributionManagement-pom.xml | 4 ++-- maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml | 2 +- maven-core/src/test/resources/pom.xml | 2 +- maven-core/src/test/resources/projects/artifactMissingVersion.xml | 2 +- maven-core/src/test/resources/projects/badPom.xml | 2 +- maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml | 2 +- maven-embedder/pom.xml | 2 +- maven-model-builder/pom.xml | 2 +- maven-model-builder/src/test/resources/poms/factory/complex.xml | 2 +- maven-model-builder/src/test/resources/poms/factory/simple.xml | 2 +- .../src/test/resources/poms/inheritance/empty-urls-child.xml | 4 ++-- .../src/test/resources/poms/inheritance/empty-urls-expected.xml | 4 ++-- .../src/test/resources/poms/inheritance/empty-urls-parent.xml | 4 ++-- .../src/test/resources/poms/inheritance/flat-urls-child.xml | 4 ++-- .../src/test/resources/poms/inheritance/flat-urls-expected.xml | 2 +- .../src/test/resources/poms/inheritance/flat-urls-parent.xml | 4 ++-- .../resources/poms/inheritance/module-path-not-artifactId-child.xml | 4 ++-- .../poms/inheritance/module-path-not-artifactId-expected.xml | 2 +- .../resources/poms/inheritance/module-path-not-artifactId-parent.xml | 4 ++-- .../src/test/resources/poms/inheritance/no-append-urls-child.xml | 4 ++-- .../src/test/resources/poms/inheritance/no-append-urls-expected.xml | 2 +- .../src/test/resources/poms/inheritance/no-append-urls-parent.xml | 4 ++-- .../src/test/resources/poms/inheritance/no-append-urls2-child.xml | 4 ++-- .../src/test/resources/poms/inheritance/no-append-urls2-expected.xml | 2 +- .../src/test/resources/poms/inheritance/no-append-urls2-parent.xml | 4 ++-- .../src/test/resources/poms/inheritance/no-append-urls3-child.xml | 4 ++-- .../src/test/resources/poms/inheritance/no-append-urls3-expected.xml | 2 +- .../src/test/resources/poms/inheritance/no-append-urls3-parent.xml | 4 ++-- .../test/resources/poms/inheritance/plugin-configuration-child.xml | 4 ++-- .../test/resources/poms/inheritance/plugin-configuration-expected.xml | 2 +- .../test/resources/poms/inheritance/plugin-configuration-parent.xml | 4 ++-- .../resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml | 4 ++-- .../poms/inheritance/tricky-flat-artifactId-urls-expected.xml | 2 +- .../resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml | 4 ++-- .../resources/poms/inheritance/tricky-flat-directory-urls-child.xml | 4 ++-- .../poms/inheritance/tricky-flat-directory-urls-expected.xml | 2 +- .../resources/poms/inheritance/tricky-flat-directory-urls-parent.xml | 4 ++-- .../src/test/resources/poms/inheritance/urls-child.xml | 4 ++-- .../src/test/resources/poms/inheritance/urls-expected.xml | 2 +- .../src/test/resources/poms/inheritance/urls-parent.xml | 4 ++-- .../resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml | 4 ++-- .../resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml | 4 ++-- .../src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml | 4 ++-- .../resources/poms/validation/raw-model/bad-parent-version-latest.xml | 4 ++-- .../poms/validation/raw-model/bad-parent-version-release.xml | 4 ++-- .../poms/validation/raw-model/missing-artifactId-pluginManagement.xml | 4 ++-- .../poms/validation/raw-model/missing-ga-pluginManagement.xml | 4 ++-- .../poms/validation/raw-model/missing-groupId-pluginManagement.xml | 4 ++-- .../validation/raw-model/missing-plugin-version-pluginManagement.xml | 4 ++-- .../poms/validation/raw-model/ok-ci-friendly-all-expressions.xml | 4 ++-- .../resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml | 4 ++-- .../resources/poms/validation/raw-model/ok-ci-friendly-revision.xml | 4 ++-- .../test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml | 4 ++-- .../poms/validation/raw-model/self-referencing-classifier.xml | 4 ++-- .../src/test/resources/poms/validation/raw-model/self-referencing.xml | 4 ++-- maven-model/pom.xml | 2 +- maven-model/src/main/mdo/maven.mdo | 2 +- maven-model/src/site/apt/index.apt | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- .../src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom | 4 ++-- .../test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom | 4 ++-- .../src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom | 4 ++-- maven-settings-builder/pom.xml | 2 +- maven-settings/pom.xml | 2 +- maven-slf4j-provider/pom.xml | 4 ++-- pom.xml | 2 +- 86 files changed, 127 insertions(+), 127 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index edbec83..fb66f71 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 834905f..8d4bd20 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index de4b9db..ce64159 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 24bfbf1..87d4f3b 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 73c53c4..12726bd 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml b/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml index 56ec341..ec8d805 100644 --- a/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml +++ b/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml @@ -1,5 +1,5 @@ <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"> + 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> <parent> diff --git a/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml b/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml index ffa4f34..119fb5f 100644 --- a/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml +++ b/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml @@ -1,5 +1,5 @@ <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"> + 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> <parent> diff --git a/maven-core/src/test/projects/default-maven/cyclic-reference/pom.xml b/maven-core/src/test/projects/default-maven/cyclic-reference/pom.xml index e266619..38b9ff4 100644 --- a/maven-core/src/test/projects/default-maven/cyclic-reference/pom.xml +++ b/maven-core/src/test/projects/default-maven/cyclic-reference/pom.xml @@ -1,5 +1,5 @@ <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"> + 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>cyclic-reference</groupId> diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml index 0f49e9a..c19061a 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> <groupId>org.apache.maven</groupId> diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/pom.xml index e7a3834..7d201a1 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/pom.xml @@ -19,7 +19,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/xsd/maven-4.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>org.apache.maven.plugins</groupId> <artifactId>project-with-multiple-executions</artifactId> diff --git a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml index 0f49e9a..c19061a 100644 --- a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml +++ b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> <groupId>org.apache.maven</groupId> diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml index c2c061c..736b793 100644 --- a/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml +++ b/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> <groupId>org.apache.maven</groupId> diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml index 788c5a7..aaf8e8e 100644 --- a/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml @@ -10,7 +10,7 @@ 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/xsd/maven-4.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"> <parent> <artifactId>maven</artifactId> <groupId>org.apache.maven</groupId> diff --git a/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml index 32e94d7..f25e295 100644 --- a/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml +++ b/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml @@ -15,7 +15,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/xsd/maven-4.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>org.apache.maven</groupId> diff --git a/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml b/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml index c74f446..8893bd6 100644 --- a/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml +++ b/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.its</groupId> diff --git a/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml b/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml index 9241b8b..799bb4c 100644 --- a/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> diff --git a/maven-core/src/test/resources/canonical-pom.xml b/maven-core/src/test/resources/canonical-pom.xml index 82bf872..2f23d1c 100644 --- a/maven-core/src/test/resources/canonical-pom.xml +++ b/maven-core/src/test/resources/canonical-pom.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>maven</groupId> diff --git a/maven-core/src/test/resources/dependencyManagement-pom.xml b/maven-core/src/test/resources/dependencyManagement-pom.xml index 2accaca..90a2053 100644 --- a/maven-core/src/test/resources/dependencyManagement-pom.xml +++ b/maven-core/src/test/resources/dependencyManagement-pom.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>maven</groupId> diff --git a/maven-core/src/test/resources/distributionManagement-pom.xml b/maven-core/src/test/resources/distributionManagement-pom.xml index 1a8ee7f..3ac0199 100644 --- a/maven-core/src/test/resources/distributionManagement-pom.xml +++ b/maven-core/src/test/resources/distributionManagement-pom.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>maven</groupId> @@ -41,4 +41,4 @@ <url>file:///path/to/repo</url> </repository> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml index fb2f91c..cd0a3d8 100644 --- a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> <groupId>org.apache.maven</groupId> diff --git a/maven-core/src/test/resources/pom.xml b/maven-core/src/test/resources/pom.xml index cf4c29c..b5e8971 100644 --- a/maven-core/src/test/resources/pom.xml +++ b/maven-core/src/test/resources/pom.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/xsd/maven-4.0.0.xsd"> + 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>org.apache.maven</groupId> diff --git a/maven-core/src/test/resources/projects/artifactMissingVersion.xml b/maven-core/src/test/resources/projects/artifactMissingVersion.xml index b87aa28..75adae4 100644 --- a/maven-core/src/test/resources/projects/artifactMissingVersion.xml +++ b/maven-core/src/test/resources/projects/artifactMissingVersion.xml @@ -1,5 +1,5 @@ <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"> + 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>markerTest</groupId> <artifactId>testArtifactMissingVersion</artifactId> diff --git a/maven-core/src/test/resources/projects/badPom.xml b/maven-core/src/test/resources/projects/badPom.xml index 219ae94..d295659 100644 --- a/maven-core/src/test/resources/projects/badPom.xml +++ b/maven-core/src/test/resources/projects/badPom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <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"> + 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> some garbage maven project builder can't parse diff --git a/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml b/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml index 95ee353..f556904 100644 --- a/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml +++ b/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>maven</groupId> diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 9c00974..e5e02a9 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 3861eb4..f8e95a5 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-model-builder/src/test/resources/poms/factory/complex.xml b/maven-model-builder/src/test/resources/poms/factory/complex.xml index 80060ff..99a47fc 100644 --- a/maven-model-builder/src/test/resources/poms/factory/complex.xml +++ b/maven-model-builder/src/test/resources/poms/factory/complex.xml @@ -2,7 +2,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/xsd/maven-4.0.0.xsd"> + 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>test</groupId> diff --git a/maven-model-builder/src/test/resources/poms/factory/simple.xml b/maven-model-builder/src/test/resources/poms/factory/simple.xml index 7190073..f48aba3 100644 --- a/maven-model-builder/src/test/resources/poms/factory/simple.xml +++ b/maven-model-builder/src/test/resources/poms/factory/simple.xml @@ -21,7 +21,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/xsd/maven-4.0.0.xsd"> + 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>test</groupId> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-child.xml index 88ccde4..4b0fa8a 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> <groupId>inheritance</groupId> @@ -28,4 +28,4 @@ under the License. <version>1</version> </parent> <artifactId>child</artifactId> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-expected.xml index 317aec8..b6620e3 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> <groupId>inheritance</groupId> @@ -41,4 +41,4 @@ under the License. <url></url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-parent.xml index ab2bea7..e429fd8 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>inheritance</groupId> <artifactId>empty</artifactId> @@ -39,4 +39,4 @@ under the License. <url></url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-child.xml index d7cc4d0..2ab32c3 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -31,4 +31,4 @@ under the License. <artifactId>inheritance</artifactId><!-- same as directory name --> <name>Model urls inheritance test child</name> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-expected.xml index 88fb1e2..0e99b87 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-parent.xml index 3bf6ea8..2f4b13c 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>inheritance</groupId> @@ -46,4 +46,4 @@ under the License. <url>scp://scp.domain.org/base/</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml index 7031f44..1c3ff21 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -40,4 +40,4 @@ under the License. <properties> <project.directory>child</project.directory> </properties> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml index e82f289..78b9cb3 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-parent.xml index 9b923cd..e4e22a0 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>inheritance</groupId> @@ -45,4 +45,4 @@ under the License. <url>scp://scp.domain.org/base/</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml index d7cc4d0..2ab32c3 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -31,4 +31,4 @@ under the License. <artifactId>inheritance</artifactId><!-- same as directory name --> <name>Model urls inheritance test child</name> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml index e6f5ac4..21a1e47 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false"> <modelVersion>4.0.0</modelVersion> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml index 8c964cf..8dbe3e2 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false"> <modelVersion>4.0.0</modelVersion> @@ -49,4 +49,4 @@ under the License. <url>scp://scp.domain.org/base/</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-child.xml index dbf4dd4..c3b79f3 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -40,4 +40,4 @@ under the License. <name>reset</name> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-expected.xml index 4d8e683..5867078 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false"> <modelVersion>4.0.0</modelVersion> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-parent.xml index d2e2e71..15dda7d 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false"> <modelVersion>4.0.0</modelVersion> @@ -42,4 +42,4 @@ under the License. <url>scp://scp.domain.org/base/</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-child.xml index ccb2d91..4dc9ef9 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -38,4 +38,4 @@ under the License. <distributionManagement> <site child.site.url.inherit.append.path="true" /> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-expected.xml index a6a884d..b3c6b8a 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false"> <modelVersion>4.0.0</modelVersion> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-parent.xml index d2e2e71..15dda7d 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false"> <modelVersion>4.0.0</modelVersion> @@ -42,4 +42,4 @@ under the License. <url>scp://scp.domain.org/base/</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml index feb3cb8..e39bf70 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <artifactId>child</artifactId> @@ -58,4 +58,4 @@ under the License. </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml index 318ee44..b969d4b 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>inheritance</groupId> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml index 2b973a1..4ecb224 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>inheritance</groupId> @@ -86,4 +86,4 @@ under the License. </plugin> </plugins> </reporting> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml index ac036af..ee376f8 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -31,4 +31,4 @@ under the License. <artifactId>child-artifact-id</artifactId> <name>Model urls inheritance test child</name> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-expected.xml index f2a024e..419ef77 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml index 8a1d354..bd75639 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>inheritance</groupId> @@ -46,4 +46,4 @@ under the License. <url>scp://scp.domain.org/base/</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-child.xml index ac036af..ee376f8 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -31,4 +31,4 @@ under the License. <artifactId>child-artifact-id</artifactId> <name>Model urls inheritance test child</name> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-expected.xml index 429ae38..453a117 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-parent.xml index 211abbe..d425c08 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>inheritance</groupId> @@ -46,4 +46,4 @@ under the License. <url>scp://scp.domain.org/base/</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/urls-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/urls-child.xml index ac036af..ee376f8 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/urls-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/urls-child.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -31,4 +31,4 @@ under the License. <artifactId>child-artifact-id</artifactId> <name>Model urls inheritance test child</name> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/urls-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/urls-expected.xml index 3370638..f1682ab 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/urls-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/urls-expected.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> diff --git a/maven-model-builder/src/test/resources/poms/inheritance/urls-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/urls-parent.xml index cbe768a..5acf1cc 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/urls-parent.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/urls-parent.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>inheritance</groupId> @@ -46,4 +46,4 @@ under the License. <url>scp://scp.domain.org/base/</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml index 35642d8..3b9034a 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>valid-version-sha1plus</artifactId> @@ -28,4 +28,4 @@ under the License. This will test if the validation for the ci friendly versions is working correct. </description> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml index 7f9ab2c..182f69e 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>valid-version-sha1plus</artifactId> @@ -28,4 +28,4 @@ under the License. This will test if the validation for the ci friendly versions is working correct. </description> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml index 9288b35..6131ca9 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>valid-version-wrong</artifactId> @@ -28,4 +28,4 @@ under the License. This will test if the validation for the ci friendly versions is working correct. </description> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml index 7ed30ad..ead458d 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -34,4 +34,4 @@ under the License. This will test if the validation for the parent version is working correct in case of usage of LATEST </description> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml index 65fcc26..0a0fe3c 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -34,4 +34,4 @@ under the License. This will test if the validation for the parent version is working correct in case of usage of RELEASE </description> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-artifactId-pluginManagement.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-artifactId-pluginManagement.xml index 194abf8..658f330 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-artifactId-pluginManagement.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-artifactId-pluginManagement.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>testinvalidpom</artifactId> @@ -36,4 +36,4 @@ under the License. </plugins> </pluginManagement> </build> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml index 4058dd6..27c6152 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>testinvalidpom</artifactId> @@ -36,4 +36,4 @@ under the License. </plugins> </pluginManagement> </build> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-groupId-pluginManagement.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-groupId-pluginManagement.xml index f3f23e6..2905503 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-groupId-pluginManagement.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-groupId-pluginManagement.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>testinvalidpom</artifactId> @@ -36,4 +36,4 @@ under the License. </plugins> </pluginManagement> </build> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-plugin-version-pluginManagement.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-plugin-version-pluginManagement.xml index 94b1777..b1bc5e3 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-plugin-version-pluginManagement.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-plugin-version-pluginManagement.xml @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>testinvalidpom</artifactId> @@ -37,4 +37,4 @@ under the License. </plugins> </pluginManagement> </build> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml index 860b482..d796ead 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>valid-version-sha1</artifactId> @@ -28,4 +28,4 @@ under the License. This will test if the validation for the ci friendly versions is working correct. </description> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml index f4a1da7..f5aa3d6 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>valid-version-changelist</artifactId> @@ -28,4 +28,4 @@ under the License. This will test if the validation for the ci friendly versions is working correct. </description> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml index 565cd7b..e3e73fc 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>valid-version-revision</artifactId> @@ -28,4 +28,4 @@ under the License. This will test if the validation for the ci friendly versions is working correct. </description> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml index 5287c99..4ef6b49 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>valid-version-sha1</artifactId> @@ -28,4 +28,4 @@ under the License. This will test if the validation for the ci friendly versions is working correct. This c </description> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml index 099e501..2fc5dca 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>testvalidpom</artifactId> @@ -36,4 +36,4 @@ under the License. <classifier>linux</classifier> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml index a902896..b5e0383 100644 --- a/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml +++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.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/xsd/maven-4.0.0.xsd"> + 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>com.example.group</groupId> <artifactId>testinvalidpom</artifactId> @@ -35,4 +35,4 @@ under the License. <version>0.0.1-SNAPSHOT</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/maven-model/pom.xml b/maven-model/pom.xml index a1505d4..bee2382 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 77738f1..1f1f9d1 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -46,7 +46,7 @@ <model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd" xml.namespace="http://maven.apache.org/POM/${version}" - xml.schemaLocation="http://maven.apache.org/xsd/maven-${version}.xsd"> + xml.schemaLocation="https://maven.apache.org/xsd/maven-${version}.xsd"> <id>maven</id> <name>Maven</name> <description> diff --git a/maven-model/src/site/apt/index.apt b/maven-model/src/site/apt/index.apt index 77ec508..0010f4f 100644 --- a/maven-model/src/site/apt/index.apt +++ b/maven-model/src/site/apt/index.apt @@ -36,4 +36,4 @@ Maven Model * A {{{./maven.html}Descriptor Reference}} - * An XSD {{{http://maven.apache.org/xsd/maven-v3_0_0.xsd}for Maven 1.1}} and {{{http://maven.apache.org/xsd/maven-4.0.0.xsd}for Maven 2.0}}. + * An XSD {{{https://maven.apache.org/xsd/maven-v3_0_0.xsd}for Maven 1.1}} and {{{https://maven.apache.org/xsd/maven-4.0.0.xsd}for Maven 2.0}}. diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index 80470c3..a407266 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml index f3e6588..5a93ab2 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml index 3180d9a..68f3690 100644 --- a/maven-resolver-provider/pom.xml +++ b/maven-resolver-provider/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom b/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom index f8b72af..5ed3ad8 100644 --- a/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom +++ b/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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> <parent> @@ -45,4 +45,4 @@ <classifier>sources</classifier> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom b/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom index c021dfa..9410f6b 100644 --- a/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom +++ b/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>ut.simple</groupId> @@ -28,4 +28,4 @@ <version>1.0</version> <name>Simple Unit Test Dependency</name> -</project> \ No newline at end of file +</project> diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom b/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom index ed64c9e..3751c15 100644 --- a/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom +++ b/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom @@ -20,7 +20,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/xsd/maven-4.0.0.xsd"> + 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>ut.simple</groupId> @@ -40,4 +40,4 @@ </dependencies> </dependencyManagement> -</project> \ No newline at end of file +</project> diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml index a6ac8fb..a12a880 100644 --- a/maven-settings-builder/pom.xml +++ b/maven-settings-builder/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index 3636f0f..7c96d4e 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml index fdf5860..085f5e5 100644 --- a/maven-slf4j-provider/pom.xml +++ b/maven-slf4j-provider/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent> @@ -97,4 +97,4 @@ under the License. </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/pom.xml b/pom.xml index 46f4926..36d3f4d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,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/xsd/maven-4.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> <parent>