Merge branch 'main' into fix-junit-deps

apache · Aug 24, 2024 · 4e7e21e · 4e7e21e
2 parents 39d0044 + 3c823d9
commit 4e7e21e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -135,6 +135,7 @@
         <!-- checkstyle -->
         <checkstyle.configLocation>${root.dir}/src/checkstyle.xml</checkstyle.configLocation>
         <checkstyle.supressionsLocation>${root.dir}/src/suppressions.xml</checkstyle.supressionsLocation>
+        <fluido-skin.version>2.0.0-M10</fluido-skin.version>
     </properties>
 
     <modules>
@@ -333,6 +334,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
+                    <version>4.0.0-M16</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1448,6 +1450,12 @@
                 <artifactId>bcprov-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.maven.skins</groupId>
+                <artifactId>maven-fluido-skin</artifactId>
+                <version>${fluido-skin.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -17,16 +17,15 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project name="${project.artifactId}">
-
-    <bannerLeft>
-        <name>Shiro</name>
-        <src>http://shiro.apache.org/images/apache-shiro-logo.png</src>
-        <href>http://shiro.apache.org</href>
+<site 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"
+  name="Shiro">
+    <bannerLeft name="Shiro" href="http://shiro.apache.org">
+        <image src="https://shiro.apache.org/images/apache-shiro-logo.png"/>
     </bannerLeft>
 
     <bannerRight>
-        <src>http://shiro.apache.org/images/asf_logo.png</src>
+        <image src="https://shiro.apache.org/images/asf_logo.png"/>
     </bannerRight>
 
     <publishDate position="right"/>
@@ -47,7 +46,6 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.5</version>
+        <version>${fluido-skin.version}</version>
     </skin>
-
-</project>
+</site>