]> source.dussan.org Git - vaadin-framework.git/commitdiff
Remove unused commit author fetching from build.
authorHenri Sara <hesara@vaadin.com>
Thu, 8 Sep 2016 12:16:13 +0000 (15:16 +0300)
committerVaadin Code Review <review@vaadin.com>
Thu, 8 Sep 2016 12:39:07 +0000 (12:39 +0000)
Change-Id: I36faa94382258d5df40c7f200e5c24805896f100

all/pom.xml
all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java [deleted file]
all/src/main/resources/com/vaadin/buildhelpers/authormap.properties [deleted file]

index 4adf25b7e74b2e292c9ab98ec8859b00cfdb8910..5468a378a9f8a17c4a24ff967582b70817f8a99e 100644 (file)
@@ -13,7 +13,6 @@
 
        <properties>
                <relnotes.tickets.file>${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html</relnotes.tickets.file>
-               <relnotes.authors.file>${project.build.directory}/generated-resources/releasenotes/release-notes-authors.html</relnotes.authors.file>
                <webcontent.dir>${project.build.outputDirectory}/WebContent/</webcontent.dir>
                <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
        </properties>
                                                        <target>
                                                                <loadfile property="release-notes-tickets" srcFile="${relnotes.tickets.file}"
                                                                        failonerror="false" />
-                                                               <loadfile property="release-notes-authors" srcFile="${relnotes.authors.file}"
-                                                                       failonerror="false" />
                                                                <copy todir="${webcontent.dir}">
                                                                        <fileset dir="src/main/templates/">
                                                                                <patternset>
                                                                                        <token key="gwt-version" value="${vaadin.gwt.version}" />
                                                                                        <token key="builddate" value="${maven.build.timestamp}" />
                                                                                        <token key="release-notes-tickets" value="${release-notes-tickets}" />
-                                                                                       <token key="release-notes-authors" value="${release-notes-authors}" />
                                                                                </replacetokens>
                                                                        </filterchain>
                                                                </copy>
                                                                        <outputFile>${relnotes.tickets.file}</outputFile>
                                                                </configuration>
                                                        </execution>
-                                                       <execution>
-                                                               <id>fetch-release-notes-authors</id>
-                                                               <phase>process-classes</phase>
-                                                               <goals>
-                                                                       <goal>exec</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <classpathScope>compile</classpathScope>
-                                                                       <executable>${java.home}/bin/java</executable>
-                                                                       <arguments>
-                                                                               <argument>-Dvaadin.version=${project.version}</argument>
-                                                                               <argument>-classpath</argument>
-                                                                               <classpath />
-
-                                                                               <argument>com.vaadin.buildhelpers.FetchReleaseNotesAuthors
-                                                                               </argument>
-                                                                       </arguments>
-                                                                       <outputFile>${relnotes.authors.file}</outputFile>
-                                                               </configuration>
-                                                       </execution>
                                                </executions>
                                        </plugin>
 
diff --git a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
deleted file mode 100644 (file)
index 72c10e8..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed 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 com.vaadin.buildhelpers;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-public class FetchReleaseNotesAuthors {
-    private static final String template = "<li class=\"author\">@author@</li>";
-
-    public static void main(String[] args)
-            throws IOException, InterruptedException {
-        Properties authorMap = new Properties();
-
-        String authorsFilename = FetchReleaseNotesAuthors.class.getPackage()
-                .getName().replace(".", "/") + "/authormap.properties";
-        InputStream s = FetchReleaseNotesAuthors.class.getClassLoader()
-                .getResourceAsStream(authorsFilename);
-        if (s == null) {
-            System.err.println(
-                    "Author mapping file " + authorsFilename + " not found!");
-        }
-        authorMap.load(s);
-
-        String version = System.getProperty("vaadin.version");
-        String previousVersion = getPreviousVersion(version);
-        // System.out.println("Using previous version: " + previousVersion);
-        // List all commits which are in this version but not in
-        // "previousVersion"
-        String cmd = "git log --pretty=%an HEAD ^origin/" + previousVersion;
-        Process p = Runtime.getRuntime().exec(cmd);
-        p.waitFor();
-        if (p.exitValue() != 0) {
-            System.err.println("Exit code: " + p.exitValue());
-        }
-        BufferedReader b = new BufferedReader(
-                new InputStreamReader(p.getInputStream()));
-        String line = "";
-
-        List<String> authors = new ArrayList<>();
-        while ((line = b.readLine()) != null) {
-            String author = line;
-            if (authorMap.containsKey(author)) {
-                author = authorMap.getProperty(author);
-            }
-            if (author != null && !author.equals("")
-                    && !authors.contains(author)) {
-                authors.add(author);
-            }
-        }
-        Collections.sort(authors);
-        for (String author : authors) {
-            System.out.println(template.replace("@author@", author));
-        }
-    }
-
-    private static String getPreviousVersion(String version) {
-        String[] versionNumbers = version.split("\\.");
-        if (versionNumbers.length > 4 || versionNumbers.length < 3) {
-            throw new IllegalArgumentException(
-                    "Cannot parse version: " + version);
-        }
-        int major = Integer.parseInt(versionNumbers[0]);
-        int minor = Integer.parseInt(versionNumbers[1]);
-        int maintenance = Integer.parseInt(versionNumbers[2]);
-        // String qualifier = versionNumbers[3];
-
-        if (minor == 0) {
-            // Major release, can't know what the previous minor was
-            throw new IllegalArgumentException(
-                    "Can't know what previous minor version was");
-        }
-        if (maintenance == 0) {
-            // Minor release, use last minor
-            return major + "." + (minor - 1);
-        } else {
-            // Maintenance, use last maintenance
-            return major + "." + minor + "." + (maintenance - 1);
-        }
-    }
-}
diff --git a/all/src/main/resources/com/vaadin/buildhelpers/authormap.properties b/all/src/main/resources/com/vaadin/buildhelpers/authormap.properties
deleted file mode 100644 (file)
index 15b8ad2..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-denisanisimov=Denis Anisimov
-joheriks=Johannes Eriksson
-michaelvogt=Michael Vogt
-tapio=Tapio Aali
-Build\ Agent=
-mtzukanov=Michael Tzukanov
\ No newline at end of file