Merge pull request #178 from hazendaz/master

Bring up to date - syncing
42BV · Dec 27, 2023 · eace4f7 · eace4f7
2 parents 62496c1 + d345a93
commit eace4f7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: ${{ matrix.distribution }}

diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: zulu

diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: zulu

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.github.hazendaz</groupId>
         <artifactId>base-parent</artifactId>
-        <version>41</version>
+        <version>43</version>
         <relativePath />
     </parent>
 
@@ -76,7 +76,7 @@
         <java.version>8</java.version>
         <java.release.version>8</java.release.version>
 
-        <junit.version>5.10.0</junit.version>
+        <junit.version>5.10.1</junit.version>
         <slf4j.version>2.0.9</slf4j.version>
     </properties>
 

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -11,20 +11,18 @@
     https://www.apache.org/licenses/LICENSE-2.0.txt
 
 -->
-<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">
-    <bannerLeft>
-        <src>/images/csveed.png</src>
-        <href>https://github.com/42BV/csveed</href>
+<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">
+    <bannerLeft href="https://github.com/42BV/csveed">
+        <image src="/images/csveed.png" />
     </bannerLeft>
-    <bannerRight>
-        <src>/images/csveed.png</src>
-        <href>https://github.com/42BV/csveed</href>
+    <bannerRight href="https://github.com/42BV/csveed"?>
+        <image src="/images/csveed.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.11.2</version>
+        <version>2.0.0-M8</version>
     </skin>
     <custom>
         <fluidoSkin>
@@ -47,4 +45,4 @@
         </menu>
         <menu ref="reports" />
     </body>
-</project>
+</site>