branch develop updated (e0b1b9c -> d2dbb98)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository maven-helper-plugin. See http://git.nuiton.org/maven-helper-plugin.git from e0b1b9c [jgitflow-maven-plugin]updating poms for 2.3-SNAPSHOT development new b581f0e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c6118e6 [maven-release-plugin] copy for tag maven-helper-plugin-2.1 adds 144cc10 [jgitflow-maven-plugin]updating poms for 2.2 branch with snapshot versions new cb2842d - update third parties files - optimize dependencies - add license headers new c1ce5aa tidy poms new f17ee78 [jgitflow-maven-plugin]updating poms for branch'release/2.2' with non-snapshot versions new a5104f7 [jgitflow-maven-plugin]merging 'release/2.2' into 'master' new d2dbb98 Merge branch 'master' into develop The 6 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 d2dbb98fc9da63d77abc7037c4fedbf4b1ded6e0 Merge: b581f0e a5104f7 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:29:08 2015 +0000 Merge branch 'master' into develop Conflicts: helper-maven-plugin/pom.xml pom.xml commit b581f0e7cf727acf609a8a4ce9d1f8d0c3302cb1 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:25:40 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a5104f707bfabe82150cf1092cb4c360914da8b4 Merge: c6118e6 f17ee78 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:25:39 2015 +0000 [jgitflow-maven-plugin]merging 'release/2.2' into 'master' commit f17ee784dca895f4de5f07b0a9d4d9210265536f Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:24:38 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.2' with non-snapshot versions commit c1ce5aaad47a6cd23b69f4627d36be6baee00d9f Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:24:22 2015 +0000 tidy poms commit cb2842dc413c9bfab4b38704e142921ae1e0c496 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:23:23 2015 +0000 - update third parties files - optimize dependencies - add license headers Summary of changes: helper-maven-plugin-api/pom.xml | 7 ++----- .../src/license/THIRD-PARTY.properties | 15 ++------------- helper-maven-plugin-test-api/pom.xml | 11 ++++++++--- .../src/license/THIRD-PARTY.properties | 16 +++------------- .../main/java/org/nuiton/plugin/MojoTestRule.java | 22 ++++++++++++++++++++++ .../main/java/org/nuiton/plugin/TestHelper.java | 22 ++++++++++++++++++++++ .../src/site/apt/index.apt | 21 +++++++++++++++++++++ .../src/site/apt/mojo-testFramework.apt | 21 +++++++++++++++++++++ helper-maven-plugin-test-api/src/site/site.xml | 22 ++++++++++++++++++++++ helper-maven-plugin/pom.xml | 9 +++------ .../src/license/THIRD-PARTY.properties | 15 ++------------- .../plugin/CheckAutoContainerPluginTest.java | 22 ++++++++++++++++++++++ pom.xml | 21 +++++++++------------ 13 files changed, 159 insertions(+), 65 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 in repository maven-helper-plugin. See http://git.nuiton.org/maven-helper-plugin.git commit cb2842dc413c9bfab4b38704e142921ae1e0c496 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:23:23 2015 +0000 - update third parties files - optimize dependencies - add license headers --- .../src/license/THIRD-PARTY.properties | 15 ++------------- helper-maven-plugin-test-api/pom.xml | 6 ++++++ .../src/license/THIRD-PARTY.properties | 16 +++------------- .../main/java/org/nuiton/plugin/MojoTestRule.java | 22 ++++++++++++++++++++++ .../main/java/org/nuiton/plugin/TestHelper.java | 22 ++++++++++++++++++++++ .../src/site/apt/index.apt | 21 +++++++++++++++++++++ .../src/site/apt/mojo-testFramework.apt | 21 +++++++++++++++++++++ helper-maven-plugin-test-api/src/site/site.xml | 22 ++++++++++++++++++++++ .../src/license/THIRD-PARTY.properties | 15 ++------------- .../plugin/CheckAutoContainerPluginTest.java | 22 ++++++++++++++++++++++ 10 files changed, 143 insertions(+), 39 deletions(-) diff --git a/helper-maven-plugin-api/src/license/THIRD-PARTY.properties b/helper-maven-plugin-api/src/license/THIRD-PARTY.properties index 2e0940b..846002c 100644 --- a/helper-maven-plugin-api/src/license/THIRD-PARTY.properties +++ b/helper-maven-plugin-api/src/license/THIRD-PARTY.properties @@ -1,10 +1,9 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 +# - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LPGL) @@ -13,20 +12,10 @@ # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 -# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Oct 26 13:40:44 CET 2014 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 +#Tue May 26 06:17:16 UTC 2015 commons-collections--commons-collections--3.1=The Apache Software License, Version 2.0 -nekohtml--xercesMinimal--1.9.6.2=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 -org.slf4j--jcl-over-slf4j--1.5.6=The Apache Software License, Version 2.0 -org.slf4j--slf4j-api--1.5.6=The Apache Software License, Version 2.0 -org.slf4j--slf4j-jdk14--1.5.6=The Apache Software License, Version 2.0 -org.slf4j--slf4j-nop--1.5.3=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 diff --git a/helper-maven-plugin-test-api/pom.xml b/helper-maven-plugin-test-api/pom.xml index 2112d71..65586ee 100644 --- a/helper-maven-plugin-test-api/pom.xml +++ b/helper-maven-plugin-test-api/pom.xml @@ -106,6 +106,12 @@ </dependency> <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> <scope>compile</scope> diff --git a/helper-maven-plugin-test-api/src/license/THIRD-PARTY.properties b/helper-maven-plugin-test-api/src/license/THIRD-PARTY.properties index 2e0940b..befb894 100644 --- a/helper-maven-plugin-test-api/src/license/THIRD-PARTY.properties +++ b/helper-maven-plugin-test-api/src/license/THIRD-PARTY.properties @@ -1,32 +1,22 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 +# - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 -# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Oct 26 13:40:44 CET 2014 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 +#Tue May 26 06:17:33 UTC 2015 commons-collections--commons-collections--3.1=The Apache Software License, Version 2.0 -nekohtml--xercesMinimal--1.9.6.2=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 -org.slf4j--jcl-over-slf4j--1.5.6=The Apache Software License, Version 2.0 -org.slf4j--slf4j-api--1.5.6=The Apache Software License, Version 2.0 -org.slf4j--slf4j-jdk14--1.5.6=The Apache Software License, Version 2.0 -org.slf4j--slf4j-nop--1.5.3=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 diff --git a/helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/MojoTestRule.java b/helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/MojoTestRule.java index f232039..fb6f53f 100644 --- a/helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/MojoTestRule.java +++ b/helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/MojoTestRule.java @@ -1,5 +1,27 @@ package org.nuiton.plugin; +/* + * #%L + * Helper Maven Plugin :: Test Api + * %% + * Copyright (C) 2009 - 2015 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.maven.plugin.testing.MojoRule; diff --git a/helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/TestHelper.java b/helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/TestHelper.java index 1f46b51..bbaf900 100644 --- a/helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/TestHelper.java +++ b/helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/TestHelper.java @@ -1,5 +1,27 @@ package org.nuiton.plugin; +/* + * #%L + * Helper Maven Plugin :: Test Api + * %% + * Copyright (C) 2009 - 2015 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.PlexusTestCase; diff --git a/helper-maven-plugin-test-api/src/site/apt/index.apt b/helper-maven-plugin-test-api/src/site/apt/index.apt index 8131a59..8fcb5d3 100644 --- a/helper-maven-plugin-test-api/src/site/apt/index.apt +++ b/helper-maven-plugin-test-api/src/site/apt/index.apt @@ -1,3 +1,24 @@ +~~~ +~~ #%L +~~ Helper Maven Plugin :: Test Api +~~ %% +~~ Copyright (C) 2009 - 2015 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 +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Lesser Public License for more details. +~~ +~~ You should have received a copy of the GNU General Lesser Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~ #L% +~~~ ---- Introduction diff --git a/helper-maven-plugin-test-api/src/site/apt/mojo-testFramework.apt b/helper-maven-plugin-test-api/src/site/apt/mojo-testFramework.apt index 0a36d83..8e0eb45 100644 --- a/helper-maven-plugin-test-api/src/site/apt/mojo-testFramework.apt +++ b/helper-maven-plugin-test-api/src/site/apt/mojo-testFramework.apt @@ -1,3 +1,24 @@ +~~~ +~~ #%L +~~ Helper Maven Plugin :: Test Api +~~ %% +~~ Copyright (C) 2009 - 2015 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 +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Lesser Public License for more details. +~~ +~~ You should have received a copy of the GNU General Lesser Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~ #L% +~~~ ---- Mojo Test framework diff --git a/helper-maven-plugin-test-api/src/site/site.xml b/helper-maven-plugin-test-api/src/site/site.xml index 8a24ae9..82a41e7 100644 --- a/helper-maven-plugin-test-api/src/site/site.xml +++ b/helper-maven-plugin-test-api/src/site/site.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Helper Maven Plugin :: Test Api + %% + Copyright (C) 2009 - 2015 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 + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + <project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/helper-maven-plugin/src/license/THIRD-PARTY.properties b/helper-maven-plugin/src/license/THIRD-PARTY.properties index fded311..9a31fab 100644 --- a/helper-maven-plugin/src/license/THIRD-PARTY.properties +++ b/helper-maven-plugin/src/license/THIRD-PARTY.properties @@ -1,12 +1,11 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License # - BSD License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License (CDDL) v1.0 -# - Common Public License Version 1.0 +# - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -17,21 +16,11 @@ # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 -# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Oct 26 13:41:53 CET 2014 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 +#Tue May 26 06:19:41 UTC 2015 commons-collections--commons-collections--3.1=The Apache Software License, Version 2.0 -nekohtml--xercesMinimal--1.9.6.2=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 -org.slf4j--jcl-over-slf4j--1.5.6=The Apache Software License, Version 2.0 -org.slf4j--slf4j-api--1.5.6=The Apache Software License, Version 2.0 -org.slf4j--slf4j-jdk14--1.5.6=The Apache Software License, Version 2.0 -org.slf4j--slf4j-nop--1.5.3=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 plexus--plexus-mail-sender-api--1.0-alpha-2=The Apache Software License, Version 2.0 diff --git a/helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/CheckAutoContainerPluginTest.java b/helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/CheckAutoContainerPluginTest.java index 977d15a..470f429 100644 --- a/helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/CheckAutoContainerPluginTest.java +++ b/helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/CheckAutoContainerPluginTest.java @@ -1,5 +1,27 @@ package org.nuiton.helper.plugin; +/* + * #%L + * Helper Maven Plugin :: Mojos + * %% + * Copyright (C) 2009 - 2015 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.junit.Assert; import org.junit.Assume; import org.junit.Ignore; -- 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 in repository maven-helper-plugin. See http://git.nuiton.org/maven-helper-plugin.git commit c1ce5aaad47a6cd23b69f4627d36be6baee00d9f Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:24:22 2015 +0000 tidy poms --- helper-maven-plugin-api/pom.xml | 5 +---- helper-maven-plugin-test-api/pom.xml | 3 +-- helper-maven-plugin/pom.xml | 7 ++----- pom.xml | 19 ++++++++----------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/helper-maven-plugin-api/pom.xml b/helper-maven-plugin-api/pom.xml index 2896558..3681c6b 100644 --- a/helper-maven-plugin-api/pom.xml +++ b/helper-maven-plugin-api/pom.xml @@ -21,7 +21,6 @@ #L% --> <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -31,6 +30,7 @@ </parent> <artifactId>helper-maven-plugin-api</artifactId> + <name>Helper Maven Plugin :: Api</name> <description>Simple maven mojo api for our projects</description> @@ -114,7 +114,6 @@ </dependencies> <build> - <testResources> <testResource> <directory>${project.basedir}/src/test/resources</directory> @@ -126,7 +125,6 @@ </excludes> </testResource> </testResources> - </build> <profiles> @@ -215,5 +213,4 @@ </profile> </profiles> - </project> diff --git a/helper-maven-plugin-test-api/pom.xml b/helper-maven-plugin-test-api/pom.xml index 65586ee..9b015ca 100644 --- a/helper-maven-plugin-test-api/pom.xml +++ b/helper-maven-plugin-test-api/pom.xml @@ -21,7 +21,6 @@ #L% --> <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -31,6 +30,7 @@ </parent> <artifactId>helper-maven-plugin-test-api</artifactId> + <name>Helper Maven Plugin :: Test Api</name> <description>Simple maven mojo test api for our projects</description> @@ -201,5 +201,4 @@ </profiles> - </project> diff --git a/helper-maven-plugin/pom.xml b/helper-maven-plugin/pom.xml index 3ac2710..15bcff4 100644 --- a/helper-maven-plugin/pom.xml +++ b/helper-maven-plugin/pom.xml @@ -21,7 +21,6 @@ #L% --> <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -31,9 +30,10 @@ </parent> <artifactId>helper-maven-plugin</artifactId> + <packaging>maven-plugin</packaging> + <name>Helper Maven Plugin :: Mojos</name> <description>maven mojos api for our project</description> - <packaging>maven-plugin</packaging> <properties> @@ -160,7 +160,6 @@ </dependencies> <build> - <plugins> <plugin> @@ -179,7 +178,6 @@ </plugin> </plugins> - </build> <profiles> @@ -279,5 +277,4 @@ </profile> </profiles> - </project> diff --git a/pom.xml b/pom.xml index 6664492..30075f4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,6 @@ #L% --> <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -32,18 +31,12 @@ <artifactId>helper-maven-plugin-parent</artifactId> <version>2.2-SNAPSHOT</version> + <packaging>pom</packaging> <name>Helper Maven Plugin</name> <description>Toolbox to help creating new maven plugins</description> - <packaging>pom</packaging> - <inceptionYear>2009</inceptionYear> <url>http://maven-helper-plugin.nuiton.org</url> - - <modules> - <module>helper-maven-plugin-api</module> - <module>helper-maven-plugin-test-api</module> - <module>helper-maven-plugin</module> - </modules> + <inceptionYear>2009</inceptionYear> <developers> <developer> @@ -71,12 +64,17 @@ </developer> </developers> + <modules> + <module>helper-maven-plugin-api</module> + <module>helper-maven-plugin-test-api</module> + <module>helper-maven-plugin</module> + </modules> + <scm> <connection>scm:git:http://git.nuiton.org/maven-helper-plugin.git</connection> <developerConnection>scm:git:https://git.nuiton.org/maven-helper-plugin.git</developerConnection> <url>https://gitweb.nuiton.org/maven-helper-plugin.git</url> </scm> - <distributionManagement> <site> <id>${site.server}</id> @@ -277,5 +275,4 @@ </dependencies> </dependencyManagement> - </project> -- 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 in repository maven-helper-plugin. See http://git.nuiton.org/maven-helper-plugin.git commit f17ee784dca895f4de5f07b0a9d4d9210265536f Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:24:38 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.2' with non-snapshot versions --- helper-maven-plugin-api/pom.xml | 2 +- helper-maven-plugin-test-api/pom.xml | 2 +- helper-maven-plugin/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helper-maven-plugin-api/pom.xml b/helper-maven-plugin-api/pom.xml index 3681c6b..ad917c4 100644 --- a/helper-maven-plugin-api/pom.xml +++ b/helper-maven-plugin-api/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <artifactId>helper-maven-plugin-api</artifactId> diff --git a/helper-maven-plugin-test-api/pom.xml b/helper-maven-plugin-test-api/pom.xml index 9b015ca..abf4ff6 100644 --- a/helper-maven-plugin-test-api/pom.xml +++ b/helper-maven-plugin-test-api/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <artifactId>helper-maven-plugin-test-api</artifactId> diff --git a/helper-maven-plugin/pom.xml b/helper-maven-plugin/pom.xml index 15bcff4..190d7a3 100644 --- a/helper-maven-plugin/pom.xml +++ b/helper-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <artifactId>helper-maven-plugin</artifactId> diff --git a/pom.xml b/pom.xml index 30075f4..3628a21 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <packaging>pom</packaging> <name>Helper Maven Plugin</name> -- 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 in repository maven-helper-plugin. See http://git.nuiton.org/maven-helper-plugin.git commit a5104f707bfabe82150cf1092cb4c360914da8b4 Merge: c6118e6 f17ee78 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:25:39 2015 +0000 [jgitflow-maven-plugin]merging 'release/2.2' into 'master' .gitignore | 12 + LICENSE.txt | 5 +- helper-maven-plugin-api/LICENSE.txt | 5 +- helper-maven-plugin-api/pom.xml | 149 +------- .../src/license/THIRD-PARTY.properties | 16 +- .../src/main/java/org/nuiton/io/FileUpdater.java | 8 +- .../main/java/org/nuiton/io/FileUpdaterHelper.java | 8 +- .../java/org/nuiton/io/MirroredFileUpdater.java | 6 +- .../io/PropertiesDateRemoveFilterStream.java | 5 +- .../main/java/org/nuiton/io/SortedProperties.java | 27 +- .../nuiton/plugin/AbstractAvailableDataMojo.java | 7 +- .../java/org/nuiton/plugin/AbstractPlugin.java | 185 ++++------ .../java/org/nuiton/plugin/DependencyUtil.java | 35 +- .../src/main/java/org/nuiton/plugin/Plugin.java | 6 +- .../main/java/org/nuiton/plugin/PluginHelper.java | 42 +-- .../java/org/nuiton/plugin/PluginIOContext.java | 8 +- .../java/org/nuiton/plugin/PluginWithEncoding.java | 9 +- .../nuiton/plugin/VelocityTemplateGenerator.java | 25 +- .../src/main/resources/assemblies/deps.xml | 4 +- .../src/main/resources/assemblies/full.xml | 4 +- helper-maven-plugin-api/src/site/apt/index.apt | 22 +- .../src/site/apt/mojo-framework.apt | 2 - .../src/site/{site_en.xml => site.xml} | 27 +- .../java/org/nuiton/plugin/AbstractMojoTest.java | 389 --------------------- .../java/org/nuiton/plugin/PluginHelperTest.java | 6 +- .../test/java/org/nuiton/plugin/TestHelper.java | 123 ------- .../src/test/resources/log4j.properties | 2 - .../test/resources/org/nuiton/io/JaxxDummy.java | 4 +- .../test/resources/org/nuiton/io/JaxxDummy.jaxx | 4 +- .../LICENSE.txt | 5 +- helper-maven-plugin-test-api/README.txt | 0 helper-maven-plugin-test-api/changelog.txt | 0 helper-maven-plugin-test-api/pom.xml | 204 +++++++++++ .../src/license/THIRD-PARTY.properties | 22 ++ .../main/java/org/nuiton/plugin/MojoTestRule.java | 265 ++++++++++++++ .../main/java/org/nuiton/plugin/TestHelper.java | 139 ++++++++ .../src/site/apt/index.apt | 27 +- .../src/site/apt/mojo-testFramework.apt | 56 ++- .../src/site/site.xml | 39 +-- helper-maven-plugin/LICENSE.txt | 5 +- helper-maven-plugin/pom.xml | 74 ++-- .../central/invoker.properties | 2 - .../src/it/check-auto-container/central/pom.xml | 2 - .../it/check-auto-container/central/verify.groovy | 2 - .../nuiton-other-releases/invoker.properties | 2 - .../nuiton-other-releases/pom.xml | 2 - .../nuiton-other-releases/verify.groovy | 2 - .../unsafe-central/invoker.properties | 2 - .../it/check-auto-container/unsafe-central/pom.xml | 2 - .../unsafe-central/verify.groovy | 2 - .../src/it/collect-files/multi/invoker.properties | 2 - .../src/it/collect-files/multi/module1/pom.xml | 5 +- .../src/it/collect-files/multi/module2/pom.xml | 5 +- .../src/it/collect-files/multi/pom.xml | 2 - .../src/it/collect-files/multi/verify.groovy | 2 - .../src/it/collect-files/single/invoker.properties | 2 - .../src/it/collect-files/single/pom.xml | 2 - .../src/it/collect-files/single/verify.groovy | 2 - .../src/it/send-email/single/invoker.properties | 2 - .../src/it/send-email/single/pom.xml | 2 - .../src/it/send-email/single/verify.groovy | 2 - helper-maven-plugin/src/it/settings.xml | 2 - .../share-server-secret/single/invoker.properties | 2 - .../src/it/share-server-secret/single/pom.xml | 2 - .../it/share-server-secret/single/verify.groovy | 2 - .../src/license/THIRD-PARTY.properties | 17 +- .../java/org/nuiton/helper/io/mail/MailSender.java | 7 +- .../helper/io/mail/ProjectJavamailMailSender.java | 9 +- .../helper/plugin/CheckAutoContainerPlugin.java | 253 +++++++------- .../org/nuiton/helper/plugin/CollectFilesMojo.java | 100 ++---- .../helper/plugin/ExecuteRemoteCommandMojo.java | 47 +-- .../org/nuiton/helper/plugin/SendEmailMojo.java | 32 +- .../helper/plugin/ShareServerSecretPlugin.java | 59 ++-- .../helper/plugin/TransformProjectVersionMojo.java | 40 +-- .../main/resources/META-INF/plexus/components.xml | 4 +- helper-maven-plugin/src/site/apt/index.apt | 2 - helper-maven-plugin/src/site/apt/mojo-examples.apt | 2 - helper-maven-plugin/src/site/apt/mojo-usages.apt | 2 - .../src/site/{site_en.xml => site.xml} | 28 +- .../plugin/CheckAutoContainerPluginTest.java | 64 ++++ .../nuiton/helper/plugin/SendEmailMojoTest.java | 78 +++-- .../plugin/TransformProjectVersionMojoTest.java | 64 ++-- .../src/test/resources/log4j.properties | 2 - .../checkAutoContainerPluginTest/central.xml} | 36 +- .../helper/plugin/sendEmailMojoTest/sendEmail.xml | 4 +- .../plugin/sendEmailMojoTest/skipSendEmail.xml | 4 +- .../badVersionPattern1.xml | 4 +- .../badVersionPattern2.xml | 4 +- .../badVersionPattern3.xml | 4 +- .../keepSnapshot.xml | 4 +- .../removeSnapshot.xml | 4 +- .../transformProjectVersionMojoTest/simple.xml | 4 +- pom.xml | 163 ++++----- src/site/apt/Todo.apt | 5 +- src/site/apt/index.apt | 23 +- src/site/site.xml | 60 ++++ src/site/site_en.xml | 105 ------ src/test/java/org/nuiton/io/JavaDummy.java | 5 +- .../java/org/nuiton/io/JavaFileUpdaterTest.java | 5 +- .../java/org/nuiton/io/JaxxFileUpdaterTest.java | 5 +- .../java/org/nuiton/io/SortedPropertiesTest.java | 5 +- src/test/java/org/nuiton/io/xpp3/CountryRef.java | 5 +- .../org/nuiton/io/xpp3/CountryRefXpp3Reader.java | 7 +- src/test/java/org/nuiton/io/xpp3/Identity.java | 5 +- .../org/nuiton/io/xpp3/IdentityXpp3Reader.java | 5 +- .../java/org/nuiton/io/xpp3/Xpp3HelperTest.java | 5 +- .../java/org/nuiton/io/xpp3/Xpp3ReaderTest.java | 5 +- 107 files changed, 1448 insertions(+), 1873 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 in repository maven-helper-plugin. See http://git.nuiton.org/maven-helper-plugin.git commit b581f0e7cf727acf609a8a4ce9d1f8d0c3302cb1 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:25:40 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- helper-maven-plugin-api/pom.xml | 2 +- helper-maven-plugin-test-api/pom.xml | 2 +- helper-maven-plugin/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helper-maven-plugin-api/pom.xml b/helper-maven-plugin-api/pom.xml index 4ddf3dd..2cd5bf3 100644 --- a/helper-maven-plugin-api/pom.xml +++ b/helper-maven-plugin-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> </parent> <artifactId>helper-maven-plugin-api</artifactId> diff --git a/helper-maven-plugin-test-api/pom.xml b/helper-maven-plugin-test-api/pom.xml index a2803a9..8531552 100644 --- a/helper-maven-plugin-test-api/pom.xml +++ b/helper-maven-plugin-test-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> </parent> <artifactId>helper-maven-plugin-test-api</artifactId> diff --git a/helper-maven-plugin/pom.xml b/helper-maven-plugin/pom.xml index da64f2e..284660c 100644 --- a/helper-maven-plugin/pom.xml +++ b/helper-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> </parent> <artifactId>helper-maven-plugin</artifactId> diff --git a/pom.xml b/pom.xml index 21f537f..d52e8d5 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> <name>Helper Maven Plugin</name> <description>Toolbox to help creating new maven plugins</description> -- 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 in repository maven-helper-plugin. See http://git.nuiton.org/maven-helper-plugin.git commit d2dbb98fc9da63d77abc7037c4fedbf4b1ded6e0 Merge: b581f0e a5104f7 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:29:08 2015 +0000 Merge branch 'master' into develop Conflicts: helper-maven-plugin/pom.xml pom.xml helper-maven-plugin-api/pom.xml | 5 +---- .../src/license/THIRD-PARTY.properties | 15 ++------------- helper-maven-plugin-test-api/pom.xml | 9 +++++++-- .../src/license/THIRD-PARTY.properties | 16 +++------------- .../main/java/org/nuiton/plugin/MojoTestRule.java | 22 ++++++++++++++++++++++ .../main/java/org/nuiton/plugin/TestHelper.java | 22 ++++++++++++++++++++++ .../src/site/apt/index.apt | 21 +++++++++++++++++++++ .../src/site/apt/mojo-testFramework.apt | 21 +++++++++++++++++++++ helper-maven-plugin-test-api/src/site/site.xml | 22 ++++++++++++++++++++++ helper-maven-plugin/pom.xml | 7 ++----- .../src/license/THIRD-PARTY.properties | 15 ++------------- .../plugin/CheckAutoContainerPluginTest.java | 22 ++++++++++++++++++++++ pom.xml | 19 ++++++++----------- 13 files changed, 155 insertions(+), 61 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm