You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2015/10/26 01:06:52 UTC
svn commit: r1710498 - in /maven/plugins/trunk/maven-changes-plugin/src:
main/java/org/apache/maven/plugin/github/GitHubDownloader.java
test/java/org/apache/maven/plugin/github/
test/java/org/apache/maven/plugin/github/GitHubDownloaderTestCase.java
Author: olamy
Date: Mon Oct 26 00:06:52 2015
New Revision: 1710498
URL: http://svn.apache.org/viewvc?rev=1710498&view=rev
Log:
GitHub issue ids don't appear in announcement.vm
Fix for [MCHANGES-361](https://issues.apache.org/jira/browse/MCHANGES-361)
When you generate a github announcement velocity file with default configuration for `announcement.vm`, you get:
```
Fixed Bugs:
o Async initialization of Node and Client are broken after Elasticsearch 2 upgrade
Changes:
o Update to beyonder 2.0.0
o Update to elasticsearch 2.0.0
```
As links and github ids exist, it should be:
```
Fixed Bugs:
o Async initialization of Node and Client are broken after Elasticsearch 2 upgrade Issue: 74.
Changes:
o Update to beyonder 2.0.0 Issue: 76.
o Update to elasticsearch 2.0.0 Issue: 73.
```
Signed-off-by: Olivier Lamy <ol...@apache.org>
Added:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/github/
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/github/GitHubDownloaderTestCase.java (with props)
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubDownloader.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubDownloader.java?rev=1710498&r1=1710497&r2=1710498&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubDownloader.java Mon Oct 26 00:06:52 2015
@@ -122,10 +122,11 @@ public class GitHubDownloader
this.githubRepo = urlPathParts[1];
}
- private Issue createIssue( org.eclipse.egit.github.core.Issue githubIssue )
+ protected Issue createIssue( org.eclipse.egit.github.core.Issue githubIssue )
{
Issue issue = new Issue();
+ issue.setKey( String.valueOf( githubIssue.getNumber() ) );
issue.setId( String.valueOf( githubIssue.getNumber() ) );
issue.setLink( this.githubIssueURL + githubIssue.getNumber() );
@@ -148,7 +149,7 @@ public class GitHubDownloader
issue.setTitle( githubIssue.getTitle() );
- issue.setSummary( githubIssue.getTitle() );
+ issue.setSummary( githubIssue.getBody() );
if ( githubIssue.getMilestone() != null )
{
Added: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/github/GitHubDownloaderTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/github/GitHubDownloaderTestCase.java?rev=1710498&view=auto
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/github/GitHubDownloaderTestCase.java (added)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/github/GitHubDownloaderTestCase.java Mon Oct 26 00:06:52 2015
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.maven.plugin.github;
+
+import junit.framework.TestCase;
+import org.apache.maven.model.IssueManagement;
+import org.apache.maven.plugin.issues.Issue;
+import org.apache.maven.project.MavenProject;
+import org.eclipse.egit.github.core.User;
+
+import java.io.IOException;
+
+public class GitHubDownloaderTestCase extends TestCase {
+ public void testCreateIssue() throws IOException {
+
+ MavenProject mavenProject = new MavenProject();
+ IssueManagement issueManagement = new IssueManagement();
+ issueManagement.setSystem("GitHub");
+ issueManagement.setUrl("https://github.com/dadoonet/spring-elasticsearch/issues/");
+ mavenProject.setIssueManagement(issueManagement);
+
+ GitHubDownloader gitHubDownloader = new GitHubDownloader(
+ mavenProject, "https", 80, true, false
+ );
+
+ org.eclipse.egit.github.core.Issue githubIssue = new org.eclipse.egit.github.core.Issue();
+ githubIssue.setNumber(1);
+ githubIssue.setBody("Body");
+ githubIssue.setTitle("Title");
+ User user = new User();
+ githubIssue.setUser(user);
+
+ Issue issue = gitHubDownloader.createIssue(githubIssue);
+
+ assertEquals(Integer.toString(githubIssue.getNumber()), issue.getId());
+ assertEquals(Integer.toString(githubIssue.getNumber()), issue.getKey());
+ assertEquals(githubIssue.getTitle(), issue.getTitle());
+ assertEquals(githubIssue.getBody(), issue.getSummary());
+ assertEquals(issueManagement.getUrl()+githubIssue.getNumber(), issue.getLink());
+ }
+}
Propchange: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/github/GitHubDownloaderTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/github/GitHubDownloaderTestCase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision