This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-version. See https://gitlab.nuiton.org/nuiton/nuiton-version.git commit 5b6b9f43bdcc1cd5abe401a2e984fcf0777fb361 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 20:23:52 2020 +0200 Fix releasable build [skip ci] --- pom.xml | 55 +--------------------- src/main/java/org/nuiton/version/Version.java | 14 +++--- .../java/org/nuiton/version/VersionBuilder.java | 6 +-- .../java/org/nuiton/version/VersionComparator.java | 2 +- src/site/site.xml | 17 ++----- 5 files changed, 18 insertions(+), 76 deletions(-) diff --git a/pom.xml b/pom.xml index cac33dd..0db478f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>10</version> + <version>11.8-SNAPSHOT</version> </parent> <artifactId>nuiton-version</artifactId> @@ -86,8 +86,7 @@ <properties> <!-- redmine project Id --> - <projectId>nuiton-version</projectId> - <ciViewId>nuiton-version</ciViewId> + <gitlabProjectName>nuiton-version</gitlabProjectName> <javaVersion>1.8</javaVersion> <signatureArtifactId>java18</signatureArtifactId> @@ -95,13 +94,6 @@ <!-- Site locale --> <locales>fr</locales> - - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - <!-- Post Release configuration --> - <skipPostRelease>false</skipPostRelease> - </properties> <dependencies> @@ -157,47 +149,4 @@ </dependency> </dependencies> - - <profiles> - - <!-- create assemblies at release time --> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - - <!-- launch in a release the assembly automaticly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> - - </plugins> - - </build> - </profile> - - </profiles> </project> diff --git a/src/main/java/org/nuiton/version/Version.java b/src/main/java/org/nuiton/version/Version.java index 1a98869..d71c0b8 100644 --- a/src/main/java/org/nuiton/version/Version.java +++ b/src/main/java/org/nuiton/version/Version.java @@ -33,15 +33,15 @@ import java.util.List; /** * <p>A class to represent a version.</p> * <p>Replace previously {@code org.nuiton.util.Version} class.</p> - * <h3>Definition</h3> + * <h2>Definition</h2> * A version is defined of n {@code componants} separated by {@code componantSeparator}. - * <h4>Componants</h4> + * <h3>Componants</h3> * Componants can be of two types: * <ul> * <li>Number componant: a strict positive integer value</li> * <li>String componant: a sequence of characters which can't be either number nor componant separators</li> * </ul> - * <h4>Componant separators</h4> + * <h3>Componant separators</h3> * <p> * Componant separator are characters which can't be alphanumeric and can be {@code empty character}. * </p> @@ -51,9 +51,9 @@ import java.util.List; * <p> * For example, version {@code 1a2} is composed of three componants: {code 1}, {@code a} and {@code 3}. * </p> - * <h4>Snapshot flag</h4> + * <h3>Snapshot flag</h3> * Additionnaly version can be qualifed as a {@code SNAPSHOT} (see below section about ordering). - * <h3>Examples</h3> + * <h2>Examples</h2> * <pre> * 0 (one componant 0) * 0-SNAPSHOT (one componant 0 + SNAPSHOT flag) @@ -65,9 +65,9 @@ import java.util.List; * 1.1-a (three componants 1,1,a) * 1.1-a12-4.45_6432 (seven componants 1,1,a,12,4,45,643) * </pre> - * <h3>Ordering</h3> + * <h2>Ordering</h2> * A version is comparable, to have all the detail of order see {@link VersionComparator}. - * <h3>Immutability</h3> + * <h2>Immutability</h2> * The version is immutable, to create or modify a version, use the {@link VersionBuilder} API * or shortcut methods in {@link Versions}. * diff --git a/src/main/java/org/nuiton/version/VersionBuilder.java b/src/main/java/org/nuiton/version/VersionBuilder.java index b91d6b7..d44ed99 100644 --- a/src/main/java/org/nuiton/version/VersionBuilder.java +++ b/src/main/java/org/nuiton/version/VersionBuilder.java @@ -37,10 +37,10 @@ import java.util.Set; /** * To build some {@link Version}. * - * <h3>General usage</h3> + * <h2>General usage</h2> * Use one the {@code create} methods, custom what you need on build, and finally * use {@link #build()} method to obtain a version. - * <h3>Options details</h3> + * <h2>Options details</h2> * TODO * <ul> * <li>{@code preReleaseClassifiers}</li> @@ -48,7 +48,7 @@ import java.util.Set; * <li>{@code joinSeparator}</li> * <li>{@code snapshot}</li> * </ul> - * <h3>Customize componants</h3> + * <h2>Customize componants</h2> * TODO * * Created on 7/11/14. diff --git a/src/main/java/org/nuiton/version/VersionComparator.java b/src/main/java/org/nuiton/version/VersionComparator.java index fcd7797..1afbe7c 100644 --- a/src/main/java/org/nuiton/version/VersionComparator.java +++ b/src/main/java/org/nuiton/version/VersionComparator.java @@ -35,7 +35,7 @@ import java.util.List; * Comparator of {@link Version}. * * You may be before this the documentation of {@link Version} object... - * <h1>Version componant ordering</h1> + * <h2>Version componant ordering</h2> * We can compare only componants of same type. * * Number componants use natural number ordering (0<1<2,...) (see {@link Version.NumberVersionComponant}). diff --git a/src/site/site.xml b/src/site/site.xml index f656faa..d78745b 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -3,7 +3,7 @@ #%L Nuiton Version %% - Copyright (C) 2016 CodeLutin + Copyright (C) 2016 - 2020 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -22,9 +22,9 @@ --> -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" +<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.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -45,8 +45,8 @@ </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + <item name="${project.name}" href="${this.url}/index.html"/> + <item name="${project.version}" href="${this.url}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -55,12 +55,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='apt'/> - </footer> - </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.