From 05095f52b3e967aa2cb488b1896a0a2b075e8667 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Thu, 8 Sep 2016 15:16:13 +0300 Subject: [PATCH] Remove unused commit author fetching from build. Change-Id: I36faa94382258d5df40c7f200e5c24805896f100 --- all/pom.xml | 24 ----- .../FetchReleaseNotesAuthors.java | 100 ------------------ .../vaadin/buildhelpers/authormap.properties | 6 -- 3 files changed, 130 deletions(-) delete mode 100644 all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java delete mode 100644 all/src/main/resources/com/vaadin/buildhelpers/authormap.properties diff --git a/all/pom.xml b/all/pom.xml index 4adf25b7e7..5468a378a9 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -13,7 +13,6 @@ ${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html - ${project.build.directory}/generated-resources/releasenotes/release-notes-authors.html ${project.build.outputDirectory}/WebContent/ yyyy-MM-dd @@ -114,8 +113,6 @@ - @@ -131,7 +128,6 @@ - @@ -250,26 +246,6 @@ ${relnotes.tickets.file} - - fetch-release-notes-authors - process-classes - - exec - - - compile - ${java.home}/bin/java - - -Dvaadin.version=${project.version} - -classpath - - - com.vaadin.buildhelpers.FetchReleaseNotesAuthors - - - ${relnotes.authors.file} - - 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 index 72c10e892f..0000000000 --- a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java +++ /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 = "
  • @author@
    • "; - - 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 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 index 15b8ad2cba..0000000000 --- a/all/src/main/resources/com/vaadin/buildhelpers/authormap.properties +++ /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 -- 2.39.5