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

r33 - in trunk/maven-jredmine-plugin/src/it: multi report single single/src single/src/main single/src/main/java single/src/main/java/org single/src/main/java/org/nuiton single/src/main/java/org/nuiton/jredmine single/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 21:36:11 +0100 (Fri, 30 Oct 2009) New Revision: 33 Added: trunk/maven-jredmine-plugin/src/it/single/src/ trunk/maven-jredmine-plugin/src/it/single/src/main/ trunk/maven-jredmine-plugin/src/it/single/src/main/java/ trunk/maven-jredmine-plugin/src/it/single/src/main/java/org/ trunk/maven-jredmine-plugin/src/it/single/src/main/java/org/nuiton/ trunk/maven-jredmine-plugin/src/it/single/src/main/java/org/nuiton/jredmine/ trunk/maven-jredmine-plugin/src/it/single/src/main/java/org/nuiton/jredmine/plugin/ trunk/maven-jredmine-plugin/src/it/single/src/main/java/org/nuiton/jredmine/plugin/MyClass.java Modified: trunk/maven-jredmine-plugin/src/it/multi/pom.xml trunk/maven-jredmine-plugin/src/it/report/invoker.properties trunk/maven-jredmine-plugin/src/it/report/pom.xml trunk/maven-jredmine-plugin/src/it/single/pom.xml Log: make its reworks (use maven-helper-plugin to have secrets) Modified: trunk/maven-jredmine-plugin/src/it/multi/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/multi/pom.xml 2009-10-30 20:27:43 UTC (rev 32) +++ trunk/maven-jredmine-plugin/src/it/multi/pom.xml 2009-10-30 20:36:11 UTC (rev 33) @@ -70,6 +70,18 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-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>  <execution> <id>collect-files</id> Modified: trunk/maven-jredmine-plugin/src/it/report/invoker.properties =================================================================== --- trunk/maven-jredmine-plugin/src/it/report/invoker.properties 2009-10-30 20:27:43 UTC (rev 32) +++ trunk/maven-jredmine-plugin/src/it/report/invoker.properties 2009-10-30 20:36:11 UTC (rev 33) @@ -1,6 +1,6 @@ # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project -invoker.goals=clean site +invoker.goals=clean initialize site # Optionally, a list of goals to run during further invocations of Maven #invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run Modified: trunk/maven-jredmine-plugin/src/it/report/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/report/pom.xml 2009-10-30 20:27:43 UTC (rev 32) +++ trunk/maven-jredmine-plugin/src/it/report/pom.xml 2009-10-30 20:36:11 UTC (rev 33) @@ -19,8 +19,8 @@ --> <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</groupId> @@ -30,18 +30,22 @@ <name>JRedmine report</name> <packaging>pom</packaging> <description>Test JRedmine plugin reports</description> - + <url>http://www.foo.com</url> - + <issueManagement> <system>redmine</system> <url>http://www.mynuiton.org/projects/one/issues</url> </issueManagement> <properties> - + <pluginVersion>@pom.version@</pluginVersion> + <redmine.serverId>redmine-local</redmine.serverId> + <redmine.projectId>one</redmine.projectId> + <redmine.versionId>1.0.0</redmine.versionId> +  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -49,6 +53,29 @@  </properties> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.0.3</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> @@ -62,7 +89,8 @@ <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> + <columnNames>key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn + </columnNames> </configuration> <reportSets> <reportSet> @@ -80,5 +108,5 @@ </plugins> </reporting> - + </project> Modified: trunk/maven-jredmine-plugin/src/it/single/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/single/pom.xml 2009-10-30 20:27:43 UTC (rev 32) +++ trunk/maven-jredmine-plugin/src/it/single/pom.xml 2009-10-30 20:36:11 UTC (rev 33) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <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</groupId> @@ -11,9 +11,9 @@ <name>JRedmine single</name> <packaging>jar</packaging> <description>Test JRedmine plugin for a single module.</description> - + <url>http://www.foo.com</url> - + <issueManagement> <system>redmine</system> <url>http://www.mynuiton.org/projects/one/issues</url> @@ -33,12 +33,12 @@ <redmine.versionId>1.0.0</redmine.versionId> <redmine.url>http://www.mynuiton.org</redmine.url> - <releaseFiles>${basedir}/pom.xml</releaseFiles> + <releaseFiles>${basedir}/pom.xml,${basedir}/verify.groovy</releaseFiles> <collectedFiles>target/collect.properties</collectedFiles> - + </properties> - + <build> <pluginManagement> @@ -63,6 +63,18 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-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>  <execution> <id>collect-files</id> @@ -105,7 +117,7 @@ <urlDownload>http://www.mynuiton.org/projects/list_files/one</urlDownload> </configuration> </execution> - + <execution> <id>publish-redmine</id> <goals> @@ -120,6 +132,8 @@   + <verbose>true</verbose> +  <closeVersion>true</closeVersion> <versionDescription>éàçè`a</versionDescription> @@ -128,21 +142,10 @@ <filesFromProperties>${collectedFiles}</filesFromProperties>  - <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> + <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm + </newsContentFile> <newsSummary>${project.description}</newsSummary> <newsTitle>${project.name} ${project.version} released</newsTitle> - </configuration> </execution> </executions> @@ -151,5 +154,5 @@ </plugins> </build> - + </project> Added: trunk/maven-jredmine-plugin/src/it/single/src/main/java/org/nuiton/jredmine/plugin/MyClass.java =================================================================== --- trunk/maven-jredmine-plugin/src/it/single/src/main/java/org/nuiton/jredmine/plugin/MyClass.java (rev 0) +++ trunk/maven-jredmine-plugin/src/it/single/src/main/java/org/nuiton/jredmine/plugin/MyClass.java 2009-10-30 20:36:11 UTC (rev 33) @@ -0,0 +1,5 @@ +package org.nuiton.jredmine.plugin; + +public class MyClass { + +} \ No newline at end of file Property changes on: trunk/maven-jredmine-plugin/src/it/single/src/main/java/org/nuiton/jredmine/plugin/MyClass.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0

