August 2013 - Jredmine-commits - mailman.cloud.codelutin.com

r407 - in trunk: jredmine-client/src/main/java/org/nuiton/jredmine/service jredmine-client/src/test/java/org/nuiton/jredmine/service jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin src/site/apt
by tchemit＠users.nuiton.org 08 Aug '13

08 Aug '13

Author: tchemit Date: 2013-08-08 11:34:23 +0200 (Thu, 08 Aug 2013) New Revision: 407 Url: http://nuiton.org/projects/jredmine/repository/revisions/407 Log: - fixes #2630: Next-Version, Last-Version automatically set - remove commented code Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineAnonymousService.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineService.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineAnonymousService.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineConfigurationUtil.java trunk/jredmine-client/src/test/java/org/nuiton/jredmine/service/RedmineAnonymousServiceTest.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java trunk/src/site/apt/index.apt Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineAnonymousService.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineAnonymousService.java 2013-08-08 08:39:23 UTC (rev 406) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineAnonymousService.java 2013-08-08 09:34:23 UTC (rev 407) @@ -40,8 +40,14 @@ import org.nuiton.jredmine.model.Tracker; import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; +import org.nuiton.jredmine.model.VersionStatusEnum; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + /** * Default implementation of {@link RedmineAnonymousService}. * @@ -168,6 +174,32 @@ } @Override + public Version getLastestClosedVersion(String projectName) throws RedmineServiceException { + + // get all versions + Version[] versions = getVersions(projectName); + List<Version> closedVersions = new ArrayList<Version>(); + for (Version version : versions) { + if (version.getEffectiveDate() != null && + VersionStatusEnum.closed.name().equals(version.getStatus())) { + closedVersions.add(version); + } + } + + Version result = null; + if (!closedVersions.isEmpty()) { + Collections.sort(closedVersions, new Comparator<Version>() { + @Override + public int compare(Version o1, Version o2) { + return o2.getEffectiveDate().compareTo(o1.getEffectiveDate()); + } + }); + result = closedVersions.get(0); + } + return result; + } + + @Override public Attachment[] getAttachments(String projectName, String versionName) throws RedmineServiceException { RedmineRequest<Attachment> request = Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineService.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineService.java 2013-08-08 08:39:23 UTC (rev 406) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/DefaultRedmineService.java 2013-08-08 09:34:23 UTC (rev 407) @@ -156,6 +156,12 @@ } @Override + public Version getLastestClosedVersion(String projectName) throws RedmineServiceException { + Version result = anonymousService.getLastestClosedVersion(projectName); + return result; + } + + @Override public Attachment[] getAttachments(String projectName, String versionName) throws RedmineServiceException { Attachment[] result = anonymousService.getAttachments(projectName, versionName); Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineAnonymousService.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineAnonymousService.java 2013-08-08 08:39:23 UTC (rev 406) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineAnonymousService.java 2013-08-08 09:34:23 UTC (rev 407) @@ -61,7 +61,7 @@ * Tells if service was successful initialized. * * @return {@code true} if service was successfull initialized via - * method {@link #init(RedmineServiceConfiguration)}, {@code false} otherwise. + * method {@link #init(RedmineServiceConfiguration)}, {@code false} otherwise. */ boolean isInit(); @@ -176,6 +176,17 @@ String versionName) throws RedmineServiceException; /** + * Obtain the lastest closed version for a given project. + * + * @param projectName the name of the project + * @return the version (or {@code null} if no version is matching) + * @throws RedmineServiceException if any pb while retriving datas + * @see Version + * @since 1.6 + */ + Version getLastestClosedVersion(String projectName) throws RedmineServiceException; + + /** * Obtain all issues for a given project. * * @param projectName the name of the project 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 2013-08-08 08:39:23 UTC (rev 406) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/service/RedmineConfigurationUtil.java 2013-08-08 09:34:23 UTC (rev 407) @@ -280,16 +280,6 @@ this.encoding = encoding; } -// @Override -// public String getPassword() { -// return restPassword; -// } -// -// @Override -// public void setPassword(String password) { -// this.restPassword = password; -// } - @Override public URL getUrl() { return url; @@ -300,16 +290,6 @@ this.url = url; } -// @Override -// public String getUsername() { -// return restUsername; -// } -// -// @Override -// public void setUsername(String username) { -// this.restUsername = username; -// } - @Override public boolean isVerbose() { return verbose; @@ -348,15 +328,5 @@ b.append("verbose", verbose); return b.toString(); } - -// @Override -// public String getApiKey() { -// return apiKey; -// } -// -// @Override -// public void setApiKey(String apiKey) { -// this.apiKey = apiKey; -// } } } Modified: trunk/jredmine-client/src/test/java/org/nuiton/jredmine/service/RedmineAnonymousServiceTest.java =================================================================== --- trunk/jredmine-client/src/test/java/org/nuiton/jredmine/service/RedmineAnonymousServiceTest.java 2013-08-08 08:39:23 UTC (rev 406) +++ trunk/jredmine-client/src/test/java/org/nuiton/jredmine/service/RedmineAnonymousServiceTest.java 2013-08-08 09:34:23 UTC (rev 407) @@ -101,6 +101,13 @@ } @Test + public void getLastestClosedVersion() throws Exception { + Version version = getService().getLastestClosedVersion(getFixtures().projectName()); + Assert.assertNotNull(version); + System.out.println(version.getName()); + } + + @Test public void getVersion() throws Exception { Version version = getService().getVersion(getFixtures().projectName(), getFixtures().versionName()); Assert.assertNotNull(version); Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2013-08-08 08:39:23 UTC (rev 406) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2013-08-08 09:34:23 UTC (rev 407) @@ -96,6 +96,19 @@ protected String previousVersionName; /** + * To use the lastest closed version as the previous version. + * + * If not Set - will not move any issues to the new version. + * + * Note: No effect when {@link #previousVersionName} + * is filled. + * + * @since 1.6 + */ + @Parameter(property = "redmine.useLastPreviousVersion") + protected boolean useLastPreviousVersion; + + /** * A flag to skip the goal. * * @since 1.0.0 @@ -249,7 +262,8 @@ // get version Version v = getProjectVersion(versionId); - boolean usePreviousVersion = false; + String safePreviousVersionName = null; + if (StringUtils.isNotBlank(previousVersionName)) { // retrieve previous version @@ -257,8 +271,22 @@ if (previousVersion == null) { getLog().warn("can not find the previous version " + previousVersionName); } else { - usePreviousVersion = true; + safePreviousVersionName = previousVersionName; } + + if (useLastPreviousVersion) { + getLog().warn("useLastPreviousVersion flag has no effect when previousVersionName property is filled."); + } + } else if (useLastPreviousVersion) { + + // get all version + Version previousVersion = service.getLastestClosedVersion(projectId); + if (previousVersion == null) { + getLog().warn("No latest closed version"); + } else { + getLog().info("Will use as previous version (the latest closed one): " + previousVersion.getName()); + safePreviousVersionName = previousVersion.getName(); + } } if (v == null) { @@ -280,9 +308,9 @@ if (!dryRun) { // create version - getLog().info("next version " + releaseVersion.getName() + (usePreviousVersion ? " from previous version " + previousVersionName : "")); + getLog().info("next version " + releaseVersion.getName() + (safePreviousVersionName != null ? " from previous version " + safePreviousVersionName : "")); - service.nextVersion(projectId, usePreviousVersion ? previousVersionName : null, releaseVersion); + service.nextVersion(projectId, safePreviousVersionName, releaseVersion); } } } Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2013-08-08 08:39:23 UTC (rev 406) +++ trunk/src/site/apt/index.apt 2013-08-08 09:34:23 UTC (rev 407) @@ -54,6 +54,14 @@ Notes +* Version 1.6 + + La version <<1.6>> améliore la gestion d'éxecution des goals, on peut + désormais configurer le fait de lancer ou pas les goals sur les modules root. + + On a aussi ajouté la possible de choisir de manière automatique la dernière + version clôturée (voir http://nuiton.org/issues/2630) + * Version 1.5 La version <<1.5>> permet d'utiliser désormais l'authentification via l'api-key.

