You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/12/18 14:12:45 UTC
[maven] branch master updated: [MNG-7626] maven-bom should have the same parent version as project
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 933b46eed [MNG-7626] maven-bom should have the same parent version as project
933b46eed is described below
commit 933b46eed2ca7e752346ec14444b0c2a0d9ad24b
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Dec 13 17:32:11 2022 +0100
[MNG-7626] maven-bom should have the same parent version as project
---
maven-bom/pom.xml | 18 ++++++++----------
pom.xml | 1 +
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
index 75a8f0bd2..6f2371dc5 100644
--- a/maven-bom/pom.xml
+++ b/maven-bom/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,14 +17,13 @@ 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>35</version>
- <relativePath />
+ <version>38</version>
+ <relativePath/>
</parent>
<artifactId>maven-bom</artifactId>
@@ -36,15 +34,11 @@ under the License.
<description>Bill Of Materials for Apache Maven dependencies</description>
<url>https://maven.apache.org/ref/${project.version}/${project.artifactId}</url>
- <properties>
- <maven.site.path>ref/4-LATEST/${project.artifactId}</maven.site.path>
- </properties>
-
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven.git</developerConnection>
- <url>https://github.com/apache/maven/tree/${project.scm.tag}/${project.artifactId}</url>
<tag>maven-4.0.0-alpha-3</tag>
+ <url>https://github.com/apache/maven/tree/${project.scm.tag}/${project.artifactId}</url>
</scm>
<issueManagement>
<system>jira</system>
@@ -55,13 +49,17 @@ under the License.
<url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven/</url>
</ciManagement>
<distributionManagement>
- <downloadUrl>https://maven.apache.org/download.html</downloadUrl>
<site>
<id>apache.website</id>
<url>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</url>
</site>
+ <downloadUrl>https://maven.apache.org/download.html</downloadUrl>
</distributionManagement>
+ <properties>
+ <maven.site.path>ref/4-LATEST/${project.artifactId}</maven.site.path>
+ </properties>
+
<dependencyManagement>
<!-- Not included:
- apache-maven, as it delivers the binaries
diff --git a/pom.xml b/pom.xml
index 990b12c1b..8b6573ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
+ <!-- please also update in maven-bom -->
<version>38</version>
<relativePath/>
</parent>