You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/03/04 09:38:39 UTC
(jackrabbit-oak) 01/01: OAK-10687: Restore and cleanup SCM information
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10687
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 4d6140ab4736932303ae9889ab75868f3c776dd2
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Mar 4 10:38:24 2024 +0100
OAK-10687: Restore and cleanup SCM information
---
oak-parent/pom.xml | 10 +++++++---
pom.xml | 7 -------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 0816ac4060..a41885e496 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -37,7 +37,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>1709307307</project.build.outputTimestamp>
- <minimalMavenBuildVersion>3.3.9</minimalMavenBuildVersion><!-- evaluated by ASF parent -->
+ <minimalMavenBuildVersion>3.6.1</minimalMavenBuildVersion><!-- due to https://issues.apache.org/jira/browse/MNG-6059 -->
<test.opts.memory>-Xmx512m</test.opts.memory>
<test.opts>${test.opts.coverage} ${test.opts.memory} -XX:+HeapDumpOnOutOfMemoryError -Dupdate.limit=100 -Djava.awt.headless=true</test.opts>
<skip.deployment>false</skip.deployment>
@@ -1347,7 +1347,11 @@
</profile>
</profiles>
- <scm>
- <tag>jackrabbit-oak-1.54.0</tag>
+ <!-- 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-oak.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-oak.git</developerConnection>
+ <url>https://github.com/apache/jackrabbit/tree/${project.scm.tag}</url>
+ <tag>trunk</tag>
</scm>
</project>
diff --git a/pom.xml b/pom.xml
index c6871619d8..570a34c5df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,13 +87,6 @@
<module>oak-run-elastic</module>
</modules>
- <scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-oak.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-oak.git</developerConnection>
- <url>https://github.com/apache/jackrabbit-oak/tree/${project.scm.tag}</url>
- <tag>jackrabbit-oak-1.54.0</tag>
- </scm>
-
<build>
<plugins>
<plugin>