1 0

r406 - in trunk: jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api jredmine-maven-plugin/src/it/single_failed jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 08 Aug '13

08 Aug '13

Author: tchemit Date: 2013-08-08 10:39:23 +0200 (Thu, 08 Aug 2013) New Revision: 406 Url: http://nuiton.org/projects/jredmine/repository/revisions/406 Log: fix it add missing header + svn properties Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AbstractXpp3Reader.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AttributeValueToProperty.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DataConverter.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DefaultDataConverter.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/PropertyMapper.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagContentToProperty.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagTextContentToProperty.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Helper.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Reader.java trunk/jredmine-maven-plugin/src/it/single_failed/pom.xml trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AbstractXpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AbstractXpp3Reader.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AbstractXpp3Reader.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.model.io.xpp3.api; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 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 com.google.common.collect.Sets; import org.codehaus.plexus.util.xml.pull.MXParser; import org.codehaus.plexus.util.xml.pull.XmlPullParser; Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AbstractXpp3Reader.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AttributeValueToProperty.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AttributeValueToProperty.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AttributeValueToProperty.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.model.io.xpp3.api; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 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.codehaus.plexus.util.xml.pull.XmlPullParser; import java.beans.IntrospectionException; Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/AttributeValueToProperty.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DataConverter.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DataConverter.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DataConverter.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.model.io.xpp3.api; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + /** * A contract to a data converter from a text value to a typed value. * Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DataConverter.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DefaultDataConverter.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DefaultDataConverter.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DefaultDataConverter.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.model.io.xpp3.api; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + /** * A enumaration to convert some data from a string representation. * Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/DefaultDataConverter.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/PropertyMapper.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/PropertyMapper.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/PropertyMapper.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.model.io.xpp3.api; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 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 com.google.common.base.Function; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/PropertyMapper.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagContentToProperty.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagContentToProperty.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagContentToProperty.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.model.io.xpp3.api; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 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.codehaus.plexus.util.xml.pull.XmlPullParser; import java.beans.IntrospectionException; Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagContentToProperty.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagTextContentToProperty.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagTextContentToProperty.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagTextContentToProperty.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.model.io.xpp3.api; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 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.codehaus.plexus.util.xml.pull.XmlPullParser; import java.beans.IntrospectionException; Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/TagTextContentToProperty.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Helper.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Helper.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Helper.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.model.io.xpp3.api; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.util.IOUtil; Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Helper.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Reader.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Reader.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Reader.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.model.io.xpp3.api; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 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.codehaus.plexus.util.xml.pull.XmlPullParser; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; Property changes on: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/api/Xpp3Reader.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/jredmine-maven-plugin/src/it/single_failed/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/src/it/single_failed/pom.xml 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-maven-plugin/src/it/single_failed/pom.xml 2013-08-08 08:39:23 UTC (rev 406) @@ -124,6 +124,9 @@ </goals> <phase>generate-resources</phase> <configuration> + +  + <username>redmine-fake_login</username>  <xmlPath>${maven.changeFile}</xmlPath> Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java 2013-08-08 08:05:34 UTC (rev 405) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java 2013-08-08 08:39:23 UTC (rev 406) @@ -1,5 +1,29 @@ package org.nuiton.jredmine.plugin; +/* + * #%L + * JRedmine :: Maven plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + /** * Contract to place on mojo which can be run only once, or only on root module. * Property changes on: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r405 - in trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin: . announcement report
by tchemit＠users.nuiton.org 08 Aug '13