r32 - trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 21:27:43 +0100 (Fri, 30 Oct 2009) New Revision: 32 Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java Log: clean code Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-10-30 20:27:01 UTC (rev 31) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-10-30 20:27:43 UTC (rev 32) @@ -303,7 +303,7 @@ if (isSafe()) { - String message = null; + String message; if (error != null) { message = "safe mode is on and could not init goal [" + getClass().getSimpleName() + "] for reason " + error.getMessage(); } else { @@ -437,10 +437,7 @@ } try { this.releaseProject = service.getProject(projectId); - if (releaseProject == null) { - return false; - } - return true; + return releaseProject != null; } catch (RedmineServiceException e) { getLog().warn("could not retreave project '" + projectId + "', goal is skip"); if (verbose) { Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2009-10-30 20:27:01 UTC (rev 31) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2009-10-30 20:27:43 UTC (rev 32) @@ -113,13 +113,13 @@ RedmineModelScope scope = entry.getScope(); Object[] datas = ((RedmineServiceImplementor) service).getDatas(entry.getModelType(), projectId, versionId); - buffer.append("\nValues of '" + entry).append('\''); + buffer.append("\nValues of '").append(entry).append('\''); if (scope == RedmineModelScope.project || scope == RedmineModelScope.version) { - buffer.append(" for project " + projectId); + buffer.append(" for project ").append(projectId); } buffer.append('\n'); for (Object data : datas) { - buffer.append(" - " + ((IdAble) data).getId()).append(" = ").append(((I18nAble) data).getName()).append('\n'); + buffer.append(" - ").append(((IdAble) data).getId()).append(" = ").append(((I18nAble) data).getName()).append('\n'); } } System.out.println(buffer.toString()); @@ -148,7 +148,7 @@ if (scope == RedmineModelScope.project || scope == RedmineModelScope.version) { // check projectId used - if (projectId == null && projectId.isEmpty()) { + if (projectId == null || projectId.isEmpty()) { throw new MojoFailureException("could not use the data type " + result + " since it is not a project requires and projectId was not filled"); } }

1 0

r31 - trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 21:27:01 +0100 (Fri, 30 Oct 2009) New Revision: 31 Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java Log: comments + show result size Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2009-10-30 20:26:13 UTC (rev 30) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2009-10-30 20:27:01 UTC (rev 31) @@ -84,7 +84,10 @@ * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ - private boolean runOnce; + protected boolean runOnce; + /** + * files to deploy + */ protected List<File> allFiles; public PublishAttachmentsMojo() { @@ -200,7 +203,7 @@ Attachment result = service.addAttachment(projectId, releaseVersion.getName(), a); long t1 = System.nanoTime(); if (verbose) { - getLog().info("done in " + PluginHelper.convertTime(t1 - t0) + ". attachment id : " + result.getId() + ", size : " + PluginHelper.convertMemory(f.length())); + getLog().info("done in " + PluginHelper.convertTime(t1 - t0) + ". attachment id : " + result.getId() + ", size : " + PluginHelper.convertMemory(result.getFilesize())); } } }

1 0

r30 - trunk/jredmine-client/src/main/redmine/jredmine/app/controllers
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 21:26:13 +0100 (Fri, 30 Oct 2009) New Revision: 30 Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb Log: Anomalie #108: les upload ne sont pas valides Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-30 19:51:21 UTC (rev 29) +++ trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-30 20:26:13 UTC (rev 30) @@ -278,12 +278,12 @@ if attachment file = attachment['file'] next unless file && file.size > 0 - a = Attachment.create(:container => container, + a = Attachment.new(:container => container, :file => file, :description => attachment['description'].to_s.strip, :author => User.current) end - if !a.new_record? + if a.save if Setting.notified_events.include?('file_added') array =[] array << a

1 0

r29 - trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 20:51:21 +0100 (Fri, 30 Oct 2009) New Revision: 29 Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueCategory.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueStatus.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Tracker.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java Log: remove comment code Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueCategory.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueCategory.java 2009-10-30 19:29:37 UTC (rev 28) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueCategory.java 2009-10-30 19:51:21 UTC (rev 29) @@ -26,15 +26,7 @@ * @since 1.0.0 */ public class IssueCategory implements IdAble, I18nAble { -// -// public static IssueCategory getIssueCategoryById(Integer id, IssueCategory... categories) { -// for (IssueCategory u : categories) { -// if (u.getId() == id) { -// return u; -// } -// } -// return null; -// } + protected int projectId; protected int assignedToId; protected int id; Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueStatus.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueStatus.java 2009-10-30 19:29:37 UTC (rev 28) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueStatus.java 2009-10-30 19:51:21 UTC (rev 29) @@ -26,15 +26,7 @@ * @since 1.0.0 */ public class IssueStatus implements IdAble, I18nAble { -// -// public static IssueStatus getIssueStatusById(Integer id, IssueStatus... statuses) { -// for (IssueStatus u : statuses) { -// if (u.getId() == id) { -// return u; -// } -// } -// return null; -// } + protected int id; protected int position; protected boolean isClosed; Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Tracker.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Tracker.java 2009-10-30 19:29:37 UTC (rev 28) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Tracker.java 2009-10-30 19:51:21 UTC (rev 29) @@ -26,15 +26,7 @@ * @since 1.0.0 */ public class Tracker implements IdAble, I18nAble { -// -// public static Tracker getTrackerById(int id,Tracker... trackers) { -// for (Tracker u : trackers) { -// if (u.getId() == id) { -// return u; -// } -// } -// return null; -// } + protected int id; protected int projectId; protected int trackerId; Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java 2009-10-30 19:29:37 UTC (rev 28) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java 2009-10-30 19:51:21 UTC (rev 29) @@ -29,24 +29,7 @@ * @since 1.0.0 */ public class User implements IdAble, I18nAble { -// -// public static User getUserByLogin(String login, User... users) { -// for (User u : users) { -// if (u.getLogin().equals(login)) { -// return u; -// } -// } -// return null; -// } -// -// public static User getUserById(int id, User... users) { -// for (User u : users) { -// if (u.getId() == id) { -// return u; -// } -// } -// return null; -// } + protected boolean admin; protected boolean mailNotification; protected int id; Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java 2009-10-30 19:29:37 UTC (rev 28) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java 2009-10-30 19:51:21 UTC (rev 29) @@ -28,24 +28,7 @@ * @since 1.0.0 */ public class Version implements IdAble, I18nAble { -// -// public static Version getVersionByName(String login, Version... versions) { -// for (Version u : versions) { -// if (u.getName().equals(login)) { -// return u; -// } -// } -// return null; -// } -// -// public static Version getVersionById(int id, Version... versions) { -// for (Version u : versions) { -// if (u.getId() == id) { -// return u; -// } -// } -// return null; -// } + protected Date createdOn; protected Date updatedOn; protected Date effectiveDate;

1 0

r28 - trunk/jredmine-client/src/main/redmine/jredmine/app/controllers
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 20:29:37 +0100 (Fri, 30 Oct 2009) New Revision: 28 Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb Log: try to detetc if file was upload Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-30 19:20:49 UTC (rev 27) +++ trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-30 19:29:37 UTC (rev 28) @@ -283,7 +283,7 @@ :description => attachment['description'].to_s.strip, :author => User.current) end - if a.new_record? + if !a.new_record? if Setting.notified_events.include?('file_added') array =[] array << a

1 0

r27 - trunk/jredmine-client/src/main/redmine/jredmine/app/controllers
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 20:20:49 +0100 (Fri, 30 Oct 2009) New Revision: 27 Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb Log: try to detetc if file was upload Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-30 17:56:36 UTC (rev 26) +++ trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-30 19:20:49 UTC (rev 27) @@ -283,7 +283,7 @@ :description => attachment['description'].to_s.strip, :author => User.current) end - if a.save + if a.new_record? if Setting.notified_events.include?('file_added') array =[] array << a

1 0

r26 - trunk/jredmine-client/src/main/redmine/jredmine/app/controllers
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 18:56:36 +0100 (Fri, 30 Oct 2009) New Revision: 26 Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb Log: try to detetc if file was upload Modified: trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-30 11:18:10 UTC (rev 25) +++ trunk/jredmine-client/src/main/redmine/jredmine/app/controllers/jredmine_controller.rb 2009-10-30 17:56:36 UTC (rev 26) @@ -283,10 +283,14 @@ :description => attachment['description'].to_s.strip, :author => User.current) end - if a.save && Setting.notified_events.include?('file_added') - array =[] - array << a - Mailer.deliver_attachments_added(array) + if a.save + if Setting.notified_events.include?('file_added') + array =[] + array << a + Mailer.deliver_attachments_added(array) + end + else + render_status 505, "Could not save the file " + a end render_result a end

