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 2023/12/20 18:40:32 UTC

(jackrabbit) branch bugfix/move-scm-to-parent created (now a6f1e9881)

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a change to branch bugfix/move-scm-to-parent
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git


      at a6f1e9881 JCR-4979 Move SCM elements to parent POM

This branch includes the following new commits:

     new a6f1e9881 JCR-4979 Move SCM elements to parent POM

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(jackrabbit) 01/01: JCR-4979 Move SCM elements to parent POM

Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch bugfix/move-scm-to-parent
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git

commit a6f1e988160ab15e8b057012251ca6b314332c1a
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Dec 20 19:40:28 2023 +0100

    JCR-4979 Move SCM elements to parent POM
    
    Adjust inheritance rules accordingly
---
 jackrabbit-parent/pom.xml | 10 +++++++++-
 pom.xml                   |  7 -------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/jackrabbit-parent/pom.xml b/jackrabbit-parent/pom.xml
index 841c29dd1..ea0d4f598 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" child.scm.url.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 />
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>