08 Aug '13

Author: tchemit Date: 2013-08-08 10:05:34 +0200 (Thu, 08 Aug 2013) New Revision: 405 Url: http://nuiton.org/projects/jredmine/repository/revisions/405 Log: refs #2806: Can not use generate mojo on a none root module (add a runOnlyOnRoot flag) Added: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -158,8 +158,8 @@ /** the date format used to write a date */ protected DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - /** flag to mark if a runOnce goal was done */ - protected boolean runOnceDone; +// /** flag to mark if a runOnce goal was done */ +// protected boolean runOnceDone; /** flag to mark if service was sucessfull init */ protected boolean serviceInit; @@ -230,16 +230,16 @@ this.url = url; } - /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo - /////////////////////////////////////////////////////////////////////////// +// /////////////////////////////////////////////////////////////////////////// +// /// AbstractRedmineMojo +// /////////////////////////////////////////////////////////////////////////// +// +// protected abstract boolean isGoalSkip(); +// +// protected abstract boolean isRunOnce(); +// +// protected abstract boolean checkRunOnceDone(); - protected abstract boolean isGoalSkip(); - - protected abstract boolean isRunOnce(); - - protected abstract boolean checkRunOnceDone(); - /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// @@ -317,14 +317,18 @@ @Override protected boolean checkSkip() { - if (isGoalSkip()) { - getLog().warn("The goal is skip due to the skipGoal flag on"); - return false; + if (this instanceof SkipOrRunOnlyOnceAware) { + SkipOrRunOnlyOnceAware m = ((SkipOrRunOnlyOnceAware) this); + + if (m.isGoalSkip()) { + getLog().warn("The goal is skip due to the skipGoal flag on"); + return false; + } + if (m.isRunOnce() && m.isRunOnceDone()) { + getLog().info("skip goal, runOnce flag is on, and was already executed."); + return false; + } } - if (isRunOnce() && isRunOnceDone()) { - getLog().info("skip goal, runOnce flag is on, and was already executed."); - return false; - } if (!serviceInit) { getLog().error("could not init Redmine service [" + getUrl() + "]"); @@ -374,9 +378,10 @@ } } - public boolean isRunOnceDone() { - return runOnceDone; - } +// @Override +// public boolean isRunOnceDone() { +// return runOnceDone; +// } /** * Convinient method to throw the given {@code message} Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -206,25 +206,6 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo - /////////////////////////////////////////////////////////////////////////// - - @Override - protected boolean checkRunOnceDone() { - return false; - } - - @Override - protected boolean isGoalSkip() { - return false; - } - - @Override - protected boolean isRunOnce() { - return false; - } - - /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java 2013-08-08 08:05:34 UTC (rev 405) @@ -30,7 +30,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.4 */ -public interface DryRunAware { +public interface DryRunAware extends SkipOrRunOnlyOnceAware{ boolean isDryRun(); Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -65,7 +65,7 @@ * @since 1.0.0 */ @Mojo(name = "generate-changes", requiresOnline = true, requiresProject = true) -public class GenerateChangesMojo extends AbstractRedmineMojoWithProjectAndVersion implements IssueCollectorConfiguration { +public class GenerateChangesMojo extends AbstractRedmineMojoWithProjectAndVersion implements IssueCollectorConfiguration, SkipOrRunOnlyOnceAware { /** The actions understood by the changes.xml format. */ enum Actions { @@ -189,6 +189,14 @@ @Parameter(property = "redmine.generateOnce", defaultValue = "true") protected boolean generateOnce; + /** + * A flag to restrict only to run on root module. + * + * @since 1.6 + */ + @Parameter(property = "redmine.runOnlyOnRoot", defaultValue = "true") + protected boolean runOnlyOnRoot; + /////////////////////////////////////////////////////////////////////////// /// Mojo internal attributes /////////////////////////////////////////////////////////////////////////// @@ -203,6 +211,9 @@ private Version[] versions; + /** flag to mark if a runOnce goal was done */ + protected boolean runOnceDone; + public GenerateChangesMojo() { super(true, true); } @@ -263,39 +274,48 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo + /// SkipOrRunOnlyOnceAware /////////////////////////////////////////////////////////////////////////// @Override - protected boolean isGoalSkip() { + public boolean isGoalSkip() { return skipGenerateChanges; } @Override - protected boolean isRunOnce() { + public boolean isRunOnce() { return generateOnce; } @Override - protected boolean checkRunOnceDone() { + public boolean isRunOnlyOnRoot() { + return runOnlyOnRoot; + } - if (!isRunOnce()) { - // will generate each time - return false; - } + @Override + public boolean isRunOnceDone() { + return runOnceDone; + } - if (cacheChangesFile == null || !cacheChangesFile.exists()) { + @Override + public boolean checkRunOnceDone() { - // the changes.xml does not exists, must generate it - return false; - } + Date buildStartTime = session == null ? null : session.getStartTime(); + Date newStartTime = cacheChangesFile != null && cacheChangesFile.exists() ? new Date(cacheChangesFile.lastModified()) : null; - // nothing to generate (so no init) - // will just copy the already generated changes.xml file - return true; + boolean needInvoke = needInvoke(isRunOnce(), + runOnlyOnRoot, + buildStartTime, + newStartTime + ); + return !needInvoke; } /////////////////////////////////////////////////////////////////////////// + /// AbstractRedmineMojo + /////////////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -119,6 +119,14 @@ @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; + /** + * A flag to restrict only to run on root module. + * + * @since 1.6 + */ + @Parameter(property = "redmine.runOnlyOnRoot", defaultValue = "true") + protected boolean runOnlyOnRoot; + /////////////////////////////////////////////////////////////////////////// /// Mojo internal attributes /////////////////////////////////////////////////////////////////////////// @@ -126,6 +134,9 @@ /** effective date to set */ private Date date; + /** flag to mark if a runOnce goal was done */ + protected boolean runOnceDone; + public NextVersionMojo() { super(true, false); } @@ -159,21 +170,31 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo + /// SkipOrRunOnlyOnceAware /////////////////////////////////////////////////////////////////////////// @Override - protected boolean isGoalSkip() { + public boolean isGoalSkip() { return skipNextVersion; } @Override - protected boolean isRunOnce() { + public boolean isRunOnce() { return runOnce; } @Override - protected boolean checkRunOnceDone() { + public boolean isRunOnlyOnRoot() { + return runOnlyOnRoot; + } + + @Override + public boolean isRunOnceDone() { + return runOnceDone; + } + + @Override + public boolean checkRunOnceDone() { // compute unique key StringBuilder buffer = new StringBuilder("next-version"); buffer.append("##").append(projectId); @@ -184,7 +205,7 @@ String key = buffer.toString(); - return !needInvoke(runOnce, false, key); + return !needInvoke(runOnce, runOnlyOnRoot, key); } /////////////////////////////////////////////////////////////////////////// Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -111,6 +111,14 @@ @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; + /** + * A flag to restrict only to run on root module. + * + * @since 1.6 + */ + @Parameter(property = "redmine.runOnlyOnRoot", defaultValue = "true") + protected boolean runOnlyOnRoot; + /////////////////////////////////////////////////////////////////////////// /// Mojo internal attributes /////////////////////////////////////////////////////////////////////////// @@ -118,6 +126,9 @@ /** files to deploy */ protected List<File> allFiles; + /** flag to mark if a runOnce goal was done */ + protected boolean runOnceDone; + public PublishAttachmentsMojo() { super(true, true); } @@ -151,22 +162,32 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo + /// SkipOrRunOnlyOnceAware /////////////////////////////////////////////////////////////////////////// @Override - protected boolean isGoalSkip() { + public boolean isGoalSkip() { return skipPublishAttachments; } @Override - protected boolean isRunOnce() { + public boolean isRunOnce() { return runOnce; } @Override - protected boolean checkRunOnceDone() { + public boolean isRunOnlyOnRoot() { + return runOnlyOnRoot; + } + @Override + public boolean isRunOnceDone() { + return runOnceDone; + } + + @Override + public boolean checkRunOnceDone() { + // compute unique key StringBuilder buffer = new StringBuilder("publish-attachments"); for (File allFile : allFiles) { Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -107,6 +107,17 @@ @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; + /** + * A flag to restrict only to run on root module. + * + * @since 1.6 + */ + @Parameter(property = "redmine.runOnlyOnRoot", defaultValue = "true") + protected boolean runOnlyOnRoot; + + /** flag to mark if a runOnce goal was done */ + protected boolean runOnceDone; + public PublishNewsMojo() { super(true); } @@ -140,16 +151,16 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo + /// SkipOrRunOnlyOnceAware /////////////////////////////////////////////////////////////////////////// @Override - protected boolean isGoalSkip() { + public boolean isGoalSkip() { return skipPublishNews; } @Override - protected boolean checkRunOnceDone() { + public boolean checkRunOnceDone() { // compute unique key StringBuilder buffer = new StringBuilder("publish-news"); buffer.append("##").append(newsTitle); @@ -162,10 +173,20 @@ } @Override - protected boolean isRunOnce() { + public boolean isRunOnce() { return runOnce; } + @Override + public boolean isRunOnlyOnRoot() { + return runOnlyOnRoot; + } + + @Override + public boolean isRunOnceDone() { + return runOnceDone; + } + /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// Added: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java (rev 0) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java 2013-08-08 08:05:34 UTC (rev 405) @@ -0,0 +1,20 @@ +package org.nuiton.jredmine.plugin; + +/** + * Contract to place on mojo which can be run only once, or only on root module. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.6 + */ +public interface SkipOrRunOnlyOnceAware { + + boolean isGoalSkip(); + + boolean isRunOnce(); + + boolean isRunOnlyOnRoot(); + + boolean checkRunOnceDone(); + + boolean isRunOnceDone(); +} Property changes on: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -130,6 +130,14 @@ @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; + /** + * A flag to restrict only to run on root module. + * + * @since 1.6 + */ + @Parameter(property = "redmine.runOnlyOnRoot", defaultValue = "true") + protected boolean runOnlyOnRoot; + /////////////////////////////////////////////////////////////////////////// /// Mojo internal attributes /////////////////////////////////////////////////////////////////////////// @@ -137,6 +145,9 @@ /** effective date to set */ private Date date; + /** flag to mark if a runOnce goal was done */ + protected boolean runOnceDone; + /** * New status to apply (stay null if nothing is asked). * @@ -177,21 +188,31 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo + /// SkipOrRunOnlyOnceAware /////////////////////////////////////////////////////////////////////////// @Override - protected boolean isGoalSkip() { + public boolean isGoalSkip() { return skipUpdateVersion; } @Override - protected boolean isRunOnce() { + public boolean isRunOnce() { return runOnce; } @Override - protected boolean checkRunOnceDone() { + public boolean isRunOnlyOnRoot() { + return runOnlyOnRoot; + } + + @Override + public boolean isRunOnceDone() { + return runOnceDone; + } + + @Override + public boolean checkRunOnceDone() { // compute unique key StringBuilder buffer = new StringBuilder("update-version"); buffer.append("##").append(projectId); Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -35,17 +35,17 @@ import org.codehaus.plexus.velocity.VelocityComponent; import org.nuiton.jredmine.model.Attachment; import org.nuiton.jredmine.plugin.AbstractRedmineMojoWithProjectAndVersion; +import org.nuiton.jredmine.plugin.SkipOrRunOnlyOnceAware; import org.nuiton.plugin.PluginHelper; import java.io.File; -import java.util.Date; import java.util.List; import java.util.Map; /** * @author tchemit <chemit(a)codelutin.com> */ -public abstract class AbstractAnnouncementMojo extends AbstractRedmineMojoWithProjectAndVersion implements AnnouncementGeneratorConfiguration { +public abstract class AbstractAnnouncementMojo extends AbstractRedmineMojoWithProjectAndVersion implements AnnouncementGeneratorConfiguration, SkipOrRunOnlyOnceAware { /////////////////////////////////////////////////////////////////////////// /// Mojo parameters @@ -206,6 +206,14 @@ protected boolean runOnce; /** + * A flag to restrict only to run on root module. + * + * @since 1.6 + */ + @Parameter(property = "redmine.runOnlyOnRoot", defaultValue = "true") + protected boolean runOnlyOnRoot; + + /** * Files where are stored location of artifacts to deploy by the build. * * @since 1.2.1 @@ -247,6 +255,9 @@ protected AnnouncementGenerator generator; + /** flag to mark if a runOnce goal was done */ + protected boolean runOnceDone; + /////////////////////////////////////////////////////////////////////////// /// AbstractAnnouncementMojo /////////////////////////////////////////////////////////////////////////// @@ -267,11 +278,6 @@ return attachmentLinkTemplate; } -// @Override -// public String getUrl() { -// return url.toString(); -// } - @Override public String getArtifactId() { return artifactId; @@ -338,40 +344,54 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo + /// SkipOrRunOnlyOnceAware /////////////////////////////////////////////////////////////////////////// @Override - public boolean isAnonymous() { - return anonymous; + public boolean isRunOnce() { + return runOnce; } @Override - public void setAnonymous(boolean anonymous) { - this.anonymous = anonymous; + public boolean isRunOnlyOnRoot() { + return runOnlyOnRoot; } @Override - protected boolean isRunOnce() { - return runOnce; + public boolean isRunOnceDone() { + return runOnceDone; } @Override - protected boolean checkRunOnceDone() { + public boolean checkRunOnceDone() { - File out = getOutputFile(); - Date buildStartTime = session == null ? null : session.getStartTime(); - Date newStartTime = out.exists() ? new Date(out.lastModified()) : null; + // compute unique key + StringBuilder buffer = new StringBuilder(getClass().getName()); + buffer.append("##").append(projectId); + buffer.append("##").append(versionId); + buffer.append("##").append(releaseVersion); + buffer.append("##").append(getAnnouncementTemplate()); - boolean needInvoke = needInvoke(runOnce, - false, - buildStartTime, - newStartTime - ); - return !needInvoke; + String key = buffer.toString(); + + return !needInvoke(runOnce, runOnlyOnRoot, key); } /////////////////////////////////////////////////////////////////////////// + /// AbstractRedmineMojo + /////////////////////////////////////////////////////////////////////////// + + @Override + public boolean isAnonymous() { + return anonymous; + } + + @Override + public void setAnonymous(boolean anonymous) { + this.anonymous = anonymous; + } + + /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -66,11 +66,11 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo + /// SkipOrRunOnlyOnceAware /////////////////////////////////////////////////////////////////////////// @Override - protected boolean isGoalSkip() { + public boolean isGoalSkip() { return skipGenerateEmailAnnouncement; } } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java 2013-08-08 08:05:34 UTC (rev 405) @@ -66,11 +66,11 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo + /// SkipOrRunOnlyOnceAware /////////////////////////////////////////////////////////////////////////// @Override - protected boolean isGoalSkip() { + public boolean isGoalSkip() { return skipGenerateNewsAnnouncement; } } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2013-08-07 17:21:45 UTC (rev 404) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2013-08-08 08:05:34 UTC (rev 405) @@ -121,25 +121,6 @@ } /////////////////////////////////////////////////////////////////////////// - /// AbstractRedmineMojo - /////////////////////////////////////////////////////////////////////////// - - @Override - protected boolean isRunOnce() { - return false; - } - - @Override - protected boolean checkRunOnceDone() { - return false; - } - - @Override - protected boolean isGoalSkip() { - return false; - } - - /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin ///////////////////////////////////////////////////////////////////////////