1 0

r25 - in trunk: . jredmine-client maven-jredmine-plugin
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 12:18:10 +0100 (Fri, 30 Oct 2009) New Revision: 25 Modified: trunk/ trunk/jredmine-client/ trunk/maven-jredmine-plugin/ Log: svn ignore Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target + target *.iml *.ipr *.iws Property changes on: trunk/jredmine-client ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Property changes on: trunk/maven-jredmine-plugin ___________________________________________________________________ Modified: svn:ignore - target + target *.iml

1 0

r24 - in trunk: . jredmine-client maven-jredmine-plugin maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report maven-jredmine-plugin/src/main/resources maven-jredmine-plugin/src/test/java/org/nuiton/jredmine/plugin
by tchemit＠users.nuiton.org 13 Oct '09

13 Oct '09

Author: tchemit Date: 2009-10-13 14:39:14 +0200 (Tue, 13 Oct 2009) New Revision: 24 Removed: trunk/maven-jredmine-plugin/src/main/resources/META-INF/ Modified: trunk/jredmine-client/pom.xml trunk/maven-jredmine-plugin/pom.xml trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java trunk/maven-jredmine-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java trunk/pom.xml Log: Evolution #90: ajout d'un mode safe (et none-safe) + improve dependencies (all exclusions in super-pom) Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2009-10-11 21:06:16 UTC (rev 23) +++ trunk/jredmine-client/pom.xml 2009-10-13 12:39:14 UTC (rev 24) @@ -22,78 +22,6 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-profile</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> - - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> - - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> - - </exclusions> </dependency> <dependency> Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2009-10-11 21:06:16 UTC (rev 23) +++ trunk/maven-jredmine-plugin/pom.xml 2009-10-13 12:39:14 UTC (rev 24) @@ -33,7 +33,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>maven-helper-plugin</artifactId> </dependency>  @@ -60,63 +60,9 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <exclusions> - <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-provider-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-file</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-error-diagnostics</artifactId> - </exclusion> - - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </exclusion> - - </exclusions> </dependency> <dependency> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </dependency> - - <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> </dependency> @@ -139,35 +85,6 @@ <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <exclusions> - - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-archiver</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-file</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - </exclusion> - - - </exclusions> </dependency> <dependency> Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-10-11 21:06:16 UTC (rev 23) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-10-13 12:39:14 UTC (rev 24) @@ -29,8 +29,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; -import org.apache.maven.settings.Server; -import org.apache.maven.settings.Settings; import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.plugin.AbstractPlugin; import org.nuiton.jredmine.model.ModelHelper; @@ -40,7 +38,6 @@ import org.nuiton.jredmine.RedmineService; import org.nuiton.jredmine.RedmineServiceException; import org.nuiton.jredmine.RedmineServiceImplementor; -import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; /** * Abstract redmine mojo. @@ -63,46 +60,30 @@ */ protected MavenProject project; /** - * Dependance du settings. - * - * @parameter default-value="${settings}" - * @required - * @readonly - * @since 1.0.0 - */ - protected Settings settings; - /** - * Server id to use for authentication (must be defined in your setting - * and use the maven >= 2.1.0 password encryption mecanism). - * <p/> - * - * @parameter expression="${redmine.serverId}" - * @since 1.0.0 - */ - protected String serverId; - /** * The real basedir redmine url. * - * If no url is given, will use the one filled in issue management. + * If no url is given, will use the issue management url. * * @parameter expression="${redmine.url}" * @since 1.0.0 */ - protected URL redmineUrl; + protected URL url; /** * The redmine's server login. * * @parameter expression="${redmine.username}" + * @required * @since 1.0.0 */ - protected String redmineUsername; + protected String username; /** * The redmine's server password. * * @parameter expression="${redmine.password}" + * @required * @since 1.0.0 */ - protected String redminePassword; + protected String password; /** * The encoding used to read and write files. * @@ -133,18 +114,18 @@ */ protected boolean verbose; /** + * Un flag pour faire échouer le build si la configuration n'est pas ok. + * + * @parameter expression="${redmine.safe}" default-value="true" + * @since 1.0.0 + */ + protected boolean safe; + /** * @parameter expression="${session}" * @readonly */ protected MavenSession session; /** - * password decypher - * - * @component roleHint="maven-helper-plugin" - * @since 1.0.0 - */ - protected SecDispatcher sec; - /** * Redmine service. * * @component @@ -198,7 +179,6 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// - @Override protected boolean init() throws Exception { @@ -219,52 +199,10 @@ return false; } - - // check server (if used) - - Server server = null; - - if (serverId != null && !serverId.trim().isEmpty()) { - - server = settings.getServer(serverId); - - if (server == null) { - getLog().error("Could not find server with id '" + serverId + "', check your settings.xml file."); - return false; - } - } - // prepare Redmine service configuration URL url = getRestUrl(); - String username = getRestUsername(); - String password = getRestPassword(); - // check authentication configuration is stable - - boolean noUsername = username == null || username.trim().isEmpty(); - boolean noPassword = password == null || password.trim().isEmpty(); - - if (server != null && !noUsername) { - getLog().error("Authentication configuration is wrong :\ncan not use both 'serverId' and 'redmineUsername' parameters, check your plugin configuration."); - return false; - } - - if (server != null && !noPassword) { - getLog().error("Authentication configuration is wrong :\ncan not use both 'serverId' and 'redminePassword' parameters, check your plugin configuration."); - return false; - } - - if (server == null && noUsername && noPassword) { - getLog().error("Authentication configuration is wrong :\nno configuration is given, please fill parameter 'serverId' or 'redmineUsername' and 'redminePassword'."); - return false; - } - - if (server == null && (noUsername || noPassword)) { - getLog().error("Authentication configuration is wrong :\nconfiguration is not complete, please fill parameter 'serverId' or 'redmineUsername' and 'redminePassword'."); - return false; - } - if (url == null || url.toString().isEmpty()) { // no redmine url specified, guess it from issueManagement @@ -276,18 +214,9 @@ } } - if (server != null) { - // obtain username and password from server - - username = server.getUsername(); - password = sec.decrypt(server.getPassword()); - } - // apply configuration setRestUrl(url); - setRestUsername(username); - setRestPassword(password); if (verbose) { getLog().info("Redmine configuration :\n>> host : " + @@ -302,9 +231,8 @@ ((RedmineServiceImplementor) service).init(this); } catch (Exception e) { - getLog().error("could not init Redmine service [" + getRestUrl() + "] with user '" + getRestUsername() + "'"); if (verbose) { - getLog().error(e); + getLog().error("could not init Redmine service [" + getRestUrl() + "] with user '" + getRestUsername() + "'", e); } return false; } @@ -314,29 +242,27 @@ if (requireProject) { boolean r = initReleaseProject(); if (!r) { - getLog().error("the project '" + projectId + "' could not be retreave from redmine server, goal is skip"); + getLog().error("the project '" + projectId + "' could not be retrieve from redmine server, goal is skip"); return false; } } - // check user exists if (requireUser) { boolean r = initReleaseUser(); if (!r) { - getLog().error("the user '" + redmineUsername + "' could not be retreave from redmine server, goal is skip"); + getLog().error("the user '" + this.username + "' could not be retrieve from redmine server, goal is skip"); return false; } } - // check version exists if (requireVersion) { boolean r = initReleaseVersion(); if (!r) { - getLog().error("the version '" + versionId + "' could not be retreave from redmine server, goal is skip"); + getLog().error("the version '" + versionId + "' could not be retrieve from redmine server, goal is skip"); return false; } } @@ -359,20 +285,47 @@ return; } + Exception error = null; try { try { canContinue = init(); - } catch (MojoExecutionException e) { - throw e; } catch (Exception e) { - throw new MojoExecutionException("could not init goal " + getClass().getSimpleName() + " for reason : " + e.getMessage(), e); + error = e; + + // none safe execution, just warn and not failed the build + canContinue = false; } if (!canContinue) { + + if (isSafe()) { + String message = null; + if (error != null) { + message = "safe mode is on and could not init goal [" + getClass().getSimpleName() + "] for reason " + error.getMessage(); + } else { + message = "safe mode is on and could not init goal [" + getClass().getSimpleName() + "]"; + } + if (isVerbose()) { + if (error != null) { + getLog().error(message, error); + } else { + getLog().error(message); + } + } + + if (error != null) { + if (error instanceof MojoExecutionException) { + throw (MojoExecutionException) error; + } + throw new MojoExecutionException(message, error); + } + throw new MojoExecutionException(message); + } + getLog().warn(skipAfterInitMessage); return; } @@ -436,32 +389,32 @@ /////////////////////////////////////////////////////////////////////////// @Override public String getRestPassword() { - return redminePassword; + return password; } @Override public URL getRestUrl() { - return redmineUrl; + return url; } @Override public String getRestUsername() { - return redmineUsername; + return username; } @Override public void setRestPassword(String restPassword) { - this.redminePassword = restPassword; + this.password = restPassword; } @Override public void setRestUrl(URL restUrl) { - this.redmineUrl = restUrl; + this.url = restUrl; } @Override public void setRestUsername(String restUsername) { - this.redmineUsername = restUsername; + this.username = restUsername; } @Override @@ -474,10 +427,6 @@ this.encoding = encoding; } - protected boolean isRunOnceDone() { - return runOnceDone; - } - /////////////////////////////////////////////////////////////////////////// /// Others /////////////////////////////////////////////////////////////////////////// @@ -532,7 +481,7 @@ try { users = service.getUsers(projectId); - User user = ModelHelper.byLogin(redmineUsername, users); + User user = ModelHelper.byLogin(username, users); if (user == null) { @@ -540,7 +489,7 @@ } this.releaseUser = user; } catch (RedmineServiceException e) { - getLog().warn("could not retreave user '" + redmineUsername + "', goal is skip"); + getLog().warn("could not retreave user '" + username + "', goal is skip"); if (verbose) { getLog().error(e); } @@ -567,4 +516,16 @@ } } } + + public boolean isRunOnceDone() { + return runOnceDone; + } + + public boolean isSafe() { + return safe; + } + + public void setSafe(boolean safe) { + this.safe = safe; + } } Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2009-10-11 21:06:16 UTC (rev 23) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2009-10-13 12:39:14 UTC (rev 24) @@ -113,11 +113,11 @@ /** * Distribution url of the artifact. * - * @parameter expression="${project.url}" + * @parameter expression="${redmine.projectUrl}" default-value="${project.url}" * @required * @since 1.0.0 */ - private String url; + private String projectUrl; /** * Packaging structure for the artifact. * @@ -175,7 +175,7 @@ /** * Velocity Component. * - * @component roleHint="maven-jredmine-plugin" + * @component roleHint="maven-helper-plugin" */ private VelocityComponent velocity; @@ -270,7 +270,7 @@ engine.setApplicationAttribute("baseDirectory", basedir); - AnnouncementGenerator generator = new AnnouncementGenerator(getLog(), url, ""); + AnnouncementGenerator generator = new AnnouncementGenerator(getLog(), projectUrl, ""); // AnnouncementGenerator generator = new AnnouncementGenerator(getLog(), url, attachmentLinkTemplate); Context context = createVelocityContext(generator, releases); @@ -293,7 +293,7 @@ context.put("version", versionId); // context.put("version", releaseVersion.getName()); context.put("packaging", packaging); - context.put("url", url); + context.put("url", projectUrl); Release release = generator.getLatestRelease(releases, versionId); // Release release = generator.getLatestRelease(releases, releaseVersion.getName()); Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2009-10-11 21:06:16 UTC (rev 23) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2009-10-13 12:39:14 UTC (rev 24) @@ -92,14 +92,16 @@ @Override public boolean init() throws Exception { + setVersionId(PluginHelper.removeSnapshotSuffix(getVersionId())); + boolean result = super.init(); - if (result) { +// if (result) { +// +// setVersionId(PluginHelper.removeSnapshotSuffix(getVersionId())); +// +// } - setVersionId(PluginHelper.removeSnapshotSuffix(getVersionId())); - - } - - return true; + return result; } /////////////////////////////////////////////////////////////////////////// @@ -144,7 +146,7 @@ report.setIssueLinkTemplate(getIssueLinkTemplate()); report.setVersionLinkTemplate(getVersionLinkTemplate()); - report.setUrl(redmineUrl.toString()); + report.setUrl(url.toString()); report.setIssues(issues); report.setUsers(service.getUsers(id)); Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2009-10-11 21:06:16 UTC (rev 23) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2009-10-13 12:39:14 UTC (rev 24) @@ -184,16 +184,29 @@ @Override public boolean canGenerateReport() { boolean init = false; - - if (settings.isOffline()) { + if (getLog().isDebugEnabled()) { + getLog().debug("check can use report"); + } + if (session.getSettings().isOffline()) { // skip when offline - getLog().info("Skip \"" + getName(Locale.ENGLISH) + "\" report (offline)."); - return init; + getLog().info("Skipped \"" + getName(Locale.ENGLISH) + "\" report in offline mode."); + } else { + try { + init = init(); + } catch (Exception ex) { + if (isVerbose()) { + getLog().error("could not init report goal for reason " + ex.getMessage(), ex); + } else { + getLog().error("could not init report goal for reason " + ex.getMessage()); + } + init = false; + } + if (!init) { + getLog().info("Skipped \"" + getName(Locale.ENGLISH) + "\" report, goal could be initialized."); + } } - try { - init = init(); - } catch (Exception ex) { - init = false; + if (getLog().isDebugEnabled()) { + getLog().debug("check can use report : " + init); } return init; } Modified: trunk/maven-jredmine-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java =================================================================== --- trunk/maven-jredmine-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java 2009-10-11 21:06:16 UTC (rev 23) +++ trunk/maven-jredmine-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java 2009-10-13 12:39:14 UTC (rev 24) @@ -49,7 +49,7 @@ protected void beforeMojoInit(P mojo, File pomFile) throws Exception { // add a issue management IssueManagement i = new IssueManagement(); - i.setSystem("redmine"); + i.setSystem(AbstractRedmineMojo.REDMINE_SYSTEM); i.setUrl(mojo.getRestUrl() + "/projects/one/issues"); mojo.getProject().setIssueManagement(i); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-11 21:06:16 UTC (rev 23) +++ trunk/pom.xml 2009-10-13 12:39:14 UTC (rev 24) @@ -26,10 +26,88 @@ <scope>compile</scope> <exclusions> <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-provider-api</artifactId> - </exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> + </exclusions> + +  </dependency>  @@ -73,13 +151,71 @@ <artifactId>maven-core</artifactId> <version>${maven.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-provider-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http-lightweight</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-file</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-error-diagnostics</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + + </exclusions> </dependency> - <dependency> +  <dependency> <groupId>org.apache.maven.plugins</groupId> @@ -94,11 +230,14 @@ <groupId>plexus</groupId> <artifactId>plexus-mail-sender-api</artifactId> </exclusion> - <exclusion> <groupId>plexus</groupId> <artifactId>plexus-mail-sender-javamail</artifactId> </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> </exclusions> </dependency> <!-- @@ -117,7 +256,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.9</version> + <version>1.2.14</version> <scope>runtime</scope> </dependency> @@ -129,6 +268,37 @@ <version>${helper.version}</version> <scope>test</scope> <classifier>tests</classifier> + <exclusions> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> + + </exclusions> </dependency> <dependency> @@ -136,6 +306,35 @@ <artifactId>maven-plugin-testing-harness</artifactId> <version>1.2</version> <scope>test</scope> + <exclusions> + + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-archiver</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http-lightweight</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-file</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-api</artifactId> + </exclusion> + + + </exclusions> </dependency> <dependency>

1 0