Merge pull request #598 from hazendaz/master

Site adjustments including hack to fix maven site issues on single module builds

Author: hazendaz

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2010-2023 the original author or authors.
+       Copyright 2010-2024 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 
   <name>mybatis-parent</name>
   <description>The MyBatis parent POM.</description>
-  <url>https://github.com/mybatis/parent</url>
+  <url>https://www.mybatis.org/parent/</url>
   <inceptionYear>2010</inceptionYear>
   <organization>
     <name>MyBatis.org</name>
@@ -233,7 +233,7 @@
     <connection>scm:git:ssh://[email protected]/mybatis/parent.git</connection>
     <developerConnection>scm:git:ssh://[email protected]/mybatis/parent.git</developerConnection>
     <tag>HEAD</tag>
-    <url>https://github.com/mybatis/parent</url>
+    <url>https://github.com/mybatis/parent/</url>
   </scm>
   <issueManagement>
     <system>GitHub Issue Management</system>
@@ -261,7 +261,7 @@
 
   <properties>
     <!-- Copyright -->
-    <copyright>2023</copyright>
+    <copyright>2024</copyright>
 
     <!-- General configuration -->
     <allowed.build.jdks>[11,12),[17,18),[21,22),[22,23)</allowed.build.jdks>
@@ -306,9 +306,6 @@
     <!-- Due to maven bug, fix timestamp -->
     <timestamp>${maven.build.timestamp}</timestamp>
 
-    <!-- Parent Tracking on site -->
-    <mybatis-parent.version>42-SNAPSHOT</mybatis-parent.version>
-
     <!-- Dependency versions -->
     <asm.version>9.6</asm.version>
     <base-bundle.version>11</base-bundle.version>
@@ -370,6 +367,10 @@
     <!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
     <!-- Excluded groups are ran on github ci, to force here, pass -D"excludedGroups=" -->
     <excludedGroups />
+
+    <!-- Hack for single site builds so site:staging works as expected. Do not use with multi module!
+         Instead adjust for fact that maven bug causes staging to be up one directory with 'reponame.git' -->
+    <topSiteURL>${project.distributionManagement.site.url}</topSiteURL>
   </properties>
 
   <build>
@@ -798,12 +799,6 @@
               <artifactId>maven-fluido-skin</artifactId>
               <version>${fluido.version}</version>
             </dependency>
-            <dependency>
-              <groupId>org.mybatis</groupId>
-              <artifactId>mybatis-parent</artifactId>
-              <version>${mybatis-parent.version}</version>
-              <type>pom</type>
-            </dependency>
           </dependencies>
           <!-- Execution like this will pick up in the normal site cycle -->
           <executions>