This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new 19efb8f275 OAK-10687: Restore and cleanup SCM information
19efb8f275 is described below
commit 19efb8f2758b69792d3871b49d410212b791a5b7
Author: Julian Reschke <julian.resc...@gmx.de>
AuthorDate: Thu Apr 18 11:17:45 2024 +0100
OAK-10687: Restore and cleanup SCM information
---
oak-parent/pom.xml | 13 +++++++------
pom.xml | 7 -------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index cfe2e7a228..92bc5991e4 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 -->
<maven.compiler.target>${java.version}</maven.compiler.target><!--
evaluated by m-compiler-p and m-javadoc-p -->
<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>
@@ -1245,10 +1245,11 @@
</profile>
</profiles>
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/branches/1.22/oak-parent</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/branches/1.22/oak-parent</developerConnection>
- <url>https://svn.apache.org/viewvc/maven/pom/branches/1.22/oak-parent</url>
- <tag>jackrabbit-oak-1.22.9</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>1.22</tag>
</scm>
</project>
diff --git a/pom.xml b/pom.xml
index 34a4a2b4b6..c7a24a845d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,13 +78,6 @@
<module>oak-search-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>HEAD</tag>
- </scm>
-
<build>
<plugins>
<plugin>
