From cdd3cc4a0bc1df732ec33dff958d0cd5c3ee232e Mon Sep 17 00:00:00 2001 From: Andy Herrick Date: Wed, 29 Jan 2020 14:35:04 -0500 Subject: [PATCH 1/2] 8238168: Remove Copyright from WinLauncher.template Reviewed-by: kcr, prr, asemenyuk --- .../internal/resources/WinLauncher.template | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinLauncher.template b/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinLauncher.template index f37a2b82f29..d17a31662d0 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinLauncher.template +++ b/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinLauncher.template @@ -1,29 +1,3 @@ -# -# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code 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 Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# -# - CompanyName=COMPANY_NAME FileDescription=FILE_DESCRIPTION FileVersion=FILE_VERSION From 06bf842d9ae22576752f6cf1969572b6004cd01e Mon Sep 17 00:00:00 2001 From: Jesper Wilhelmsson Date: Thu, 30 Jan 2020 03:23:28 +0100 Subject: [PATCH 2/2] Added tag jdk-14+34 for changeset a96bc204e3b3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 24a1ee83ead..51935add895 100644 --- a/.hgtags +++ b/.hgtags @@ -608,3 +608,4 @@ d54ce919da90dab361995bb4d87be9851f00537a jdk-14+31 decd3d2953b640f1043ee76953ff89238bff92e8 jdk-14+31 2776da28515e087cc8849acf1e131a65ea7e77b6 jdk-14+32 f728b6c7f4910d6bd6070cb4dde8393f4ba95113 jdk-14+33 +a96bc204e3b31ddbf909b20088964112f052927e jdk-14+34