branch develop-2.x updated (5a87cf7 -> 8726a84)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 5a87cf7 browse the column until the end of all the columns, not only the visible ones (fixes #3935) new 8aa62ea Upgrade maven to 3.3.9 (Fixes #3937) new 8726a84 Revert "[jgitflow-maven-plugin]updating poms for 2.30-SNAPSHOT development" The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8726a84f0620d581c82f9282a097e674e9f729ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 27 16:42:58 2016 +0200 Revert "[jgitflow-maven-plugin]updating poms for 2.30-SNAPSHOT development" This reverts commit 0e2d7d9dba784452dc4c733bc050c6b026c9f9aa. commit 8aa62eade6b9189c832f636e6c1adf55b9318c94 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 27 16:42:54 2016 +0200 Upgrade maven to 3.3.9 (Fixes #3937) Summary of changes: jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 36 +++++-- .../java/org/nuiton/jaxx/plugin/JaxxBaseTest.java | 69 +++++++++---- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 113 +++++++-------------- 17 files changed, 125 insertions(+), 121 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 8aa62eade6b9189c832f636e6c1adf55b9318c94 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 27 16:42:54 2016 +0200 Upgrade maven to 3.3.9 (Fixes #3937) --- jaxx-maven-plugin/pom.xml | 34 ++++++- .../java/org/nuiton/jaxx/plugin/JaxxBaseTest.java | 69 +++++++++---- pom.xml | 111 ++++++--------------- 3 files changed, 109 insertions(+), 105 deletions(-) diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index d772e92..dbcd69d 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -78,11 +78,22 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> </dependency> + <!--dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </dependency--> + <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-compat</artifactId> </dependency> <dependency> @@ -159,15 +170,28 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin-api</artifactId> - <classifier>tests</classifier> + <artifactId>helper-maven-plugin-test-api</artifactId> + </dependency> + + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + <scope>test</scope> </dependency> - <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-aether-provider</artifactId> + </dependency> + + <dependency> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-api</artifactId> </dependency> <dependency> diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java index 32be4d1..599734d 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java @@ -31,7 +31,8 @@ import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.plugin.AbstractMojoTest; +import org.junit.Rule; +import org.nuiton.plugin.MojoTestRule; import java.io.File; import java.io.IOException; @@ -43,37 +44,57 @@ import static org.junit.Assert.assertTrue; /** * Base test case for a jaxx:generate goal. * - * Use {@link AbstractMojoTest} from {@code helper-maven-plugin}. - * * @author Tony Chemit - chemit@codelutin.com - * @see AbstractMojoTest * @see GenerateMojo */ -public abstract class JaxxBaseTest extends AbstractMojoTest<GenerateMojo> { +public abstract class JaxxBaseTest { /** Logger. */ private static final Log log = LogFactory.getLog(JaxxBaseTest.class); - @Override - protected String getGoalName(String methodName) { - return "generate"; - } + @Rule + public MojoTestRule<GenerateMojo> rule = new MojoTestRule<GenerateMojo>(getClass(), "generate") { + + @Override + protected void setUpMojo(GenerateMojo mojo, File pomFile) throws Exception { - @Override - protected void setUpMojo(GenerateMojo mojo, File pomFile) throws Exception { - try { - super.setUpMojo(mojo, pomFile); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error(e); + try { + super.setUpMojo(mojo, pomFile); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error(e); + } } + mojo.setEncoding("UTF-8"); + mojo.validatorFactoryFQN= SwingValidator.class.getName(); + mojo.jaxxContextFQN = DefaultJAXXContext.class.getName(); + mojo.compilerFQN = JAXXCompiler.class.getName(); + mojo.defaultDecoratorFQN = DefaultCompiledObjectDecorator.class.getName(); + } - mojo.setEncoding("UTF-8"); - mojo.validatorFactoryFQN= SwingValidator.class.getName(); - mojo.jaxxContextFQN = DefaultJAXXContext.class.getName(); - mojo.compilerFQN = JAXXCompiler.class.getName(); - mojo.defaultDecoratorFQN = DefaultCompiledObjectDecorator.class.getName(); - } + + }; + +// @Override +// protected String getGoalName(String methodName) { +// return "generate"; +// } +// +// @Override +// protected void setUpMojo(GenerateMojo mojo, File pomFile) throws Exception { +// try { +// super.setUpMojo(mojo, pomFile); +// } catch (Exception e) { +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// } +// mojo.setEncoding("UTF-8"); +// mojo.validatorFactoryFQN= SwingValidator.class.getName(); +// mojo.jaxxContextFQN = DefaultJAXXContext.class.getName(); +// mojo.compilerFQN = JAXXCompiler.class.getName(); +// mojo.defaultDecoratorFQN = DefaultCompiledObjectDecorator.class.getName(); +// } protected void checkPattern(GenerateMojo mojo, String pattern, @@ -97,6 +118,10 @@ public abstract class JaxxBaseTest extends AbstractMojoTest<GenerateMojo> { } } + public GenerateMojo getMojo() { + return rule.getMojo(); + } + protected void assertNumberJaxxFiles(int expectedNbFiles) { if (expectedNbFiles == 0) { assertTrue(getMojo().files == null || getMojo().files.length == 0); diff --git a/pom.xml b/pom.xml index 74d6fbd..c259d99 100644 --- a/pom.xml +++ b/pom.xml @@ -136,12 +136,8 @@ <signatureArtifactId>java16</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <!-- Remove this if one day we use maven3 API in jaxx 2 --> - <helperPluginVersion>2.1</helperPluginVersion> - <pluginPluginVersion>3.3</pluginPluginVersion> - <!-- Remove this if one day we use maven3 API in jaxx 2 --> + <mavenVersion>3.3.9</mavenVersion> - <mavenVersion>2.2.1</mavenVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <eugeneVersion>2.13</eugeneVersion> @@ -156,7 +152,7 @@ <!-- jnlp configuration --> <jnlpFileName>jaxx-demo.jnlp</jnlpFileName> - <jnlpCodebase>http://jaxx.nuiton.org/v/${siteDeployClassifier}/jaxx-demo/jnlp</jnlpCodebase> + <jnlpCodebase>http://jaxx.nuiton.org/v/${project.version}/jaxx-demo/jnlp</jnlpCodebase> <jgitflow.masterBranchName>master-2.x</jgitflow.masterBranchName> <jgitflow.developBranchName>develop-2.x</jgitflow.developBranchName> @@ -196,12 +192,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.2</version> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.2</version> @@ -348,10 +338,8 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin-api</artifactId> + <artifactId>helper-maven-plugin-test-api</artifactId> <version>${helperPluginVersion}</version> - <scope>test</scope> - <classifier>tests</classifier> <exclusions> <exclusion> @@ -408,7 +396,14 @@ <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-compat</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> <version>${mavenVersion}</version> <scope>provided</scope> </dependency> @@ -447,26 +442,6 @@ <version>${swingXVersion}</version> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - <version>1.1.8</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </exclusion> - <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- dependencies to mojo annotations --> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -485,56 +460,36 @@ <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>1.3</version> + <version>3.3.0</version> <scope>test</scope> <exclusions> - + <!--evil plexus container--> <exclusion> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-archiver</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-file</artifactId> + <artifactId>plexus-container-default</artifactId> </exclusion> + </exclusions> + </dependency> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-shared</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - </exclusion> + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + <version>0.3.3</version> + <scope>provided</scope> + </dependency> - <exclusion> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - </exclusion> - <!--<exclusion>--> - <!--<groupId>org.apache.maven</groupId>--> - <!--<artifactId>maven-core</artifactId>--> - <!--</exclusion>--> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-aether-provider</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> - </exclusions> + <dependency> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-api</artifactId> + <version>1.1.0</version> + <scope>provided</scope> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 8726a84f0620d581c82f9282a097e674e9f729ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 27 16:42:58 2016 +0200 Revert "[jgitflow-maven-plugin]updating poms for 2.30-SNAPSHOT development" This reverts commit 0e2d7d9dba784452dc4c733bc050c6b026c9f9aa. --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index f072430..784a0a4 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index b21b01a..e1e6d10 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 271b408..339d043 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index fd65409..31117ec 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index e9444d2..790d985 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index dbcd69d..23edfa1 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index c66bbe2..1f49793 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 715eac9..5994344 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 48dfd61..e197643 100644 --- a/jaxx-widgets-common/pom.xml +++ b/jaxx-widgets-common/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index f90b81d..3896e88 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index d09de5d..71d73f3 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 66088e7..bfb9bad 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index ebb0a31..4c37f77 100644 --- a/jaxx-widgets-number/pom.xml +++ b/jaxx-widgets-number/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index fed70de..801c310 100644 --- a/jaxx-widgets-select/pom.xml +++ b/jaxx-widgets-select/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 42d091e..57b5278 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index c259d99..61026c8 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm