diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a4f6b6c0..e4976df42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- [fj-doc-maven-plugin] updated readme information for quarkus-3 flavour - [fj-doc-guide] added pdf documentation - [fj-doc-playground-quarkus] fj-doc-ext-kotlin-version set to 0.4.2 diff --git a/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/maven/MojoInit.java b/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/maven/MojoInit.java index c78357c24..15a9f7fca 100644 --- a/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/maven/MojoInit.java +++ b/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/maven/MojoInit.java @@ -9,6 +9,7 @@ import org.fugerit.java.doc.project.facade.FlavourFacade; import org.fugerit.java.doc.project.facade.FlavourContext; import org.fugerit.java.doc.project.facade.ModuleFacade; +import org.fugerit.java.doc.project.facade.VersionCheck; import java.io.File; @@ -60,6 +61,8 @@ public void execute() throws MojoExecutionException, MojoFailureException { context.setModules( ModuleFacade.toModuleList( this.extensions ) ); context.setAddLombok( this.addLombok ); context.setFlavourVersion( this.flavourVersion ); + context.setVersion( VersionCheck.findVersion( this.version ) ); + context.setExtensions( this.extensions ); this.getLog().info( String.format( "flavour context : %s", context ) ); FlavourFacade.initProject( context ); } ); diff --git a/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/BasicVenusFacade.java b/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/BasicVenusFacade.java index b1df42def..8c1712995 100644 --- a/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/BasicVenusFacade.java +++ b/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/BasicVenusFacade.java @@ -2,22 +2,17 @@ import lombok.extern.slf4j.Slf4j; import org.apache.maven.model.*; -import org.apache.maven.plugin.lifecycle.Execution; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.fugerit.java.core.cfg.ConfigRuntimeException; import org.fugerit.java.core.io.helper.HelperIOException; -import org.fugerit.java.core.lang.helpers.BooleanUtils; import org.fugerit.java.core.lang.helpers.StringUtils; -import org.fugerit.java.doc.freemarker.tool.FreeMarkerTemplateSyntaxVerifier; import org.maxxq.maven.dependency.ModelIO; import java.io.*; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Properties; -import java.util.stream.Collectors; @Slf4j public class BasicVenusFacade { diff --git a/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/FlavourContext.java b/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/FlavourContext.java index ab9308f90..dbc8f66ca 100644 --- a/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/FlavourContext.java +++ b/fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/FlavourContext.java @@ -38,6 +38,12 @@ public class FlavourContext { @Getter @Setter private String flavourVersion; + @Getter @Setter + private String version; + + @Getter @Setter + private String extensions; + private String toClassName( String base, String splitString ) { StringBuilder buf = new StringBuilder(); String[] split = base.split( splitString ); diff --git a/fj-doc-maven-plugin/src/main/resources/config/template/flavour/quarkus-3/README.ftl b/fj-doc-maven-plugin/src/main/resources/config/template/flavour/quarkus-3/README.ftl index d3a4f8db5..bbad5b379 100644 --- a/fj-doc-maven-plugin/src/main/resources/config/template/flavour/quarkus-3/README.ftl +++ b/fj-doc-maven-plugin/src/main/resources/config/template/flavour/quarkus-3/README.ftl @@ -18,6 +18,10 @@ Open the [swagger-ui](http://localhost:8080/q/swagger-ui/) Test available paths (for instance : [/doc/example.md](http://localhost:8080/doc/example.md)) +NOTE: +- Powered by Quarkus ${context.flavourVersion} +- Using Fugerit Venus Doc ${context.version} (extensions : ${context.extensions}) + ## Overview This project has been initialized using [fj-doc-maven-plugin init goal](https://venusguides.fugerit.org/src/docs/wizard/fj-doc-maven-plugin_init.html). @@ -25,7 +29,7 @@ This project has been initialized using [fj-doc-maven-plugin init goal](https:// The quarkus 3 structure is similar to running the quarkus create goal : ```shell -mvn io.quarkus.platform:quarkus-maven-plugin:3.14.2:create \ +mvn io.quarkus.platform:quarkus-maven-plugin:${context.flavourVersion}:create \ -DprojectGroupId=${context.groupId} \ -DprojectArtifactId=${context.artifactId} \ -Dextensions='rest,rest-jackson,config-yaml,smallrye-openapi'