You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2024/01/04 21:23:41 UTC
(jackrabbit) branch trunk updated: JCR-5011 Move SCM elements to parent POM (#147)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git
The following commit(s) were added to refs/heads/trunk by this push:
new 79ff0eeee JCR-5011 Move SCM elements to parent POM (#147)
79ff0eeee is described below
commit 79ff0eeeedb6ce42253041b652f84f2034c8e977
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Jan 4 22:23:38 2024 +0100
JCR-5011 Move SCM elements to parent POM (#147)
Adjust inheritance rules accordingly
---
jackrabbit-parent/pom.xml | 11 ++++++++++-
pom.xml | 7 -------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/jackrabbit-parent/pom.xml b/jackrabbit-parent/pom.xml
index 841c29dd1..43b9cd234 100644
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" child.project.url.inherit.append.path="false">
<modelVersion>4.0.0</modelVersion>
<!-- =================================================================== -->
@@ -42,6 +42,14 @@
<url>http://issues.apache.org/jira/browse/JCR</url>
</issueManagement>
+ <!-- using adjusted inheritance rules: https://issues.apache.org/jira/browse/MNG-6059 -->
+ <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false">
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit.git</developerConnection>
+ <url>https://github.com/apache/jackrabbit/tree/${project.scm.tag}</url>
+ <tag>trunk</tag>
+ </scm>
+
<properties>
<test.opts.memory>-Xmx256m</test.opts.memory>
<test.opts.modules />
@@ -64,6 +72,7 @@
<!-- build time stamp: should be updated prior to a release -->
<!-- see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
<project.build.outputTimestamp>1702529444</project.build.outputTimestamp>
+ <minimalMavenBuildVersion>3.6.1</minimalMavenBuildVersion><!-- due to https://issues.apache.org/jira/browse/MNG-6059 -->
</properties>
<url>http://jackrabbit.apache.org/</url>
diff --git a/pom.xml b/pom.xml
index a83d6bee1..07b61654f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,13 +61,6 @@
<module>jackrabbit-it-osgi</module>
</modules>
- <scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit.git</developerConnection>
- <url>https://github.com/apache/jackrabbit/tree/${project.scm.tag}</url>
- <tag>trunk</tag>
- </scm>
-
<build>
<plugins>
<plugin>