1 0

r404 - trunk/jredmine-client/src/it/redmine-1.4.x
by tchemit＠users.nuiton.org 07 Aug '13

07 Aug '13

Author: tchemit Date: 2013-08-07 19:21:45 +0200 (Wed, 07 Aug 2013) New Revision: 404 Url: http://nuiton.org/projects/jredmine/repository/revisions/404 Log: fix it Modified: trunk/jredmine-client/src/it/redmine-1.4.x/pom.xml Modified: trunk/jredmine-client/src/it/redmine-1.4.x/pom.xml =================================================================== --- trunk/jredmine-client/src/it/redmine-1.4.x/pom.xml 2013-08-07 17:16:13 UTC (rev 403) +++ trunk/jredmine-client/src/it/redmine-1.4.x/pom.xml 2013-08-07 17:21:45 UTC (rev 404) @@ -88,7 +88,7 @@ </goals> <phase>initialize</phase> <configuration> - <serverId>jredmine-test-it-1.4.x</serverId> + <serverId>jredmine-test-it</serverId> <usernameOut>jredmine-test.username</usernameOut> <passwordOut>jredmine-test.password</passwordOut> <privateKeyOut>jredmine-test.apiKey</privateKeyOut>

1 0

r403 - in trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin: . announcement
by tchemit＠users.nuiton.org 07 Aug '13

