Fix bad merge

alexeysemenyukoracle · alexeysemenyukoracle · commit 292721575458 · 2025-04-04T09:45:09.000-04:00
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/PackageProperty.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/PackageProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, 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
@@ -25,8 +25,8 @@
 
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.ConfigException;
 import java.text.MessageFormat;
+import jdk.jpackage.internal.model.ConfigException;
 
 final class PackageProperty {
     /**
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CFBundleVersion.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CFBundleVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, 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
@@ -24,8 +24,8 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.DottedVersion;
 import java.math.BigInteger;
+import jdk.jpackage.internal.model.DottedVersion;
 
 
 final class CFBundleVersion {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityImpl.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityImpl.java
@@ -1,9 +1,5 @@
 /*
-<<<<<<<< HEAD:src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityImpl.java
  * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
-========
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
->>>>>>>> master:src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +23,7 @@
  * questions.
  */
 
-package jdk.jpackage.internal.model;
+package jdk.jpackage.internal;
 
 import static jdk.jpackage.internal.CodesignConfig.ADHOC_SIGNING_IDENTITY;
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
@@ -1,10 +1,5 @@
 /*
-<<<<<<<< HEAD:src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
  * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
-========
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
->>>>>>>> master:src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java
- * 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
@@ -27,7 +22,7 @@
  * questions.
  */
 
-package jdk.jpackage.internal.model;
+package jdk.jpackage.internal;
 
 import java.nio.file.Path;
 import java.util.Objects;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, 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
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
@@ -24,8 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.PackagerException;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, 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
@@ -25,10 +25,10 @@
 
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
 import java.nio.file.Path;
 import java.util.Map;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.PackagerException;
 
 /**
  * Bundler
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.jpackage.internal;
 
 import java.nio.file.Path;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
@@ -25,7 +25,6 @@
 
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.PackagerException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java
@@ -35,7 +35,6 @@
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
-import jdk.jpackage.internal.model.PackagerException;
 
 /**
  * IOUtils
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
@@ -24,7 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.model.ConfigException;
 import java.io.File;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
@@ -26,7 +26,6 @@
 package jdk.jpackage.internal;
 
 
-import jdk.jpackage.internal.model.ConfigException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -41,11 +40,10 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.model.ConfigException;
 import static jdk.jpackage.internal.ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT;
-import jdk.jpackage.internal.util.function.ThrowingFunction;
 import jdk.jpackage.internal.resources.ResourceLocator;
 import static jdk.jpackage.internal.model.RuntimeBuilder.getDefaultModulePath;
-import static jdk.jpackage.internal.util.function.ThrowingBiFunction.toBiFunction;
 
 /**
  * Standard bundler parameters.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ToolValidator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ToolValidator.java
@@ -24,8 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.DottedVersion;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.DottedVersion;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/MultiResourceBundle.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/MultiResourceBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixFragmentBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixFragmentBuilder.java
@@ -24,8 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.WinMsiPackage;
-import jdk.jpackage.internal.model.DottedVersion;
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -44,6 +42,7 @@
 import jdk.jpackage.internal.WixSourceConverter.ResourceGroup;
 import jdk.jpackage.internal.WixToolset.WixToolsetType;
 import jdk.jpackage.internal.model.DottedVersion;
+import jdk.jpackage.internal.model.WinMsiPackage;
 import jdk.jpackage.internal.util.XmlUtils;
 
 /**
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java
@@ -24,8 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.DottedVersion;
 import java.io.IOException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixToolset.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixToolset.java
@@ -24,7 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.DottedVersion;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.Set;
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java
@@ -26,7 +26,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import jdk.jpackage.internal.model.PackagerException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`