Merge pull request #560 from hazendaz/master

Drop back to bnd 6.4.1 due to incompatibility / Make sure site is on version 2.0.0 and new xsd site.xsd.
mybatis · Nov 20, 2023 · 1fd7add · 1fd7add
2 parents a6b0677 + e061da6
commit 1fd7add
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -312,7 +312,7 @@
     <!-- Dependency versions -->
     <asm.version>9.6</asm.version>
     <base-bundle.version>11</base-bundle.version>
-    <bnd.version>7.0.0</bnd.version>
+    <bnd.version>6.4.1</bnd.version>
     <build-tools.version>1.3.1</build-tools.version>
     <checkstyle.version>10.12.5</checkstyle.version>
     <extra-enforcer-rules.version>1.7.0</extra-enforcer-rules.version>
@@ -1392,13 +1392,14 @@
       </build>
     </profile>
 
+    <!-- Keeping for now for future split when bnd plugin supports 7.0.0 -->
     <profile>
       <id>pre17</id>
       <activation>
         <jdk>(,17)</jdk>
       </activation>
       <properties>
-          <bnd.version>6.4.1</bnd.version>
+        <bnd.version>6.4.1</bnd.version>
       </properties>
     </profile>
   </profiles>

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -16,16 +16,13 @@
        limitations under the License.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
 <!-- N.B. all non-body elements are automatically inherited -->
 
-  <bannerRight>
-    <name>MyBatis</name>
-    <src>https://www.mybatis.org/images/mybatis-logo.png</src>
-    <alt>MyBatis logo</alt>
-    <href>https://blog.mybatis.org/</href>
+  <bannerRight name="MyBatis" href="https://blog.mybatis.org/">
+    <image src="https://www.mybatis.org/images/mybatis-logo.png" alt="MyBatis logo" />
   </bannerRight>
 
   <publishDate format="dd MMMM yyyy" position="left" />
@@ -41,4 +38,4 @@
   <body>
     <menu ref="reports" />
   </body>
-</project>
+</site>