07 Aug '13

Author: tchemit Date: 2013-08-07 19:16:13 +0200 (Wed, 07 Aug 2013) New Revision: 403 Url: http://nuiton.org/projects/jredmine/repository/revisions/403 Log: fixes #2804: Even when skip flag is on, there is some code executed on goals fixes #2806: Can not use generate mojo on a none root module Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -43,8 +43,6 @@ * Abstract redmine mojo. * * @author tchemit <chemit(a)codelutin.com> - * @requiresOnline true - * @requiresProject true * @since 1.0.0 */ public abstract class AbstractRedmineMojo extends AbstractPlugin implements RedmineServiceConfiguration { Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -302,6 +302,10 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + if (xmlPath == null || xmlPath.getAbsolutePath().trim().isEmpty()) { throw new MojoExecutionException("required a xmlPath parameter"); } @@ -312,17 +316,7 @@ versionId = PluginHelper.removeSnapshotSuffix(versionId); - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } - } - - if (isGoalSkip()) { - getLog().warn("The goal is skip due to the skipGoal flag on"); + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { return; } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -174,7 +174,17 @@ @Override protected boolean checkRunOnceDone() { - return isRunOnce() && !isExecutionRoot(); + // compute unique key + StringBuilder buffer = new StringBuilder("next-version"); + buffer.append("##").append(projectId); + buffer.append("##").append(versionId); + buffer.append("##").append(releaseVersion); + buffer.append("##").append(versionDescription); + buffer.append("##").append(previousVersionName); + + String key = buffer.toString(); + + return !needInvoke(runOnce, false, key); } /////////////////////////////////////////////////////////////////////////// @@ -184,19 +194,18 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + if (StringUtils.isBlank(versionId)) { throw new MojoExecutionException("required a versionId parameter"); } versionId = PluginHelper.removeSnapshotSuffix(versionId); - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { + return; } if (StringUtils.isNotBlank(effectiveDate)) { Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -166,7 +166,16 @@ @Override protected boolean checkRunOnceDone() { - return isRunOnce() && !isExecutionRoot(); + + // compute unique key + StringBuilder buffer = new StringBuilder("publish-attachments"); + for (File allFile : allFiles) { + buffer.append("##").append(allFile); + } + + String key = buffer.toString(); + + return !needInvoke(runOnce, false, key); } /////////////////////////////////////////////////////////////////////////// @@ -176,6 +185,10 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + versionId = PluginHelper.removeSnapshotSuffix(versionId); if (filesFromProperties != null && !filesFromProperties.exists()) { @@ -201,13 +214,8 @@ return; } - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { + return; } super.init(); Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -150,7 +150,15 @@ @Override protected boolean checkRunOnceDone() { - return isRunOnce() && !isExecutionRoot(); + // compute unique key + StringBuilder buffer = new StringBuilder("publish-news"); + buffer.append("##").append(newsTitle); + buffer.append("##").append(newsSummary); + buffer.append("##").append(newsContentFile); + + String key = buffer.toString(); + + return !needInvoke(runOnce, false, key); } @Override @@ -165,6 +173,10 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + runOnceDone = false; if (isRunOnce()) { Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -63,7 +63,7 @@ protected boolean anonymous; /** - * The news description to update to redmine server. + * The version description to update to redmine server. * * Note : if not set, no update of the description will be made. * @@ -192,7 +192,17 @@ @Override protected boolean checkRunOnceDone() { - return isRunOnce() && !isExecutionRoot(); + // compute unique key + StringBuilder buffer = new StringBuilder("update-version"); + buffer.append("##").append(projectId); + buffer.append("##").append(versionId); + buffer.append("##").append(releaseVersion); + buffer.append("##").append(versionDescription); + buffer.append("##").append(versionStatus); + + String key = buffer.toString(); + + return !needInvoke(runOnce, false, key); } /////////////////////////////////////////////////////////////////////////// @@ -202,19 +212,18 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + if (StringUtils.isBlank(versionId)) { throw new MojoExecutionException("required a versionId parameter"); } versionId = PluginHelper.removeSnapshotSuffix(versionId); - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { + return; } if (StringUtils.isNotBlank(effectiveDate)) { Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -44,7 +44,6 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @requiresOnline true */ public abstract class AbstractAnnouncementMojo extends AbstractRedmineMojoWithProjectAndVersion implements AnnouncementGeneratorConfiguration { @@ -128,7 +127,7 @@ * * @since 1.0.0 */ - @Parameter(property = "project.groupId", readonly = true) + @Parameter(property = "session.topLevelProject.groupId", readonly = true) protected String groupId; /** @@ -136,7 +135,7 @@ * * @since 1.0.0 */ - @Parameter(property = "project.artifactId", readonly = true) + @Parameter(property = "session.topLevelProject.artifactId", readonly = true) protected String artifactId; /** @@ -144,7 +143,7 @@ * * @since 1.0.0 */ - @Parameter(property = "redmine.projectUrl", defaultValue = "${project.url}", required = true) + @Parameter(property = "redmine.projectUrl", defaultValue = "${session.topLevelProject.url}", required = true) protected String projectUrl; /** @@ -160,7 +159,7 @@ * * @since 1.0.0 */ - @Parameter(property = "redmine.finalName", defaultValue = "${project.build.finalName}", required = true) + @Parameter(property = "redmine.finalName", defaultValue = "${session.topLevelProject.build.finalName}", required = true) protected String finalName; /** @@ -187,7 +186,7 @@ * @required * @since 1.0.0 */ - @Parameter(property = "redmine.developmentTeam", defaultValue = "${project.name} team", required = true) + @Parameter(property = "redmine.developmentTeam", defaultValue = "${session.topLevelProject.name} team", required = true) protected String developmentTeam; /** @@ -195,7 +194,7 @@ * * @since 1.0.0 */ - @Parameter(property = "redmine.introduction", defaultValue = "${project.description}") + @Parameter(property = "redmine.introduction", defaultValue = "${session.topLevelProject.description}") protected String introduction; /** @@ -360,17 +359,16 @@ @Override protected boolean checkRunOnceDone() { - String template = getAnnouncementTemplate(); File out = getOutputFile(); Date buildStartTime = session == null ? null : session.getStartTime(); Date newStartTime = out.exists() ? new Date(out.lastModified()) : null; - boolean checkRunOnceDone = checkRunOnceDone(runOnce, - true, - buildStartTime, - newStartTime + boolean needInvoke = needInvoke(runOnce, + false, + buildStartTime, + newStartTime ); - return checkRunOnceDone; + return !needInvoke; } /////////////////////////////////////////////////////////////////////////// @@ -380,15 +378,14 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + versionId = PluginHelper.removeSnapshotSuffix(versionId); - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { + return; } if (!xmlPath.exists()) { @@ -403,9 +400,9 @@ templateEncoding + ", i.e. build is platform dependent!"); } - if (StringUtils.isEmpty(introduction)) { - introduction = project.getUrl(); - } +// if (StringUtils.isEmpty(introduction)) { +// introduction = project.getUrl(); +// } generator = new AnnouncementGenerator(this);

1 0

r402 - trunk
by tchemit＠users.nuiton.org 07 Aug '13

07 Aug '13

Author: tchemit Date: 2013-08-07 19:09:19 +0200 (Wed, 07 Aug 2013) New Revision: 402 Url: http://nuiton.org/projects/jredmine/repository/revisions/402 Log: refs #2411: Updates to helper-maven-plugin 2.1 fixes #2424: Updates to mavenpom 3.4.13 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-29 11:28:45 UTC (rev 401) +++ trunk/pom.xml 2013-08-07 17:09:19 UTC (rev 402) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.7</version> + <version>3.4.13</version> </parent> <artifactId>jredmine</artifactId> @@ -60,6 +60,7 @@  <jredminePluginVersion>1.5.1</jredminePluginVersion> + <helperPluginVersion>2.1-SNAPSHOT</helperPluginVersion> <doxiaVersion>1.3</doxiaVersion>

1 0