You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/01/19 18:02:36 UTC
[1/2] maven git commit: [MNG-6312] Update Maven Wagon dependency o
Upgrade wagon version to 3.0.0 based on CVE-2015-6748 in shaded jsoup.
[Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6342 d6dbb00f1 -> aa8efe3c2 (forced update)
[MNG-6312] Update Maven Wagon dependency
o Upgrade wagon version to 3.0.0 based on CVE-2015-6748
in shaded jsoup.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2b336ff1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2b336ff1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2b336ff1
Branch: refs/heads/MNG-6342
Commit: 2b336ff150b12aeae9bd0d2a61f1e8d02504492f
Parents: 58cf490
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Sat Jan 6 22:59:32 2018 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Sat Jan 13 12:46:18 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/2b336ff1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bb87aca..d03a25a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@ under the License.
<guavaVersion>20.0</guavaVersion>
<guiceVersion>4.0</guiceVersion>
<sisuInjectVersion>0.3.3</sisuInjectVersion>
- <wagonVersion>2.12</wagonVersion>
+ <wagonVersion>3.0.0</wagonVersion>
<securityDispatcherVersion>1.4</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.9.1</modelloVersion>
[2/2] maven git commit: [MNG-6342] Emit a WARNING about LATEST/RELEASE in parent
Posted by kh...@apache.org.
[MNG-6342] Emit a WARNING about LATEST/RELEASE in parent
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/aa8efe3c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/aa8efe3c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/aa8efe3c
Branch: refs/heads/MNG-6342
Commit: aa8efe3c2da835e907f5df023c452e5dfd87699f
Parents: 2b336ff
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Thu Jan 18 15:50:36 2018 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Fri Jan 19 19:02:08 2018 +0100
----------------------------------------------------------------------
.../model/validation/DefaultModelValidator.java | 7 ++++
.../validation/DefaultModelValidatorTest.java | 15 ++++++++
.../raw-model/bad-parent-version-latest.xml | 37 ++++++++++++++++++++
.../raw-model/bad-parent-version-release.xml | 37 ++++++++++++++++++++
4 files changed, 96 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/aa8efe3c/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index 9299b43..f0acb1f 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -105,6 +105,13 @@ public class DefaultModelValidator
+ ", the parent element cannot have the same groupId:artifactId as the project.",
parent );
}
+
+ if ( equals( "LATEST", parent.getVersion() ) || equals( "RELEASE", parent.getVersion() ) )
+ {
+ addViolation( problems, Severity.WARNING, Version.BASE, "parent.version", null,
+ "is either LATEST or RELEASE (both of them are being deprecated)", parent );
+ }
+
}
if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
http://git-wip-us.apache.org/repos/asf/maven/blob/aa8efe3c/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index 0bb3bd4..b02e0d9 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -781,4 +781,19 @@ public class DefaultModelValidatorTest
assertEquals( "'version' contains an expression but should be a constant.", result.getWarnings().get( 0 ) );
}
+ public void testParentVersionLATEST()
+ throws Exception
+ {
+ SimpleProblemCollector result = validateRaw( "raw-model/bad-parent-version-latest.xml" );
+ assertViolations( result, 0, 0, 1 );
+ assertEquals( "'parent.version' is either LATEST or RELEASE (both of them are being deprecated)", result.getWarnings().get( 0 ) );
+ }
+
+ public void testParentVersionRELEASE()
+ throws Exception
+ {
+ SimpleProblemCollector result = validateRaw( "raw-model/bad-parent-version-release.xml" );
+ assertViolations( result, 0, 0, 1 );
+ assertEquals( "'parent.version' is either LATEST or RELEASE (both of them are being deprecated)", result.getWarnings().get( 0 ) );
+ }
}
http://git-wip-us.apache.org/repos/asf/maven/blob/aa8efe3c/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..7ed30ad
--- /dev/null
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml
@@ -0,0 +1,37 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>com.example.group</groupId>
+ <artifactId>com-parent</artifactId>
+ <version>LATEST</version>
+ </parent>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-wrong</artifactId>
+ <version>1.0</version>
+
+ <description>
+ 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
http://git-wip-us.apache.org/repos/asf/maven/blob/aa8efe3c/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..65fcc26
--- /dev/null
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml
@@ -0,0 +1,37 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>com.example.group</groupId>
+ <artifactId>com-parent</artifactId>
+ <version>RELEASE</version>
+ </parent>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-wrong</artifactId>
+ <version>1.0</version>
+
+ <description>
+ 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