This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit b7757005c8bc2ecb6427af99d4886ac3692c5e87 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 17:23:15 2020 +0200 Fix releasable build [skip ci] --- jaxx-application-api/src/site/site.xml | 1 - jaxx-application-swing/src/site/site.xml | 1 - jaxx-compiler/pom.xml | 16 +++---- .../decorators/BoxedCompiledObjectDecorator.java | 4 +- .../decorators/DefaultCompiledObjectDecorator.java | 2 +- .../HelpRootCompiledObjectDecorator.java | 2 +- .../jaxx/compiler/finalizers/DefaultFinalizer.java | 2 +- .../jaxx/compiler/finalizers/SwingFinalizer.java | 3 +- .../compiler/finalizers/ValidatorFinalizer.java | 3 +- .../java/jaxx/compiler/spi/DefaultInitializer.java | 4 +- jaxx-compiler/src/site/site.xml | 1 - .../jaxx/runtime/swing/config/model/package.html | 2 +- .../java/jaxx/runtime/swing/config/package.html | 3 +- jaxx-config/src/site/site.xml | 1 - jaxx-demo/pom.xml | 10 ++--- jaxx-demo/src/site/rst/index.rst.vm | 4 -- jaxx-demo/src/site/site.xml | 6 --- jaxx-maven-plugin/pom.xml | 2 +- jaxx-maven-plugin/src/site/site.xml | 1 - .../java/jaxx/runtime/awt/visitor/package.html | 6 +-- .../main/java/jaxx/runtime/swing/nav/package.html | 16 +++---- .../java/jaxx/runtime/swing/nav/tree/package.html | 10 ++--- .../jaxx/runtime/swing/nav/treetable/package.html | 10 ++--- .../jaxx/runtime/swing/wizard/ext/package.html | 2 +- .../java/jaxx/runtime/swing/wizard/package.html | 2 +- jaxx-runtime/src/site/site.xml | 1 - jaxx-validator/src/site/site.xml | 1 - jaxx-widgets-about/src/site/site.xml | 1 - jaxx-widgets-common/src/site/site.xml | 1 - jaxx-widgets-datetime/src/site/site.xml | 1 - .../org/nuiton/jaxx/widgets/extra/package.html | 2 +- jaxx-widgets-gis/src/site/site.xml | 1 - jaxx-widgets-number/src/site/site.xml | 1 - jaxx-widgets-select/src/site/site.xml | 1 - .../jaxx/runtime/swing/editor/bean/package.html | 2 +- .../java/jaxx/runtime/swing/editor/package.html | 2 +- .../src/main/java/jaxx/runtime/swing/package.html | 2 +- jaxx-widgets/src/site/site.xml | 1 - pom.xml | 51 ++++------------------ src/site/site.xml | 31 ++----------- 40 files changed, 63 insertions(+), 150 deletions(-) diff --git a/jaxx-application-api/src/site/site.xml b/jaxx-application-api/src/site/site.xml index 1a18b304..c75514f7 100644 --- a/jaxx-application-api/src/site/site.xml +++ b/jaxx-application-api/src/site/site.xml @@ -26,7 +26,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-application-swing/src/site/site.xml b/jaxx-application-swing/src/site/site.xml index 2975066c..b624437a 100644 --- a/jaxx-application-swing/src/site/site.xml +++ b/jaxx-application-swing/src/site/site.xml @@ -26,7 +26,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index d61c5318..1e7ffca6 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -39,17 +39,6 @@ <name>JAXX :: Compiler</name> <description>JAXX Compiler api</description> - <properties> - <!-- Java version --> - <javaVersion>1.7</javaVersion> - <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> - <maven.compiler.source>${javaVersion}</maven.compiler.source> - <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> - <maven.compiler.target>${javaVersion}</maven.compiler.target> - <signatureArtifactId>java17</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> - </properties> - <dependencies> <!-- sibling dependencies --> @@ -116,6 +105,11 @@ <artifactId>commons-io</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java index 8162923e..32771fc7 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java @@ -24,7 +24,9 @@ package jaxx.compiler.decorators; import jaxx.compiler.CompiledObject; import jaxx.compiler.CompiledObject.ChildRef; +import jaxx.compiler.CompiledObjectDecorator; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.finalizers.JAXXCompilerFinalizer; import jaxx.compiler.java.JavaFile; import jaxx.runtime.SwingUtil; @@ -33,9 +35,9 @@ import jaxx.runtime.SwingUtil; * with a JXLayer. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="boxed" role="jaxx.compiler.CompiledObjectDecorator" * @since 1.2 */ +@org.codehaus.plexus.component.annotations.Component(role = CompiledObjectDecorator.class, hint = "boxed") public class BoxedCompiledObjectDecorator extends DefaultCompiledObjectDecorator { @Override diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java index 81861ff0..e5306eed 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java @@ -44,9 +44,9 @@ import java.util.Map.Entry; * The default decorator to use on all compiled objects. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="default" role="jaxx.compiler.CompiledObjectDecorator" * @since 1.2 */ +@org.codehaus.plexus.component.annotations.Component(role = CompiledObjectDecorator.class, hint = "default") public class DefaultCompiledObjectDecorator implements CompiledObjectDecorator { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java index 28c11495..abfd1aa0 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java @@ -44,9 +44,9 @@ import static jaxx.compiler.java.JavaElementFactory.newArgument; * A decorator to place on a root compiled object to process javaHelp on the file. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="help" role="jaxx.compiler.CompiledObjectDecorator" * @since 1.2 */ +@org.codehaus.plexus.component.annotations.Component(role = CompiledObjectDecorator.class, hint = "help") public class HelpRootCompiledObjectDecorator extends DefaultCompiledObjectDecorator { /** the list of discovered helpId */ diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java index 50f1a54f..ad709cc0 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java @@ -81,8 +81,8 @@ import static jaxx.compiler.java.JavaElementFactory.newMethod; * {@link JAXXCompiler} now only deals with the compilation of files. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="default" role="jaxx.compiler.finalizers.JAXXCompilerFinalizer" */ +@org.codehaus.plexus.component.annotations.Component(role = JAXXCompilerFinalizer.class, hint = "default") public class DefaultFinalizer extends AbstractFinalizer { /** Logger. */ diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java index bf58823b..0b772b71 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java @@ -23,6 +23,7 @@ package jaxx.compiler.finalizers; import jaxx.compiler.CompiledObject; +import jaxx.compiler.CompiledObjectDecorator; import jaxx.compiler.JAXXCompiler; import jaxx.compiler.java.JavaElementFactory; import jaxx.compiler.java.JavaFile; @@ -37,8 +38,8 @@ import java.lang.reflect.Modifier; /** * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="swing" role="jaxx.compiler.finalizers.JAXXCompilerFinalizer" */ +@org.codehaus.plexus.component.annotations.Component(role = JAXXCompilerFinalizer.class, hint = "swing") public class SwingFinalizer extends AbstractFinalizer { /** Logger. */ diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java index 34527365..3019d4eb 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java @@ -43,6 +43,7 @@ import jaxx.runtime.validator.swing.meta.Validator; import jaxx.runtime.validator.swing.meta.ValidatorField; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -53,8 +54,8 @@ import java.util.List; * To finalize validators fields. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="validators" role="jaxx.compiler.finalizers.JAXXCompilerFinalizer" */ +@Component(role = JAXXCompilerFinalizer.class, hint = "validators") public class ValidatorFinalizer extends AbstractFinalizer { /** Logger. */ diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java b/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java index b5cf5cc2..a1643d5a 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java @@ -22,6 +22,7 @@ package jaxx.compiler.spi; +import jaxx.compiler.CompiledObjectDecorator; import jaxx.compiler.JAXXCompiler; import jaxx.compiler.beans.BeanInfoUtil; import jaxx.compiler.reflect.ClassDescriptor; @@ -109,9 +110,8 @@ import java.awt.Component; /** * Initializes support provided from JAXX (java, swing and validation). - * - * @plexus.component role-hint="default" role="jaxx.compiler.spi.Initializer" */ +@org.codehaus.plexus.component.annotations.Component(role = Initializer.class, hint = "default") public class DefaultInitializer implements Initializer { @Override diff --git a/jaxx-compiler/src/site/site.xml b/jaxx-compiler/src/site/site.xml index 12a8ae25..b8599262 100644 --- a/jaxx-compiler/src/site/site.xml +++ b/jaxx-compiler/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/package.html b/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/package.html index 6f6f055c..b25c74b0 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/package.html +++ b/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/package.html @@ -21,7 +21,7 @@ --> <html> <body> -<h1>Package jaxx.runtime.swing.config.model</h1> +<h2>Package jaxx.runtime.swing.config.model</h2> the package contains the models of the Config UI. </body> diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html b/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html index 24c5f93b..ef646616 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html +++ b/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html @@ -21,14 +21,13 @@ --> <html> <body> -<h1>Package jaxx.runtime.swing.config</h1> +<h2>Package jaxx.runtime.swing.config</h2> This package contains the Config ui, based on org.nuiton.config.ApplicationConfig. The config ui is categorized and offers possibility to add callbacks to run when configuration was saved. -<hr/> <ul> <li> ConfigUIBuilder offers you a simple way to build the ConfigUI (and his diff --git a/jaxx-config/src/site/site.xml b/jaxx-config/src/site/site.xml index 25adfc0e..02ce7032 100644 --- a/jaxx-config/src/site/site.xml +++ b/jaxx-config/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 64bcb087..f4f46352 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -337,7 +337,7 @@ <profiles> - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> + <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin <profile> <id>release-jnlp-profile</id> <activation> @@ -349,7 +349,6 @@ <build> <defaultGoal>package</defaultGoal> <plugins> - <!-- key store secrets availables --> <plugin> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin</artifactId> @@ -371,7 +370,6 @@ </executions> </plugin> - <!-- make webstart --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> @@ -387,9 +385,9 @@ </plugin> </plugins> </build> - </profile> + </profile>--> - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> + <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin <profile> <id>reporting</id> <activation> @@ -413,7 +411,7 @@ </plugins> </reporting> - </profile> + </profile>--> </profiles> diff --git a/jaxx-demo/src/site/rst/index.rst.vm b/jaxx-demo/src/site/rst/index.rst.vm index c6a96fd8..e638c77f 100644 --- a/jaxx-demo/src/site/rst/index.rst.vm +++ b/jaxx-demo/src/site/rst/index.rst.vm @@ -33,8 +33,6 @@ In next jaxx major version, we will implements the nice SwingSet 3. Set it in action ---------------- -|webstart| - To run this example in `Java Web Start`_, click the `following link`_. For more details about the `Jaxx Demo webstart`_. @@ -48,8 +46,6 @@ downloading JAXX, and you can also view the source code for the individual demos .. _Java Web Start: http://java.sun.com/products/javawebstart/ -.. |webstart| image:: ${siteCommonResourcesUrl}/images/logos/webstart.gif - .. _following link: ./jnlp/jaxx-demo.jnlp .. _Jaxx Demo webstart: jnlp-report.html diff --git a/jaxx-demo/src/site/site.xml b/jaxx-demo/src/site/site.xml index b0196e55..42e29359 100644 --- a/jaxx-demo/src/site/site.xml +++ b/jaxx-demo/src/site/site.xml @@ -24,15 +24,9 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> - <poweredBy> - <logo href="${siteCommonResourcesUrl}/jaxx/" name="Jaxx" - img="${siteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> - </poweredBy> - <body> <breadcrumbs> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 69eec31b..5f90bffd 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -253,7 +253,7 @@ <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>${pluginPluginVersion}</version> + <version>3.5.2</version> </tagletArtifact> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> diff --git a/jaxx-maven-plugin/src/site/site.xml b/jaxx-maven-plugin/src/site/site.xml index 4fe9cae8..cf506fdd 100644 --- a/jaxx-maven-plugin/src/site/site.xml +++ b/jaxx-maven-plugin/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html b/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html index e3ebdf20..1502fe0c 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html +++ b/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html @@ -21,14 +21,14 @@ --> <html> <body> -<h1>JAXX - awt tree node API</h1> +<h2>JAXX - awt tree node API</h2> This package contains a API to visit swing components. -<h2>ComponentTreenode</h2> +<h3>ComponentTreenode</h3> The model of a node in the tree -<h2>ComponentTreenodeVisitor</h2> +<h3>ComponentTreenodeVisitor</h3> Object to load childs of Contract of a visitor on nodes. </body> </html> diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html b/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html index 0828412b..0058fa80 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html @@ -21,7 +21,7 @@ --> <html> <body> -<h1>JAXX - nav api</h1> +<h2>JAXX - nav api</h2> This package contains a little framework to build dynamic nodes. @@ -38,7 +38,7 @@ Tow implementations are offers : <code>jaxx.runtime.swing.navigation</code> </p> -<h1>Why this api ?</h1> +<h2>Why this api ?</h2> <p> The main goal of this api is to offer an auto-loading system of tree @@ -61,23 +61,23 @@ Tow implementations are offers : </p> -<h1>Api</h1> +<h2>Api</h2> -<h2>DataProvider</h2> +<h3>DataProvider</h3> Contract of objet responsible of acquiring data to populate nodes and render them. -<h2>JaxxNode</h2> +<h3>JaxxNode</h3> Jaxx node contract customized for our purpose (loaded, dirty states,...). -<h2>JaxxNodeChildLoador</h2> +<h3>JaxxNodeChildLoador</h3> Contract to load childs of a JaxxNode using DataProvider. -<h2>JaxxNavHelper</h2> +<h3>JaxxNavHelper</h3> Helper to manage a tree or a tree table using auto-loading nodes. -<h2>JaxxNavBridge</h2> +<h3>JaxxNavBridge</h3> Bridge to encapsulate models. </body> diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html b/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html index c8330b59..3306a8ac 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html @@ -22,20 +22,20 @@ package.html <html> <body> -<h1>JAXX - nav tree implementation</h1> +<h2>JAXX - nav tree implementation</h2> This package contains the implementation of nav api for the <b>JTree</b> -<h2>NavTreeNode</h2> +<h3>NavTreeNode</h3> An override of DefaultMutableTreeNode implement JaxxNode. -<h2>NavTreeChildLoador</h2> +<h3>NavTreeChildLoador</h3> Object to load childs of a tree node using DataProvider. -<h2>NavTreeHelper</h2> +<h3>NavTreeHelper</h3> Helper to manage a tree using auto-loading nodes. -<h2>AbstractNavTreeCellRenderer</h2> +<h3>AbstractNavTreeCellRenderer</h3> Abstract renderer using DataProvider to acquire node render. </body> diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/package.html b/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/package.html index 21fd7e6f..26779b31 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/package.html +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/package.html @@ -22,20 +22,20 @@ package.html <html> <body> -<h1>JAXX - nav tree table implementation</h1> +<h2>JAXX - nav tree table implementation</h2> This package contains the implementation of nav api for the <b>JXTreeTable</b> -<h2>NavTreeTableNode</h2> +<h3>NavTreeTableNode</h3> An override of DefaultMutableTreeTableNode implement JaxxNode -<h2>NavTreeTableChildLoador</h2> +<h3>NavTreeTableChildLoador</h3> Object to load childs of a tree table node using DataProvider. -<h2>NavTreeTableHelper</h2> +<h3>NavTreeTableHelper</h3> Helper to manage a tree table using auto-loading nodes. -<h2>JaxxTreeTableModel</h2> +<h3>JaxxTreeTableModel</h3> Implementation of TreeTableModel used by JaxxDelegateTreeModel </body> diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/package.html b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/package.html index b0fb7f3d..ad33a8e7 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/package.html +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/package.html @@ -21,7 +21,7 @@ --> <html> <body> -<h1>JAXX - Wizard framework</h1> +<h2>JAXX - Wizard framework</h2> This package contains all the classes of the wizard framework ext. diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/package.html b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/package.html index ff7bbaf1..4cf449ed 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/package.html +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/package.html @@ -21,7 +21,7 @@ --> <html> <body> -<h1>JAXX - Wizard framework</h1> +<h2>JAXX - Wizard framework</h2> This package contains all the classes of the wizard framework. diff --git a/jaxx-runtime/src/site/site.xml b/jaxx-runtime/src/site/site.xml index 92b23718..b37d3972 100644 --- a/jaxx-runtime/src/site/site.xml +++ b/jaxx-runtime/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-validator/src/site/site.xml b/jaxx-validator/src/site/site.xml index deb159e4..d3acafb7 100644 --- a/jaxx-validator/src/site/site.xml +++ b/jaxx-validator/src/site/site.xml @@ -26,7 +26,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-widgets-about/src/site/site.xml b/jaxx-widgets-about/src/site/site.xml index 8d5a39f6..25ef5544 100644 --- a/jaxx-widgets-about/src/site/site.xml +++ b/jaxx-widgets-about/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-widgets-common/src/site/site.xml b/jaxx-widgets-common/src/site/site.xml index 8d5a39f6..25ef5544 100644 --- a/jaxx-widgets-common/src/site/site.xml +++ b/jaxx-widgets-common/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-widgets-datetime/src/site/site.xml b/jaxx-widgets-datetime/src/site/site.xml index 8d5a39f6..25ef5544 100644 --- a/jaxx-widgets-datetime/src/site/site.xml +++ b/jaxx-widgets-datetime/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/package.html b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/package.html index b33998e0..150f8eec 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/package.html +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/widgets/extra/package.html @@ -21,6 +21,6 @@ --> <html> <body> - <h1>Nuiton-Widgets</h1> + <h2>Nuiton-Widgets</h2> </body> </html> diff --git a/jaxx-widgets-gis/src/site/site.xml b/jaxx-widgets-gis/src/site/site.xml index 8d5a39f6..25ef5544 100644 --- a/jaxx-widgets-gis/src/site/site.xml +++ b/jaxx-widgets-gis/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-widgets-number/src/site/site.xml b/jaxx-widgets-number/src/site/site.xml index 8d5a39f6..25ef5544 100644 --- a/jaxx-widgets-number/src/site/site.xml +++ b/jaxx-widgets-number/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-widgets-select/src/site/site.xml b/jaxx-widgets-select/src/site/site.xml index 8d5a39f6..25ef5544 100644 --- a/jaxx-widgets-select/src/site/site.xml +++ b/jaxx-widgets-select/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html index e373ef79..79ae8025 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html @@ -19,7 +19,7 @@ --> <html> <body> -<h1>Package jaxx.runtime.swing.editor.bean</h1> +<h2>Package jaxx.runtime.swing.editor.bean</h2> Package containing several rich editors based on JavaBeans: <ul> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html index ccb8ee07..19f469ec 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html @@ -19,7 +19,7 @@ --> <html> <body> -<h1>Package jaxx.runtime.swing.editor</h1> +<h2>Package jaxx.runtime.swing.editor</h2> Package containing several richi editors : <ul> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/package.html b/jaxx-widgets/src/main/java/jaxx/runtime/swing/package.html index 0cd995dc..e8e09949 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/package.html +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/package.html @@ -21,7 +21,7 @@ --> <html> <body> -<h1>Package jaxx.runtime.swing</h1> +<h2>Package jaxx.runtime.swing</h2> <p> Base package of the project <strong>jaxx-widgets</strong>. diff --git a/jaxx-widgets/src/site/site.xml b/jaxx-widgets/src/site/site.xml index 8d5a39f6..25ef5544 100644 --- a/jaxx-widgets/src/site/site.xml +++ b/jaxx-widgets/src/site/site.xml @@ -28,7 +28,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> diff --git a/pom.xml b/pom.xml index 9a90a048..03bd22c1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>pom</artifactId> - <version>11.4</version> + <artifactId>nuitonpom</artifactId> + <version>11.8-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -129,7 +129,6 @@ <properties> - <gitlabGroupName>nuiton</gitlabGroupName> <gitlabProjectName>jaxx</gitlabProjectName> <javaVersion>1.8</javaVersion> @@ -494,6 +493,12 @@ <version>3.0.24</version> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + <version>2.0.0</version> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> @@ -762,47 +767,7 @@ </plugins> </reporting> - - <build> - - <plugins> - - <plugin> - <groupId>io.ultreia.maven</groupId> - <artifactId>gitlab-maven-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <inherited>false</inherited> - <goals> - <goal>generate-changes</goal> - </goals> - <phase>pre-site</phase> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>compute-distribution-site-url</id> - <goals> - <goal>compute-distribution-site-url</goal> - </goals> - <phase>pre-site</phase> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - </profile> - - </profiles> </project> diff --git a/src/site/site.xml b/src/site/site.xml index 991aa660..3ec61018 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,14 +22,14 @@ --> <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + 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"> <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.4</version> + <version>1.9</version> </skin> <custom> @@ -48,7 +48,6 @@ <bannerLeft> <name>${project.name}</name> - <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -57,22 +56,8 @@ <href>http://www.codelutin.com</href> </bannerRight> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> - <logo href="http://jrst.nuiton.org" name="JRst" - img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - </poweredBy> - <body> - <head> - <script type="text/javascript" src="http://common.nuiton.org/dev/js/mavenpom-site.js"> </script> - <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> - </head> <links> <item name="nuiton.org" href="https://forge.nuiton.org"/> <item name="CodeLutin" href="http://codelutin.com"/> @@ -81,8 +66,7 @@ </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"/> </breadcrumbs> <menu ref="modules"/> @@ -128,12 +112,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='${project.siteSourcesType}'/> - </footer> - </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.