[cleanup] ensure project builds without warnings

yupiik · Dec 25, 2023 · 0dbb311 · 0dbb311
1 parent 31d1fc2
commit 0dbb311
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 32 deletions.
diff --git a/codec-core/pom.xml b/codec-core/pom.xml
@@ -29,6 +29,6 @@
   <description>Simple codec logic to encrypt/decrypt properties.</description>
 
   <dependencies>
-
+    <!-- none indeed -->
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,8 @@
     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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.yupiik.maven</groupId>
@@ -195,6 +196,21 @@
     </extensions>
 
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>3.3.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <version>3.1.1</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -251,7 +267,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.6.3</version>
         <executions>
           <execution>
             <id>attach-javadocs</id>
@@ -279,7 +295,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M4</version>
+        <version>3.2.3</version>
         <configuration>
           <trimStackTrace>false</trimStackTrace>
         </configuration>
@@ -293,7 +309,7 @@
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>4.0</version>
+        <version>4.3</version>
         <executions>
           <execution>
             <id>check-license</id>
@@ -306,7 +322,18 @@
         <inherited>false</inherited>
         <configuration>
           <aggregate>true</aggregate>
-          <inlineHeader><![CDATA[Copyright (c) ${year} - ${organization.name} - ${organization.url}
+          <properties>
+            <organization.name>Yupiik SAS</organization.name>
+            <organization.url>https://www.yupiik.com</organization.url>
+            <year>2020 - 2023</year>
+          </properties>
+          <mapping>
+            <adoc>DOUBLESLASH_STYLE</adoc>
+            <rb>SCRIPT_STYLE</rb>
+          </mapping>
+          <licenseSets>
+            <licenseSet>
+              <inlineHeader><![CDATA[Copyright (c) ${year} - ${organization.name} - ${organization.url}
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
@@ -320,31 +347,25 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 ]]></inlineHeader>
-          <properties>
-            <organization.name>Yupiik SAS</organization.name>
-            <organization.url>https://www.yupiik.com</organization.url>
-            <year>2020 - 2023</year>
-          </properties>
-          <mapping>
-            <adoc>DOUBLESLASH_STYLE</adoc>
-            <rb>SCRIPT_STYLE</rb>
-          </mapping>
-          <excludes>
-            <exclude>**/*.txt</exclude>
-            <exclude>**/*.xlsx</exclude>
-            <exclude>**/*.idea</exclude>
-            <exclude>**/*.adoc</exclude>
-            <exclude>LICENSE</exclude>
-            <exclude>**/target/**</exclude>
-            <exclude>**/src/license/**</exclude>
-            <exclude>**/generated/**</exclude>
-            <exclude>**/*.gitkeep</exclude>
-            <exclude>**/*.html</exclude>
-            <exclude>**/*.slim</exclude>
-            <exclude>**/*.xslt</exclude>
-            <exclude>**/minisite/**</exclude>
-            <exclude>**/.mvn/jvm.config</exclude>
-          </excludes>
+              <excludes>
+                <exclude>**/*.txt</exclude>
+                <exclude>**/*.xlsx</exclude>
+                <exclude>**/*.idea</exclude>
+                <exclude>**/*.adoc</exclude>
+                <exclude>**/*.sdkmanrc</exclude>
+                <exclude>LICENSE</exclude>
+                <exclude>**/target/**</exclude>
+                <exclude>**/src/license/**</exclude>
+                <exclude>**/generated/**</exclude>
+                <exclude>**/*.gitkeep</exclude>
+                <exclude>**/*.html</exclude>
+                <exclude>**/*.slim</exclude>
+                <exclude>**/*.xslt</exclude>
+                <exclude>**/minisite/**</exclude>
+                <exclude>**/.mvn/jvm.config</exclude>
+              </excludes>
+            </licenseSet>
+          </licenseSets>
         </configuration>
       </plugin>
     </plugins>

diff --git a/yupiik-tools-cli/src/main/java/io/yupiik/tools/cli/command/MinisiteCommand.java b/yupiik-tools-cli/src/main/java/io/yupiik/tools/cli/command/MinisiteCommand.java
@@ -21,6 +21,7 @@
 import io.yupiik.tools.minisite.MiniSiteConfiguration;
 import io.yupiik.tools.minisite.PreAction;
 import io.yupiik.tools.minisite.language.AsciidoctorAsciidoc;
+import io.yupiik.tools.minisite.language.YupiikAsciidoc;
 import org.tomitribe.crest.api.Command;
 import org.tomitribe.crest.api.Default;
 import org.tomitribe.crest.api.Err;
@@ -77,6 +78,7 @@ public static void minisite(@Option(value = "source", description = "Where the m
                                 @Option(value = "customGems", description = "Custom JRuby gems path.") final String customGems,
                                 @Option(value = "requires", description = "Custom ruby requires (asciidoctor dependencies).") @Default("auto") final List<String> requires,
                                 @Option(value = "preActions", description = "PreAction to execute in properties format (type and configuration as keys, configuration value being properties again).") final List<PreAction> preActions,
+                                @Option(value = "useYupiikAsciidoc", description = "Should Yupiik Asciidoc renderer be used instead of JRuby Asciidoctor one.") final boolean useYupiikAsciidoc,
                                 @Out final PrintStream stdout,
                                 @Err final PrintStream stderr,
                                 final AsciidoctorProvider asciidoctorProvider) {
@@ -87,7 +89,7 @@ public static void minisite(@Option(value = "source", description = "Where the m
                 .projectVersion(version)
                 .projectName(name == null ? artifactId : name)
                 .projectArtifactId(artifactId == null ? name : artifactId)
-                .asciidoc(new AsciidoctorAsciidoc((conf, fn) -> { // todo: enable to use yupiik impl
+                .asciidoc(useYupiikAsciidoc ? new YupiikAsciidoc() : new AsciidoctorAsciidoc((conf, fn) -> {
                     final var asciidoctor = asciidoctorProvider.get(conf, stdout, stderr, workdir, false);
                     fn.apply(asciidoctor);
                     return asciidoctor;