branch develop updated (64dc29e -> ec3081a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jredmine. See http://git.nuiton.org/jredmine.git from 64dc29e [jgitflow-maven-plugin]updating poms for 2.0-SNAPSHOT development new 19a9b10 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2ba3bf4 [maven-release-plugin] copy for tag jredmine-1.8.2 adds 256bf3e [jgitflow-maven-plugin]updating poms for branch '1.9' with snapshot versions new 1424897 prepare release 1.9 new ed37967 [jgitflow-maven-plugin]updating poms for branch'release/1.9' with non-snapshot versions new 62dc0a7 Merge branch 'release/1.9' new b776266 Merge branch 'master' into develop new ec3081a [jgitflow-maven-plugin]Updating develop poms back to pre merge state 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 ec3081a00d2df3cc7d1573ea4fb807b1adf52f0c Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:04:16 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b7762667bbab041d33e9b0f68dae464b57a2bbee Merge: 19a9b10 62dc0a7 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:04:15 2015 +0000 Merge branch 'master' into develop commit 19a9b1068c62e53240c57845d68adfa08d4c92c1 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:04:15 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 62dc0a75537a008f9c7da116747dc8827836fedb Merge: 2ba3bf4 ed37967 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:04:13 2015 +0000 Merge branch 'release/1.9' commit ed37967f1e7a7f4a6099f21bde991ce542354884 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:02:26 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.9' with non-snapshot versions commit 14248972e6f0492302df40579f825722ac4e71fb Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:02:05 2015 +0000 prepare release 1.9 Summary of changes: jredmine-client/src/license/THIRD-PARTY.properties | 19 +++++++++++++++++++ .../src/main/assembly/dist/log4j.properties | 21 +++++++++++++++++++++ jredmine-client/src/main/assembly/tool.xml | 21 +++++++++++++++++++++ .../jredmine/tool/FetchProjectsVersionsTool.java | 22 ++++++++++++++++++++++ .../nuiton/jredmine/tool/JRedmineToolAction.java | 22 ++++++++++++++++++++++ .../jredmine/tool/JRedmineToolCommandLine.java | 22 ++++++++++++++++++++++ jredmine-maven-plugin/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 3 ++- pom.xml | 7 +++++++ 9 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 jredmine-client/src/license/THIRD-PARTY.properties -- 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 jredmine. See http://git.nuiton.org/jredmine.git commit 14248972e6f0492302df40579f825722ac4e71fb Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:02:05 2015 +0000 prepare release 1.9 --- jredmine-client/src/license/THIRD-PARTY.properties | 19 +++++++++++++++++++ .../src/main/assembly/dist/log4j.properties | 21 +++++++++++++++++++++ jredmine-client/src/main/assembly/tool.xml | 21 +++++++++++++++++++++ .../jredmine/tool/FetchProjectsVersionsTool.java | 22 ++++++++++++++++++++++ .../nuiton/jredmine/tool/JRedmineToolAction.java | 22 ++++++++++++++++++++++ .../jredmine/tool/JRedmineToolCommandLine.java | 22 ++++++++++++++++++++++ jredmine-maven-plugin/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 3 ++- pom.xml | 7 +++++++ 9 files changed, 141 insertions(+), 1 deletion(-) diff --git a/jredmine-client/src/license/THIRD-PARTY.properties b/jredmine-client/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..b8413fb --- /dev/null +++ b/jredmine-client/src/license/THIRD-PARTY.properties @@ -0,0 +1,19 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common 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 +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Mar 04 11:54:22 UTC 2015 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 diff --git a/jredmine-client/src/main/assembly/dist/log4j.properties b/jredmine-client/src/main/assembly/dist/log4j.properties index f3b43f3..2be1fb6 100644 --- a/jredmine-client/src/main/assembly/dist/log4j.properties +++ b/jredmine-client/src/main/assembly/dist/log4j.properties @@ -1,3 +1,24 @@ +### +# #%L +# JRedmine :: Client +# %% +# 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% +### log4j.rootCategory=WARN, stdout diff --git a/jredmine-client/src/main/assembly/tool.xml b/jredmine-client/src/main/assembly/tool.xml index df4ad0e..2f5d5d2 100644 --- a/jredmine-client/src/main/assembly/tool.xml +++ b/jredmine-client/src/main/assembly/tool.xml @@ -1,3 +1,24 @@ +<!-- + #%L + JRedmine :: Client + %% + 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% + --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> <id>tool</id> diff --git a/jredmine-client/src/main/java/org/nuiton/jredmine/tool/FetchProjectsVersionsTool.java b/jredmine-client/src/main/java/org/nuiton/jredmine/tool/FetchProjectsVersionsTool.java index 03cdc1a..326346a 100644 --- a/jredmine-client/src/main/java/org/nuiton/jredmine/tool/FetchProjectsVersionsTool.java +++ b/jredmine-client/src/main/java/org/nuiton/jredmine/tool/FetchProjectsVersionsTool.java @@ -1,5 +1,27 @@ package org.nuiton.jredmine.tool; +/* + * #%L + * JRedmine :: Client + * %% + * 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.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jredmine-client/src/main/java/org/nuiton/jredmine/tool/JRedmineToolAction.java b/jredmine-client/src/main/java/org/nuiton/jredmine/tool/JRedmineToolAction.java index e8e6d3f..5b3e668 100644 --- a/jredmine-client/src/main/java/org/nuiton/jredmine/tool/JRedmineToolAction.java +++ b/jredmine-client/src/main/java/org/nuiton/jredmine/tool/JRedmineToolAction.java @@ -1,5 +1,27 @@ package org.nuiton.jredmine.tool; +/* + * #%L + * JRedmine :: Client + * %% + * 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.nuiton.config.ConfigActionDef; /** diff --git a/jredmine-client/src/main/java/org/nuiton/jredmine/tool/JRedmineToolCommandLine.java b/jredmine-client/src/main/java/org/nuiton/jredmine/tool/JRedmineToolCommandLine.java index ce50748..fe8acb2 100644 --- a/jredmine-client/src/main/java/org/nuiton/jredmine/tool/JRedmineToolCommandLine.java +++ b/jredmine-client/src/main/java/org/nuiton/jredmine/tool/JRedmineToolCommandLine.java @@ -1,5 +1,27 @@ package org.nuiton.jredmine.tool; +/* + * #%L + * JRedmine :: Client + * %% + * 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.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; diff --git a/jredmine-maven-plugin/pom.xml b/jredmine-maven-plugin/pom.xml index 9132caa..278a55f 100644 --- a/jredmine-maven-plugin/pom.xml +++ b/jredmine-maven-plugin/pom.xml @@ -62,6 +62,11 @@ <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin</artifactId> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> <dependency> <groupId>commons-logging</groupId> diff --git a/jredmine-maven-plugin/src/license/THIRD-PARTY.properties b/jredmine-maven-plugin/src/license/THIRD-PARTY.properties index 54f16d7..d6ec354 100644 --- a/jredmine-maven-plugin/src/license/THIRD-PARTY.properties +++ b/jredmine-maven-plugin/src/license/THIRD-PARTY.properties @@ -19,9 +19,10 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 08 12:32:47 CEST 2013 +#Wed Mar 04 11:54:57 UTC 2015 antlr--antlr--2.7.2=BSD License classworlds--classworlds--1.1=http\://classworlds.codehaus.org/license.html +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.1=BSD License org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-i18n--1.0-beta-10=The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 64db0fe..1dc2e25 100644 --- a/pom.xml +++ b/pom.xml @@ -173,6 +173,13 @@ <version>17.0</version> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>3.0-rc-8</version> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-api</artifactId> -- 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 jredmine. See http://git.nuiton.org/jredmine.git commit ed37967f1e7a7f4a6099f21bde991ce542354884 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:02:26 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.9' with non-snapshot versions --- jredmine-client/pom.xml | 2 +- jredmine-maven-plugin/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jredmine-client/pom.xml b/jredmine-client/pom.xml index f3910f8..432e6c2 100644 --- a/jredmine-client/pom.xml +++ b/jredmine-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.9-SNAPSHOT</version> + <version>1.9</version> </parent> <groupId>org.nuiton.jredmine</groupId> diff --git a/jredmine-maven-plugin/pom.xml b/jredmine-maven-plugin/pom.xml index 278a55f..476cffc 100644 --- a/jredmine-maven-plugin/pom.xml +++ b/jredmine-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.9-SNAPSHOT</version> + <version>1.9</version> </parent> <groupId>org.nuiton.jredmine</groupId> diff --git a/pom.xml b/pom.xml index 1dc2e25..c7a8af5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.9-SNAPSHOT</version> + <version>1.9</version> <modules> <module>jredmine-client</module> -- 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 jredmine. See http://git.nuiton.org/jredmine.git commit 62dc0a75537a008f9c7da116747dc8827836fedb Merge: 2ba3bf4 ed37967 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:04:13 2015 +0000 Merge branch 'release/1.9' .gitignore | 13 ++ jredmine-client/pom.xml | 59 ++++++- jredmine-client/src/license/THIRD-PARTY.properties | 19 +++ .../src/main/assembly/dist/config/chorem.config | 3 + .../src/main/assembly/dist/config/codelutin.config | 3 + .../src/main/assembly/dist/config/nuiton.config | 3 + .../main/assembly/dist/fetch-projects-versions.bat | 1 + .../main/assembly/dist/fetch-projects-versions.sh | 3 + .../src/main/assembly/dist/log4j.properties | 31 ++++ jredmine-client/src/main/assembly/tool.xml | 78 +++++++++ .../java/org/nuiton/jredmine/model/Project.java | 4 + .../java/org/nuiton/jredmine/model/Version.java | 8 + .../jredmine/service/DefaultRedmineService.java | 3 +- .../jredmine/service/RedmineConfigurationUtil.java | 38 +++++ .../jredmine/tool/FetchProjectsVersionsTool.java | 108 +++++++++++++ .../nuiton/jredmine/tool/JRedmineToolAction.java | 65 ++++++++ .../jredmine/tool/JRedmineToolCommandLine.java | 48 ++++++ .../app/controllers/jredmine_controller.rb | 42 ++--- jredmine-client/src/site/apt/index.apt | 4 + jredmine-client/src/site/apt/rails_api.apt | 13 ++ jredmine-client/src/site/{site_fr.xml => site.xml} | 34 +--- jredmine-maven-plugin/pom.xml | 7 +- .../src/license/THIRD-PARTY.properties | 3 +- .../jredmine/plugin/AbstractRedmineMojo.java | 12 +- .../jredmine/plugin/PublishAttachmentsMojo.java | 21 ++- .../plugin/report/AbstractRedmineReport.java | 2 +- .../src/site/{site_fr.xml => site.xml} | 39 +---- pom.xml | 175 ++++++++++++++------- src/site/apt/index.apt | 6 + src/site/site.xml | 69 ++++++++ src/site/site_fr.xml | 112 ------------- 31 files changed, 757 insertions(+), 269 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 jredmine. See http://git.nuiton.org/jredmine.git commit 19a9b1068c62e53240c57845d68adfa08d4c92c1 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:04:15 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- jredmine-client/pom.xml | 2 +- jredmine-maven-plugin/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jredmine-client/pom.xml b/jredmine-client/pom.xml index 60c9db5..432e6c2 100644 --- a/jredmine-client/pom.xml +++ b/jredmine-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.9</version> </parent> <groupId>org.nuiton.jredmine</groupId> diff --git a/jredmine-maven-plugin/pom.xml b/jredmine-maven-plugin/pom.xml index 64a2279..32ab104 100644 --- a/jredmine-maven-plugin/pom.xml +++ b/jredmine-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.9</version> </parent> <groupId>org.nuiton.jredmine</groupId> diff --git a/pom.xml b/pom.xml index 7459afe..08714bd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.9</version> <modules> <module>jredmine-client</module> -- 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 jredmine. See http://git.nuiton.org/jredmine.git commit b7762667bbab041d33e9b0f68dae464b57a2bbee Merge: 19a9b10 62dc0a7 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:04:15 2015 +0000 Merge branch 'master' into develop jredmine-client/src/license/THIRD-PARTY.properties | 19 +++++++++++++++++++ .../src/main/assembly/dist/log4j.properties | 21 +++++++++++++++++++++ jredmine-client/src/main/assembly/tool.xml | 21 +++++++++++++++++++++ .../jredmine/tool/FetchProjectsVersionsTool.java | 22 ++++++++++++++++++++++ .../nuiton/jredmine/tool/JRedmineToolAction.java | 22 ++++++++++++++++++++++ .../jredmine/tool/JRedmineToolCommandLine.java | 22 ++++++++++++++++++++++ jredmine-maven-plugin/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 3 ++- pom.xml | 7 +++++++ 9 files changed, 141 insertions(+), 1 deletion(-) -- 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 jredmine. See http://git.nuiton.org/jredmine.git commit ec3081a00d2df3cc7d1573ea4fb807b1adf52f0c Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 4 12:04:16 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- jredmine-client/pom.xml | 2 +- jredmine-maven-plugin/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jredmine-client/pom.xml b/jredmine-client/pom.xml index 432e6c2..60c9db5 100644 --- a/jredmine-client/pom.xml +++ b/jredmine-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.9</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> diff --git a/jredmine-maven-plugin/pom.xml b/jredmine-maven-plugin/pom.xml index 476cffc..d2b5e93 100644 --- a/jredmine-maven-plugin/pom.xml +++ b/jredmine-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.9</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> diff --git a/pom.xml b/pom.xml index c7a8af5..a12c427 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.9</version> + <version>2.0-SNAPSHOT</version> <modules> <module>jredmine-client</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm