Author: tchemit Date: 2012-10-04 13:57:42 +0200 (Thu, 04 Oct 2012) New Revision: 344 Url: http://nuiton.org/repositories/revision/jredmine/344 Log: fix doc + improve it config Added: branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt Removed: branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt Modified: branches/jredmine-1.x/jredmine-client/src/it/redmine-1.4.x/pom.xml branches/jredmine-1.x/jredmine-client/src/it/redmine-2.0.x/pom.xml branches/jredmine-1.x/jredmine-client/src/it/redmine-2.1.x/pom.xml branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java branches/jredmine-1.x/jredmine-maven-plugin/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/module1/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/module2/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/it/report/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/it/settings.xml branches/jredmine-1.x/jredmine-maven-plugin/src/it/single/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/it/single_failed/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/it/skip-report/pom.xml Modified: branches/jredmine-1.x/jredmine-client/src/it/redmine-1.4.x/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/it/redmine-1.4.x/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-client/src/it/redmine-1.4.x/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.4-SNAPSHOT</version> + <version>@pom.version@</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: branches/jredmine-1.x/jredmine-client/src/it/redmine-2.0.x/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/it/redmine-2.0.x/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-client/src/it/redmine-2.0.x/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.4-SNAPSHOT</version> + <version>@pom.version@</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: branches/jredmine-1.x/jredmine-client/src/it/redmine-2.1.x/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/it/redmine-2.1.x/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-client/src/it/redmine-2.1.x/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.4-SNAPSHOT</version> + <version>@pom.version@</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java 2012-10-04 11:57:42 UTC (rev 344) @@ -96,7 +96,11 @@ if (log.isDebugEnabled()) { log.debug("init service with configuration: " + configuration); } - delegateImplementor.init(configuration); + if (!delegateImplementor.isInit()) { + + // only init once + delegateImplementor.init(configuration); + } } @Override Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2012-10-04 11:57:42 UTC (rev 344) @@ -98,7 +98,11 @@ if (log.isDebugEnabled()) { log.debug("init service with configuration: " + configuration); } - delegateImplementor.init(configuration); + if (!delegateImplementor.isInit()) { + + // only init once + delegateImplementor.init(configuration); + } } @Override Deleted: branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt =================================================================== --- branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt 2012-10-04 11:57:42 UTC (rev 344) @@ -1,147 +0,0 @@ -~~~ -~~ #%L -~~ JRedmine :: Client -~~ -~~ $Id$ -~~ $HeadURL$ -~~ %% -~~ Copyright (C) 2009 - 2012 Tony Chemit, 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% -~~~ ----- -JRedmine-client ----- ----- -2009-09-15 ----- - - Ce module contient un plugin <rails> qui permet d'ouvrir l'api de redmine au - protocole <REST>, ainsi q'un client <Java> pour interroger les services <REST>. - -Plugin <rails> JRedmine - - Le but de ce plugin est de pouvoir accéder aux données d'un serveur Redmine en - utilisant le protocole <REST>, mais aussi d'effectuer des tâches de - maintenance sur le serveur. - - La page {{{./rails_api.html}API}} détaille l'ensemble des services disponibles - depuis le serveur Redmine. - - Le plugin existe en deux versions (la version 2.0 de redmine utilisant Rails 3 qui rend incompatible la gestion des routes {{{http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3}pour plus de détails}}.) - -* Source du plugin - - Les sources du plugin <rails> sont sont dans le répertoire - <<src/main/redmine/jredmine-xxx>>. - --------------------------------------------------------------------------------- - -src/main/redmine/ -`-- jredmine-1.x - |-- README.rdoc - |-- app - | |-- controllers - | | `-- jredmine_controller.rb - | |-- helpers - | |-- models - | `-- views - |-- assets - | |-- images - | |-- javascripts - | `-- stylesheets - |-- config - | `-- routes.rb - |-- db - | `-- migrate - |-- init.rb - |-- lang - | `-- en.yml - |-- lib - | `-- tasks - `-- test - `-- functional -`-- jredmine-2.x - |-- README.rdoc - |-- app - | |-- controllers - | | `-- jredmine_controller.rb - | |-- helpers - | |-- models - | `-- views - |-- assets - | |-- images - | |-- javascripts - | `-- stylesheets - |-- config - | `-- routes.rb - |-- db - | `-- migrate - |-- init.rb - |-- lang - | `-- en.yml - |-- lib - | `-- tasks - `-- test - `-- functional --------------------------------------------------------------------------------- - -* Récupération d'une version packagée - - Il est possible de récupérer une version zippée du plugin (voir la section des - téléchargements). - -* Installation du plugin sur le serveur Redmine - - * récupération du zip du plugin - - * dézippage dans le répertoire vendor/plugins (ou plugins pour redmine 2.0) - - * relancer votre instance de redmine (ou apache). - -* Configuration des permissions du plugin dans le serveur Redmine - - Le plugin est activable par projet et par rôle. - - Pour rendre accessible le plugin pour un projet donné, il faut donc ajouter - le module JRedmine sur le projet dans l'onglet de configuration des modules - du projet. - - Pour rendre accessible le plugin pour un rôle, il faut lui ajouter la - permission <<allow_jredmine>> dans la page des permissions du rôle. - -* Tester le plugin - - Une fois la configuration des permissions réalisées, vous pouvez tester le - plugin dans un navigateur web. - - Pour cela, loggez-vous en web sur redmine, puis lancer (dans un autre onglet) - l'url suivante : (remplacer <XX> par le chemin d'accès à votre redmine - et <YY> par le nom d'un de vos projet). - --------------------------------------------------------------------------------- -http://XX/jredmine/get_project/YY --------------------------------------------------------------------------------- - - Vous devez obtenir en retour la description xml du projet demandé. - -Client java - - Le client java qui interroge le plugin rails se base sur l'api du plugin rails - et transforme les données retournées en xml en objets java. - - La {{{./redmine_service.html}page suivante}} détaille les services disponibles - en java. Added: branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt =================================================================== --- branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt (rev 0) +++ branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt 2012-10-04 11:57:42 UTC (rev 344) @@ -0,0 +1,178 @@ +~~~ +~~ #%L +~~ JRedmine :: Client +~~ +~~ $Id$ +~~ $HeadURL: http://svn.nuiton.org/svn/jredmine/branches/jredmine-1.x/jredmine-client/src... $ +~~ %% +~~ Copyright (C) 2009 - 2012 Tony Chemit, 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% +~~~ +---- +JRedmine-client +---- +---- +2009-09-15 +---- + + Ce module contient un plugin <rails> qui permet d'ouvrir l'api de redmine au + protocole <REST>, ainsi q'un client <Java> pour interroger les services <REST>. + +Plugin <rails> JRedmine + + Le but de ce plugin est de pouvoir accéder aux données d'un serveur Redmine en + utilisant le protocole <REST>, mais aussi d'effectuer des tâches de + maintenance sur le serveur. + + La page {{{./rails_api.html}API}} détaille l'ensemble des services disponibles + depuis le serveur Redmine. + + Le plugin existe en deux versions (la version 2.0 de redmine utilisant Rails 3 qui rend incompatible la gestion des routes {{{http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3}pour plus de détails}}.) + +* Compatibilité + + Le tableau récapitule les versions du plugin <jredmine> à utiliser selon la + version de <redmine>. + +*----------------------------------------*---------------------------------*---------------------------------+ +| <redmin version> | <jredmine-1.x> | <jredmine-2.x> | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-0.6.x>> (?) | ? | No | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-0.7.x>> (?) | ? | No | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-0.8.x>> (?) | ? | No | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-0.9.x>> (?) | ? | No | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-1.0.x>> (?) | ? | No | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-1.1.x>> (?) | ? | No | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-1.2.x>> (?) | ? | No | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-1.3.x>> (1.3.2.stable.9246) | Yes | No | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-1.4.x>> (1.4.4.stable.10023) | Yes | Yes | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-2.0.x>> (2.0.4.stable.10545) | No | Yes | +*----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-2.1.x>> (2.1.2.stable.10557) | No | Yes | +*----------------------------------------*---------------------------------*---------------------------------+ + +* Source du plugin + + Les sources du plugin <rails> sont sont dans le répertoire + <<src/main/redmine/jredmine-xxx>>. + +-------------------------------------------------------------------------------- + +src/main/redmine/ +`-- jredmine-1.x + |-- README.rdoc + |-- app + | |-- controllers + | | `-- jredmine_controller.rb + | |-- helpers + | |-- models + | `-- views + |-- assets + | |-- images + | |-- javascripts + | `-- stylesheets + |-- config + | `-- routes.rb + |-- db + | `-- migrate + |-- init.rb + |-- lang + | `-- en.yml + |-- lib + | `-- tasks + `-- test + `-- functional +`-- jredmine-2.x + |-- README.rdoc + |-- app + | |-- controllers + | | `-- jredmine_controller.rb + | |-- helpers + | |-- models + | `-- views + |-- assets + | |-- images + | |-- javascripts + | `-- stylesheets + |-- config + | `-- routes.rb + |-- db + | `-- migrate + |-- init.rb + |-- lang + | `-- en.yml + |-- lib + | `-- tasks + `-- test + `-- functional +-------------------------------------------------------------------------------- + +* Récupération d'une version packagée + + Il est possible de récupérer une version zippée du plugin (voir la section des + téléchargements). + +* Installation du plugin sur le serveur Redmine + + * récupération du zip du plugin + + * dézippage dans le répertoire vendor/plugins (ou plugins pour redmine 2.0) + + * relancer votre instance de redmine (ou apache). + +* Configuration des permissions du plugin dans le serveur Redmine + + Le plugin est activable par projet et par rôle. + + Pour rendre accessible le plugin pour un projet donné, il faut donc ajouter + le module JRedmine sur le projet dans l'onglet de configuration des modules + du projet. + + Pour rendre accessible le plugin pour un rôle, il faut lui ajouter la + permission <<allow_jredmine>> dans la page des permissions du rôle. + +* Tester le plugin + + Une fois la configuration des permissions réalisées, vous pouvez tester le + plugin dans un navigateur web. + + Pour cela, loggez-vous en web sur redmine, puis lancer (dans un autre onglet) + l'url suivante : (remplacer <XX> par le chemin d'accès à votre redmine + et <YY> par le nom d'un de vos projet). + +-------------------------------------------------------------------------------- +http://XX/jredmine/get_project/YY +-------------------------------------------------------------------------------- + + Vous devez obtenir en retour la description xml du projet demandé. + +Client java + + Le client java qui interroge le plugin rails se base sur l'api du plugin rails + et transforme les données retournées en xml en objets java. + + La {{{./redmine_service.html}page suivante}} détaille les services disponibles + en java. Property changes on: branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-maven-plugin/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -264,6 +264,8 @@ </property> </activation--> <build> + + <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> <artifactId>maven-invoker-plugin</artifactId> @@ -276,10 +278,12 @@ <pomInclude>report/pom.xml</pomInclude> </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${basedir}/target/local-repo + <localRepositoryPath> + ${basedir}/target/local-repo </localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <mergeUserSettings>true</mergeUserSettings> </configuration> <executions> <execution> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/module1/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/module1/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/module1/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -23,46 +23,26 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #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> + <groupId>org.nuiton.jredmine.test.multi</groupId> + <artifactId>pom</artifactId> + <version>0</version> + </parent> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at + <artifactId>module1</artifactId> - http://www.apache.org/licenses/LICENSE-2.0 + <name>JRedmine multi module1</name> - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> + <packaging>pom</packaging> -<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> - <groupId>org.nuiton.jredmine.test.multi</groupId> - <artifactId>pom</artifactId> - <version>0</version> - </parent> - - <artifactId>module1</artifactId> - - <name>JRedmine multi module1</name> + <properties> - <packaging>pom</packaging> - - <properties> + <releaseFiles>${basedir}/src/module1.txt</releaseFiles> - <releaseFiles>${basedir}/src/module1.txt</releaseFiles> + </properties> - </properties> - </project> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/module2/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/module2/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/module2/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -24,45 +24,26 @@ #L% --> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at +<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> + <groupId>org.nuiton.jredmine.test.multi</groupId> + <artifactId>pom</artifactId> + <version>0</version> + </parent> - http://www.apache.org/licenses/LICENSE-2.0 + <artifactId>module2</artifactId> - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> + <name>JRedmine multi module2</name> -<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> - <groupId>org.nuiton.jredmine.test.multi</groupId> - <artifactId>pom</artifactId> - <version>0</version> - </parent> - - <artifactId>module2</artifactId> - - <name>JRedmine multi module2</name> + <packaging>jar</packaging> - <packaging>jar</packaging> - - <properties> + <properties> - <releaseFiles>${basedir}/src/module2.txt</releaseFiles> + <releaseFiles>${basedir}/src/module2.txt</releaseFiles> - </properties> + </properties> </project> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/it/multi/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -25,164 +25,166 @@ --> <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"> + 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> - <groupId>org.nuiton.jredmine.test.multi</groupId> - <artifactId>pom</artifactId> - <version>0</version> + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.jredmine.test.multi</groupId> + <artifactId>pom</artifactId> + <version>0</version> - <modules> - <module>module1</module> - <module>module2</module> - </modules> + <modules> + <module>module1</module> + <module>module2</module> + </modules> - <name>JRedmine multi pom</name> - <description>Test JRedmine plugin for a multi module.</description> + <name>JRedmine multi pom</name> + <description>Test JRedmine plugin for a multi module.</description> - <packaging>pom</packaging> + <packaging>pom</packaging> - <url>http://www.foo.com</url> + <url>http://www.foo.com</url> - <issueManagement> - <system>redmine</system> - <url>http://www.mynuiton.org/projects/one/issues</url> - </issueManagement> + <issueManagement> + <system>redmine</system> + <url>http://nuiton.org/projects/jredmine/issues</url> + </issueManagement> - <properties> + <!--Distribution--> + <distributionManagement> + <repository> + <id>myServer</id> + <url>file:///tmp/jredmine-repository</url> + </repository> + <snapshotRepository> + <id>myServer</id> + <url>file:///tmp/jredmine-repository</url> + </snapshotRepository> + </distributionManagement> - <pluginVersion>@pom.version@</pluginVersion> + <properties> - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <releaseFiles>${basedir}/src/pom.txt</releaseFiles> - <maven.changeFile>target/generated-sources/changes/changes.xml</maven.changeFile> - <maven.redmine.issue.url>http://www.mynuiton.org/issues/show/%ISSUE%</maven.redmine.issue.url> - <redmine.serverId>redmine-local</redmine.serverId> - <redmine.projectId>one</redmine.projectId> - <redmine.versionId>1.0.0</redmine.versionId> + <collectedFiles>target/collect.properties</collectedFiles> - <redmine.url>http://www.mynuiton.org</redmine.url> - <releaseFiles>${basedir}/src/pom.txt</releaseFiles> + </properties> - <collectedFiles>target/collect.properties</collectedFiles> + <build> - </properties> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <version>@pom.version@</version> + </plugin> - <build> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>@helperPluginVersion@</version> + </plugin> + </plugins> + </pluginManagement> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <version>${pluginVersion}</version> - </plugin> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <version>1.4</version> - </plugin> - </plugins> - </pluginManagement> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-redmine-login</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>initialize</phase> + <configuration> + <serverId>${redmine.serverId}</serverId> + <passwordOut>redmine.password</passwordOut> + <usernameOut>redmine.username</usernameOut> + </configuration> + </execution> + <!-- collect files to send to redmine --> + <execution> + <id>collect-files</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <extraFiles>${releaseFiles}</extraFiles> + <descriptionFile>${collectedFiles}</descriptionFile> + <!--<copyFiles>false</copyFiles>--> + </configuration> + </execution> + </executions> + </plugin> - <plugins> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-changes</id> + <goals> + <goal>generate-changes</goal> + <goal>generate-news-announcement</goal> + <goal>generate-email-announcement</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <xmlPath>${maven.changeFile}</xmlPath> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>get-redmine-login</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>initialize</phase> - <configuration> - <serverId>${redmine.serverId}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <!-- collect files to send to redmine --> - <execution> - <id>collect-files</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>package</phase> - <configuration> - <extraFiles>${releaseFiles}</extraFiles> - <descriptionFile>${collectedFiles}</descriptionFile> - <!--<copyFiles>false</copyFiles>--> - </configuration> - </execution> + <generateOnce>true</generateOnce> - </executions> - </plugin> + <actionMapping>fix:1, add:2</actionMapping> + <issueLinkTemplate>${maven.redmine.issue.url}</issueLinkTemplate> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-changes</id> - <goals> - <goal>generate-changes</goal> - <goal>generate-news-announcement</goal> - <goal>generate-email-announcement</goal> - </goals> - <phase>generate-resources</phase> - <configuration> - <xmlPath>${maven.changeFile}</xmlPath> + <xmlPath>${maven.changeFile}</xmlPath> + <urlDownload>http://nuiton.org/projects/jredmine/files + </urlDownload> + </configuration> + </execution> - <generateOnce>true</generateOnce> - - <actionMapping>fix:1, add:2</actionMapping> - <issueLinkTemplate>${maven.redmine.issue.url}</issueLinkTemplate> - - <xmlPath>${maven.changeFile}</xmlPath> - <urlDownload>http://www.mynuiton.org/projects/list_files/one</urlDownload> - </configuration> - </execution> + <execution> + <id>publish-redmine</id> + <!-- only executed on the pom --> + <inherited>false</inherited> + <goals> + <goal>update-version</goal> + <goal>publish-attachments</goal> + <goal>publish-news</goal> + </goals> + <phase>verify</phase> + <configuration> - <execution> - <id>publish-redmine</id> - <!-- only executed on the pom --> - <inherited>false</inherited> - <goals> - <goal>update-version</goal> - <goal>publish-attachments</goal> - <goal>publish-news</goal> - </goals> - <phase>verify</phase> - <configuration> + <!-- Send nothing ! --> + <dryRun>true</dryRun> - <!-- Send nothing ! --> - <!--<dryRun>true</dryRun>--> + <!-- update-version --> + <closeVersion>true</closeVersion> + <versionDescription>éàçè`a</versionDescription> - <!-- update-version --> - <closeVersion>true</closeVersion> - <versionDescription>éàçè`a</versionDescription> + <!-- publish-attachments --> + <filesFromProperties>${collectedFiles}</filesFromProperties> - <!-- publish-attachments --> - <filesFromProperties>${collectedFiles}</filesFromProperties> + <!-- publish-news --> + <newsContentFile> + target/generated-sources/announcement/release-news-announcement.vm + </newsContentFile> + <newsSummary>${project.description}</newsSummary> + <newsTitle>${project.name} ${project.version} released</newsTitle> - <!-- publish-news --> - <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> - <newsSummary>${project.description}</newsSummary> - <newsTitle>${project.name} ${project.version} released</newsTitle> + </configuration> + </execution> + </executions> + </plugin> - </configuration> - </execution> - </executions> - </plugin> + </plugins> - </plugins> + </build> - </build> - </project> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/it/report/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/it/report/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/it/report/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -24,116 +24,84 @@ #L% --> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> - <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> + <modelVersion>4.0.0</modelVersion> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>test-report</artifactId> - <version>0</version> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>test-report</artifactId> + <version>0</version> - <name>JRedmine report</name> - <packaging>pom</packaging> - <description>Test JRedmine plugin reports</description> + <name>JRedmine report</name> + <packaging>pom</packaging> + <description>Test JRedmine plugin reports</description> - <url>http://www.foo.com</url> + <url>http://nuiton.org/projects/jredmine</url> - <issueManagement> - <system>redmine</system> - <url>http://www.mynuiton.org/projects/one/issues</url> - </issueManagement> + <issueManagement> + <system>redmine</system> + <url>http://nuiton.org/projects/jredmine/issues</url> + </issueManagement> - <properties> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>@helperPluginVersion@</version> + <executions> + <execution> + <id>get-redmine-login</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>initialize</phase> + <configuration> + <serverId>${redmine.serverId}</serverId> + <passwordOut>redmine.password</passwordOut> + <usernameOut>redmine.username</usernameOut> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <reporting> + <plugins> - <pluginVersion>@pom.version@</pluginVersion> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <issueLinkTemplate> + http://nuiton.org/issues/show/%ISSUE% + </issueLinkTemplate> + <versionLinkTemplate> + http://nuiton.org/projects/versions/show/%VERSION% + </versionLinkTemplate> + <columnNames> + key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn + </columnNames> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>issues-report</report> + <report>issues-report-by-assignee</report> + <report>issues-report-by-category</report> + <report>issues-report-by-priority</report> + <report>issues-report-by-reporter</report> + <report>issues-report-by-status</report> + <report>issues-report-by-tracker</report> + <report>issues-report-by-version</report> + </reports> + </reportSet> + </reportSets> + </plugin> - <redmine.serverId>redmine-local</redmine.serverId> - <redmine.projectId>one</redmine.projectId> - <redmine.versionId>1.0.0</redmine.versionId> - - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </plugins> + </reporting> - <!--<redmine.url>http://www.mynuiton.org</redmine.url>--> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <id>get-redmine-login</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>initialize</phase> - <configuration> - <serverId>${redmine.serverId}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <reporting> - <plugins> - - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <version>${pluginVersion}</version> - <configuration> - <serverId>redmine-local</serverId> - <projectId>one</projectId> - <versionId>1.0.0</versionId> - <issueLinkTemplate>http://www.mynuiton.org/issues/show/%ISSUE%</issueLinkTemplate> - <versionLinkTemplate>http://www.mynuiton.org/versions/show/%VERSION%</versionLinkTemplate> - <columnNames>key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn - </columnNames> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>issues-report</report> - <report>issues-report-by-assignee</report> - <report>issues-report-by-category</report> - <report>issues-report-by-priority</report> - <report>issues-report-by-reporter</report> - <report>issues-report-by-status</report> - <report>issues-report-by-tracker</report> - <report>issues-report-by-version</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - </plugins> - </reporting> - </project> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/it/settings.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/it/settings.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/it/settings.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -24,66 +24,64 @@ #L% --> +<settings> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> - http://www.apache.org/licenses/LICENSE-2.0 + <profile> + <id>redmine-conf-profile</id> + <properties> -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> -<settings> + <redmine.serverId>jredmine-test</redmine.serverId> + <redmine.projectId>jredmine</redmine.projectId> + <redmine.versionId>1.3</redmine.versionId> + <redmine.url>http://nuiton.org/projects</redmine.url> + <maven.redmine.issue.url> + http://nuiton.org/issues/show/%ISSUE% + </maven.redmine.issue.url> + <maven.changeFile> + target/generated-sources/changes/changes.xml + </maven.changeFile> + </properties> + </profile> + </profiles> - <servers> - <server> - <id>redmine-local</id> - <username>chemit</username> - <password>{i4S9W9sEp0gH4jrveLOLJlL0O0D5TpyIplB4Abql5o8=}</password> - </server> - </servers> - - <profiles> - <profile> - <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>local.central</id> - <url>file:///@localRepository@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>local.central</id> - <url>file:///@localRepository@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> + <activeProfiles> + <activeProfile>it-repo</activeProfile> + <activeProfile>redmine-conf-profile</activeProfile> + </activeProfiles> </settings> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/it/single/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/it/single/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/it/single/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -28,156 +28,159 @@ 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> - <groupId>org.nuiton.jredmine.test</groupId> - <artifactId>single</artifactId> - <version>0</version> + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.jredmine.test</groupId> + <artifactId>single</artifactId> + <version>0</version> - <name>JRedmine single</name> - <packaging>jar</packaging> - <description>Test JRedmine plugin for a single module.</description> + <name>JRedmine single</name> + <packaging>jar</packaging> + <description>Test JRedmine plugin for a single module.</description> - <url>http://www.foo.com</url> + <url>http://nuiton.org/projects/jredmine</url> - <issueManagement> - <system>redmine</system> - <url>http://www.mynuiton.org/projects/one/issues</url> - </issueManagement> + <issueManagement> + <system>redmine</system> + <url>http://nuiton.org/projects/jredmine/issues</url> + </issueManagement> - <properties> + <!--Distribution--> + <distributionManagement> + <repository> + <id>myServer</id> + <url>file:///tmp/jredmine-repository</url> + </repository> + <snapshotRepository> + <id>myServer</id> + <url>file:///tmp/jredmine-repository</url> + </snapshotRepository> + </distributionManagement> - <pluginVersion>@pom.version@</pluginVersion> + <properties> - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <releaseFiles>${basedir}/pom.xml,${basedir}/verify.groovy</releaseFiles> - <maven.changeFile>target/generated-sources/changes/changes.xml</maven.changeFile> - <maven.redmine.issue.url>http://www.mynuiton.org/issues/show/%ISSUE%</maven.redmine.issue.url> - <redmine.serverId>redmine-local</redmine.serverId> - <redmine.projectId>one</redmine.projectId> - <redmine.versionId>1.0.0</redmine.versionId> + <collectedFiles>target/collect.properties</collectedFiles> - <redmine.url>http://www.mynuiton.org</redmine.url> - <releaseFiles>${basedir}/pom.xml,${basedir}/verify.groovy</releaseFiles> + </properties> - <collectedFiles>target/collect.properties</collectedFiles> + <build> - </properties> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <version>@pom.version@</version> + </plugin> - <build> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>@helperPluginVersion@</version> + </plugin> + </plugins> + </pluginManagement> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <version>${pluginVersion}</version> - </plugin> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <version>1.4</version> - </plugin> - </plugins> - </pluginManagement> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-redmine-login</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>initialize</phase> + <configuration> + <serverId>${redmine.serverId}</serverId> + <passwordOut>redmine.password</passwordOut> + <usernameOut>redmine.username</usernameOut> + </configuration> + </execution> + <!-- collect files to send to redmine --> + <execution> + <id>collect-files</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <extraFiles>${releaseFiles}</extraFiles> + <descriptionFile>${collectedFiles}</descriptionFile> + <!--<copyFiles>false</copyFiles>--> + </configuration> + </execution> - <plugins> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>get-redmine-login</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>initialize</phase> - <configuration> - <serverId>${redmine.serverId}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <!-- collect files to send to redmine --> - <execution> - <id>collect-files</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>package</phase> - <configuration> - <extraFiles>${releaseFiles}</extraFiles> - <descriptionFile>${collectedFiles}</descriptionFile> - <!--<copyFiles>false</copyFiles>--> - </configuration> - </execution> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <executions> + <execution> + <id>generate</id> + <goals> + <goal>generate-changes</goal> + <goal>generate-news-announcement</goal> + <goal>generate-email-announcement</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <!-- common --> + <xmlPath>${maven.changeFile}</xmlPath> - </executions> - </plugin> + <!-- generate-changes --> + <generateOnce>true</generateOnce> + <actionMapping>fix:1, add:2</actionMapping> + <issueLinkTemplate>${maven.redmine.issue.url}</issueLinkTemplate> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <executions> - <execution> - <id>generate</id> - <goals> - <goal>generate-changes</goal> - <goal>generate-news-announcement</goal> - <goal>generate-email-announcement</goal> - </goals> - <phase>generate-resources</phase> - <configuration> - <!-- common --> - <xmlPath>${maven.changeFile}</xmlPath> + <!-- generate announcements --> + <urlDownload> + http://nuiton.org/projects/jredmine/files + </urlDownload> + </configuration> + </execution> - <!-- generate-changes --> - <generateOnce>true</generateOnce> - <actionMapping>fix:1, add:2</actionMapping> - <issueLinkTemplate>${maven.redmine.issue.url}</issueLinkTemplate> + <execution> + <id>publish-redmine</id> + <goals> + <goal>update-version</goal> + <goal>publish-attachments</goal> + <goal>publish-news</goal> + <!--<goal>send-email</goal>--> + </goals> + <phase>verify</phase> + <configuration> - <!-- generate announcements --> - <urlDownload>http://www.mynuiton.org/projects/list_files/one</urlDownload> - </configuration> - </execution> + <!-- Send nothing ! --> + <dryRun>true</dryRun> - <execution> - <id>publish-redmine</id> - <goals> - <goal>update-version</goal> - <goal>publish-attachments</goal> - <goal>publish-news</goal> - <!--<goal>send-email</goal>--> - </goals> - <phase>verify</phase> - <configuration> + <verbose>true</verbose> - <!-- Send nothing ! --> - <!--<dryRun>true</dryRun>--> + <!-- update-version --> + <closeVersion>true</closeVersion> + <versionDescription>éàçè`a</versionDescription> - <verbose>true</verbose> - - <!-- update-version --> - <closeVersion>true</closeVersion> - <versionDescription>éàçè`a</versionDescription> + <!-- publish-attachments --> + <filesFromProperties>${collectedFiles}</filesFromProperties> - <!-- publish-attachments --> - <filesFromProperties>${collectedFiles}</filesFromProperties> + <!-- publish-news --> + <newsContentFile> + target/generated-sources/announcement/release-news-announcement.vm + </newsContentFile> + <newsSummary>${project.description}</newsSummary> + <newsTitle>${project.name} ${project.version} released</newsTitle> + </configuration> + </execution> + </executions> + </plugin> - <!-- publish-news --> - <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm - </newsContentFile> - <newsSummary>${project.description}</newsSummary> - <newsTitle>${project.name} ${project.version} released</newsTitle> - </configuration> - </execution> - </executions> - </plugin> + </plugins> - </plugins> + </build> - </build> - </project> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/it/single_failed/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/it/single_failed/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/it/single_failed/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -28,180 +28,187 @@ 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> - <groupId>org.nuiton.jredmine.test</groupId> - <artifactId>single</artifactId> - <version>0</version> + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.jredmine.test</groupId> + <artifactId>single</artifactId> + <version>0</version> - <name>JRedmine single</name> - <packaging>jar</packaging> - <description>Test JRedmine plugin for a single module.</description> + <name>JRedmine single</name> + <packaging>jar</packaging> + <description>Test JRedmine plugin for a single module.</description> - <url>http://www.foo.com</url> + <url>http://www.foo.com</url> - <issueManagement> - <system>redmine</system> - <url>http://www.mynuiton.org/projects/one/issues</url> - </issueManagement> + <issueManagement> + <system>redmine</system> + <url>http://www.mynuiton.org/projects/one/issues</url> + </issueManagement> - <properties> + <properties> - <pluginVersion>@pom.version@</pluginVersion> + <pluginVersion>@pom.version@</pluginVersion> - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.changeFile>target/generated-sources/changes/changes.xml</maven.changeFile> - <maven.redmine.issue.url>http://www.mynuiton.org/issues/show/%ISSUE%</maven.redmine.issue.url> - <redmine.serverId>redmine-local</redmine.serverId> - <redmine.username>redmine-fake_login</redmine.username> - <redmine.password>redmine-fake_password</redmine.password> - <redmine.projectId>one</redmine.projectId> - <redmine.versionId>1.0.0</redmine.versionId> + <maven.changeFile>target/generated-sources/changes/changes.xml + </maven.changeFile> + <maven.redmine.issue.url>http://www.mynuiton.org/issues/show/%ISSUE% + </maven.redmine.issue.url> + <redmine.serverId>redmine-local</redmine.serverId> + <redmine.username>redmine-fake_login</redmine.username> + <redmine.password>redmine-fake_password</redmine.password> + <redmine.projectId>one</redmine.projectId> + <redmine.versionId>1.0.0</redmine.versionId> - <!-- will skip jredime execution is not logged --> - <redmine.safe>false</redmine.safe> + <!-- will skip jredime execution is not logged --> + <redmine.safe>false</redmine.safe> - <redmine.url>http://www.mynuiton.org</redmine.url> - <releaseFiles>${basedir}/pom.xml,${basedir}/verify.groovy</releaseFiles> + <redmine.url>http://www.mynuiton.org</redmine.url> + <releaseFiles>${basedir}/pom.xml,${basedir}/verify.groovy</releaseFiles> - <collectedFiles>target/collect.properties</collectedFiles> + <collectedFiles>target/collect.properties</collectedFiles> - </properties> + </properties> - <build> + <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <version>${pluginVersion}</version> - </plugin> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <version>${pluginVersion}</version> + </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <version>1.4</version> - </plugin> - </plugins> - </pluginManagement> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>1.4</version> + </plugin> + </plugins> + </pluginManagement> - <plugins> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <!-- collect files to send to redmine --> - <execution> - <id>collect-files</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>package</phase> - <configuration> - <extraFiles>${releaseFiles}</extraFiles> - <descriptionFile>${collectedFiles}</descriptionFile> - </configuration> - </execution> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <!-- collect files to send to redmine --> + <execution> + <id>collect-files</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <extraFiles>${releaseFiles}</extraFiles> + <descriptionFile>${collectedFiles}</descriptionFile> + </configuration> + </execution> - </executions> - </plugin> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <executions> - <execution> - <id>generate</id> - <goals> - <goal>generate-changes</goal> - <goal>generate-news-announcement</goal> - <goal>generate-email-announcement</goal> - </goals> - <phase>generate-resources</phase> - <configuration> - <!-- common --> - <xmlPath>${maven.changeFile}</xmlPath> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <executions> + <execution> + <id>generate</id> + <goals> + <goal>generate-changes</goal> + <goal>generate-news-announcement</goal> + <goal>generate-email-announcement</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <!-- common --> + <xmlPath>${maven.changeFile}</xmlPath> - <!-- generate-changes --> - <generateOnce>true</generateOnce> - <actionMapping>fix:1, add:2</actionMapping> - <issueLinkTemplate>${maven.redmine.issue.url}</issueLinkTemplate> + <!-- generate-changes --> + <generateOnce>true</generateOnce> + <actionMapping>fix:1, add:2</actionMapping> + <issueLinkTemplate>${maven.redmine.issue.url}</issueLinkTemplate> - <!-- generate announcements --> - <urlDownload>http://www.mynuiton.org/projects/list_files/one</urlDownload> - </configuration> - </execution> + <!-- generate announcements --> + <urlDownload>http://www.mynuiton.org/projects/list_files/one + </urlDownload> + </configuration> + </execution> - <execution> - <id>publish-redmine</id> - <goals> - <goal>update-version</goal> - <goal>publish-attachments</goal> - <goal>publish-news</goal> - </goals> - <phase>verify</phase> - <configuration> + <execution> + <id>publish-redmine</id> + <goals> + <goal>update-version</goal> + <goal>publish-attachments</goal> + <goal>publish-news</goal> + </goals> + <phase>verify</phase> + <configuration> - <!-- Send nothing ! --> - <!--<dryRun>true</dryRun>--> + <!-- Send nothing ! --> + <!--<dryRun>true</dryRun>--> - <verbose>true</verbose> + <verbose>true</verbose> - <!-- update-version --> - <closeVersion>true</closeVersion> - <versionDescription>éàçè`a</versionDescription> + <!-- update-version --> + <closeVersion>true</closeVersion> + <versionDescription>éàçè`a</versionDescription> - <!-- publish-attachments --> - <filesFromProperties>${collectedFiles}</filesFromProperties> + <!-- publish-attachments --> + <filesFromProperties>${collectedFiles}</filesFromProperties> - <!-- publish-news --> - <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm - </newsContentFile> - <newsSummary>${project.description}</newsSummary> - <newsTitle>${project.name} ${project.version} released</newsTitle> - </configuration> - </execution> - </executions> - </plugin> + <!-- publish-news --> + <newsContentFile> + target/generated-sources/announcement/release-news-announcement.vm + </newsContentFile> + <newsSummary>${project.description}</newsSummary> + <newsTitle>${project.name} ${project.version} released</newsTitle> + </configuration> + </execution> + </executions> + </plugin> - </plugins> + </plugins> - </build> + </build> - <reporting> - <plugins> + <reporting> + <plugins> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <version>${pluginVersion}</version> - <configuration> - <serverId>redmine-local</serverId> - <projectId>one</projectId> - <versionId>1.0.0</versionId> - <issueLinkTemplate>http://www.mynuiton.org/issues/show/%ISSUE%</issueLinkTemplate> - <versionLinkTemplate>http://www.mynuiton.org/versions/show/%VERSION%</versionLinkTemplate> - <columnNames>key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn - </columnNames> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>issues-report</report> - <report>issues-report-by-tracker</report> - <report>issues-report-by-status</report> - <report>issues-report-by-category</report> - <report>issues-report-by-priority</report> - <report>issues-report-by-version</report> - </reports> - </reportSet> - </reportSets> - </plugin> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <version>${pluginVersion}</version> + <configuration> + <serverId>redmine-local</serverId> + <projectId>one</projectId> + <versionId>1.0.0</versionId> + <issueLinkTemplate>http://www.mynuiton.org/issues/show/%ISSUE% + </issueLinkTemplate> + <versionLinkTemplate>http://www.mynuiton.org/versions/show/%VERSION% + </versionLinkTemplate> + <columnNames> + key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn + </columnNames> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>issues-report</report> + <report>issues-report-by-tracker</report> + <report>issues-report-by-status</report> + <report>issues-report-by-category</report> + <report>issues-report-by-priority</report> + <report>issues-report-by-version</report> + </reports> + </reportSet> + </reportSets> + </plugin> - </plugins> - </reporting> + </plugins> + </reporting> </project> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/it/skip-report/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/it/skip-report/pom.xml 2012-10-04 09:43:47 UTC (rev 343) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/it/skip-report/pom.xml 2012-10-04 11:57:42 UTC (rev 344) @@ -24,123 +24,99 @@ #L% --> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> - <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> + <modelVersion>4.0.0</modelVersion> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>test-report</artifactId> - <version>0</version> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>test-report</artifactId> + <version>@pom.version@</version> - <name>JRedmine report</name> - <packaging>pom</packaging> - <description>Test JRedmine plugin reports</description> + <name>JRedmine report</name> + <packaging>pom</packaging> + <description>Test JRedmine plugin reports</description> - <url>http://www.foo.com</url> + <url>http://nuiton.org/projects/jredmine</url> - <issueManagement> - <system>redmine</system> - <url>http://www.mynuiton.org/projects/one/issues</url> - </issueManagement> + <issueManagement> + <system>redmine</system> + <url>http://nuiton.org/projects/jredmine/issues</url> + </issueManagement> - <properties> + <properties> - <pluginVersion>@pom.version@</pluginVersion> + </properties> - <redmine.serverId>redmine-local</redmine.serverId> - <redmine.projectId>one</redmine.projectId> - <redmine.versionId>1.0.0</redmine.versionId> - - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>@helperPluginVersion@</version> + <executions> + <execution> + <id>get-redmine-login</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>initialize</phase> + <configuration> + <serverId>${redmine.serverId}</serverId> + <passwordOut>redmine.password</passwordOut> + <usernameOut>redmine.username</usernameOut> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <reporting> + <plugins> - <!--<redmine.url>http://www.mynuiton.org</redmine.url>--> - </properties> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <serverId>redmine-local</serverId> + <projectId>one</projectId> + <versionId>1.0.0</versionId> + <issueLinkTemplate> + http://nuiton.org/issues/show/%ISSUE% + </issueLinkTemplate> + <versionLinkTemplate> + http://nuiton.org/versions/show/%VERSION% + </versionLinkTemplate> + <columnNames> + key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn + </columnNames> + <skipIssueReport>true</skipIssueReport> + <skipIssueReportByAssignee>true</skipIssueReportByAssignee> + <skipIssueReportByCategory>true</skipIssueReportByCategory> + <skipIssueReportByPriority>true</skipIssueReportByPriority> + <skipIssueReportByReporter>true</skipIssueReportByReporter> + <skipIssueReportByStatus>true</skipIssueReportByStatus> + <skipIssueReportByTracker>true</skipIssueReportByTracker> + <skipIssueReportByVersion>true</skipIssueReportByVersion> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>issues-report</report> + <report>issues-report-by-assignee</report> + <report>issues-report-by-category</report> + <report>issues-report-by-priority</report> + <report>issues-report-by-reporter</report> + <report>issues-report-by-status</report> + <report>issues-report-by-tracker</report> + <report>issues-report-by-version</report> + </reports> + </reportSet> + </reportSets> + </plugin> - <build> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <id>get-redmine-login</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>initialize</phase> - <configuration> - <serverId>${redmine.serverId}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <reporting> - <plugins> + </plugins> + </reporting> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <version>${pluginVersion}</version> - <configuration> - <serverId>redmine-local</serverId> - <projectId>one</projectId> - <versionId>1.0.0</versionId> - <issueLinkTemplate>http://www.mynuiton.org/issues/show/%ISSUE%</issueLinkTemplate> - <versionLinkTemplate>http://www.mynuiton.org/versions/show/%VERSION%</versionLinkTemplate> - <columnNames>key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn</columnNames> - <skipIssueReport>true</skipIssueReport> - <skipIssueReportByAssignee>true</skipIssueReportByAssignee> - <skipIssueReportByCategory>true</skipIssueReportByCategory> - <skipIssueReportByPriority>true</skipIssueReportByPriority> - <skipIssueReportByReporter>true</skipIssueReportByReporter> - <skipIssueReportByStatus>true</skipIssueReportByStatus> - <skipIssueReportByTracker>true</skipIssueReportByTracker> - <skipIssueReportByVersion>true</skipIssueReportByVersion> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>issues-report</report> - <report>issues-report-by-assignee</report> - <report>issues-report-by-category</report> - <report>issues-report-by-priority</report> - <report>issues-report-by-reporter</report> - <report>issues-report-by-status</report> - <report>issues-report-by-tracker</report> - <report>issues-report-by-version</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - </plugins> - </reporting> - </project>