Author: tchemit Date: 2014-03-02 15:43:10 +0100 (Sun, 02 Mar 2014) New Revision: 430 Url: http://nuiton.org/projects/jredmine/repository/revisions/430 Log: fixes #3107 always inject test credentials + fix license Modified: trunk/LICENSE.txt trunk/jredmine-client/LICENSE.txt trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineConfigurationUtil.java trunk/jredmine-maven-plugin/LICENSE.txt trunk/pom.xml trunk/src/site/apt/tests.apt Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2014-03-01 17:56:48 UTC (rev 429) +++ trunk/LICENSE.txt 2014-03-02 14:43:10 UTC (rev 430) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/jredmine-client/LICENSE.txt =================================================================== --- trunk/jredmine-client/LICENSE.txt 2014-03-01 17:56:48 UTC (rev 429) +++ trunk/jredmine-client/LICENSE.txt 2014-03-02 14:43:10 UTC (rev 430) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineConfigurationUtil.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineConfigurationUtil.java 2014-03-01 17:56:48 UTC (rev 429) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineConfigurationUtil.java 2014-03-02 14:43:10 UTC (rev 430) @@ -231,7 +231,7 @@ protected static void overridePropertyFromEnv(Object conf, String prop) throws IOException { String value = System.getenv(PROPERTY_PREFIX + prop); - if (StringUtils.isNotEmpty(value) && !"null".equals(value)) { + if (StringUtils.isNotEmpty(value) && !"null".equals(value) && !value.startsWith("${")) { try { BeanUtilsBean.getInstance().setProperty(conf, prop, value); } catch (Exception e) { Modified: trunk/jredmine-maven-plugin/LICENSE.txt =================================================================== --- trunk/jredmine-maven-plugin/LICENSE.txt 2014-03-01 17:56:48 UTC (rev 429) +++ trunk/jredmine-maven-plugin/LICENSE.txt 2014-03-02 14:43:10 UTC (rev 430) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-01 17:56:48 UTC (rev 429) +++ trunk/pom.xml 2014-03-02 14:43:10 UTC (rev 430) @@ -83,9 +83,6 @@ <!-- must be on a fixed version, not on the snapshot to make possible release --> <jredminePluginVersion>1.6</jredminePluginVersion> - <!-- remove this when using mavenpom >= 4.0 --> - <helperPluginVersion>2.1</helperPluginVersion> - <doxiaVersion>1.4</doxiaVersion> <!-- documentation is in apt --> @@ -742,6 +739,13 @@ <profile> <id>jredmine-test-profile</id> + <!-- to avoid this profile just add -P!jredmine-test-profile to maven invocation --> + <activation> + <property> + <name>skip-inject-test-credentials</name> + <value>!true</value> + </property> + </activation> <build> <plugins> <plugin> Modified: trunk/src/site/apt/tests.apt =================================================================== --- trunk/src/site/apt/tests.apt 2014-03-01 17:56:48 UTC (rev 429) +++ trunk/src/site/apt/tests.apt 2014-03-02 14:43:10 UTC (rev 430) @@ -118,7 +118,7 @@ Exemple : ------------------------------------------------------------------------------- -<!-- login to jredmine test --> + <!-- login to jredmine test --> <server> <id>jredmine-test</id> <username>login</username> @@ -126,42 +126,6 @@ </server> ------------------------------------------------------------------------------- - - Ensuite il faut utiliser le profile nommé <<jredmine-test-profile>> - pour injecter vos identifiants dans les tests - - Exemple : - -------------------------------------------------------------------------------- -mvn install -Pjredmine-test-profile -------------------------------------------------------------------------------- - - Il est aussi possible d'ajouter ce profile dans les profiles actifs par - défaut toujours dans le fichier <<settings.xml>>. - - Exemple : - -------------------------------------------------------------------------------- - - <profiles> - - <!-- ... --> - - <!-- On crée un profile vide par défaut pour ne pas avoir de warning - pour les autres builds maven... ... --> - <profile> - <id>jredmine-test-profile</id> - </profile> - <!-- ... --> - - </profiles> - - <activeProfiles> - <!-- ... --> - <activeProfile>jredmine-test-profile</activeProfile> - </activeProfiles> -------------------------------------------------------------------------------- - Jeu de test En version <<2.0>> le jeu de test sera clairement spécifié pour permettre