You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2024/01/06 11:17:57 UTC
(sling-parent) 01/01: SLING-12207 Adjust url inheritance
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/adjust-url-inheritance
in repository https://gitbox.apache.org/repos/asf/sling-parent.git
commit 14d5001794db250d73b5db8733c5be7906f11aa9
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Sat Jan 6 12:17:50 2024 +0100
SLING-12207 Adjust url inheritance
---
sling-parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index dbc2e44..e947f3a 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -15,7 +15,7 @@
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 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>
<parent>
@@ -117,7 +117,7 @@
https://docs.oracle.com/javase/9/tools/javac.htm#GUID-AEEC9F07-CB49-4E96-8BC7-BCC2C7F725C9__GUID-D343F6B4-3FDD-43A8-AD24-43DD70214471
and http://openjdk.java.net/jeps/247, this affects m-compiler-p and m-javadoc-p -->
<maven.compiler.release>${sling.java.version}</maven.compiler.release>
- <minimalMavenBuildVersion>3.3.9</minimalMavenBuildVersion>
+ <minimalMavenBuildVersion>3.6.1</minimalMavenBuildVersion><!-- due to https://issues.apache.org/jira/browse/MNG-6059 -->
<!-- Parameter "maven.compiler.release" requires JDK9+ and we generally only support LTS releases -->
<minimalJavaBuildVersion>11</minimalJavaBuildVersion>
<!-- the github id used for the ribbon for Maven sites: https://maven.apache.org/skins/maven-fluido-skin/#GitHub_ribbons -->