From e172e0331cc0eaddd19811fb21518ab8f4d21947 Mon Sep 17 00:00:00 2001
From: Dmitrii Tikhomirov <chani.liet@gmail.com>
Date: Wed, 20 Nov 2024 09:55:17 -0800
Subject: [PATCH] post release cleanup

---
 closure-compiler/maven/pom.xml                | 99 +++++++++++--------
 .../com/vertispan/j2cl/mojo/WatchMojo.java    |  7 +-
 j2cl-maven-plugin/j2cl-tasks/pom.xml          |  6 --
 j2cl/maven/backend-closure/pom.xml            |  2 +-
 j2cl/maven/pom.xml                            |  2 +-
 5 files changed, 63 insertions(+), 53 deletions(-)

diff --git a/closure-compiler/maven/pom.xml b/closure-compiler/maven/pom.xml
index 5b458ed073..6d6bce8d9e 100644
--- a/closure-compiler/maven/pom.xml
+++ b/closure-compiler/maven/pom.xml
@@ -26,6 +26,40 @@
   <name>Closure Compiler Unshaded</name>
   <version>v20241106-1</version>
 
+  <issueManagement>
+    <system>GitHub Issues</system>
+    <url>http://github.com/vertispan/closure-compiler/issues</url>
+  </issueManagement>
+
+  <developers>
+    <developer>
+      <id>closure-compiler-authors</id>
+      <name>Closure Compiler Authors</name>
+      <email>closure-compiler-discuss@googlegroups.com</email>
+    </developer>
+    <developer>
+      <name>Colin Alworth</name>
+      <email>colin@vertispan.com</email>
+      <organization>Vertispan LLC</organization>
+      <organizationUrl>https://www.vertispan.com/</organizationUrl>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <scm>
+    <url>http://github.com/google/closure-compiler</url>
+    <connection>scm:git:git://github.com/google/closure-compiler.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/google/closure-compiler.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+
   <url>https://developers.google.com/closure/compiler/</url>
   <description>
     Closure Compiler is a JavaScript optimizing compiler. It parses your
@@ -164,57 +198,44 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>${maven.release.plugin}</version>
-        <configuration>
-          <localCheckout>true</localCheckout>
-          <pushChanges>false</pushChanges>
-          <mavenExecutorId>forked-path</mavenExecutorId>
-          <arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.scm</groupId>
-            <artifactId>maven-scm-provider-gitexe</artifactId>
-            <version>${maven.scm.provider.gitexe}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${maven.javadoc.plugin}</version>
-        <configuration>
-          <failOnError>false</failOnError>
-        </configuration>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>javadoc-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <classifier>javadoc</classifier>
+            </configuration>
+          </execution>
+          <execution>
+            <id>sources-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <classifier>sources</classifier>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
 
   <profiles>
+    <!-- release profile to create sources, javadoc, and sign all artifacts before uploading -->
     <profile>
       <id>release</id>
       <build>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <failOnError>false</failOnError>
-            </configuration>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/j2cl-maven-plugin/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/WatchMojo.java b/j2cl-maven-plugin/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/WatchMojo.java
index 07b116a7c6..ab2cd7fa5e 100644
--- a/j2cl-maven-plugin/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/WatchMojo.java
+++ b/j2cl-maven-plugin/j2cl-maven-plugin/src/main/java/com/vertispan/j2cl/mojo/WatchMojo.java
@@ -46,6 +46,7 @@
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Function;
@@ -151,12 +152,6 @@ public class WatchMojo extends AbstractBuildMojo {
     @Parameter(defaultValue = "SORT_ONLY")
     protected String dependencyMode;
 
-    /**
-     * Arguments to pass to annotation processors, in the form of key-value pairs.
-     */
-    @Parameter
-    protected Map<String, String> annotationProcessorsArgs = new TreeMap<>();
-
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         PluginDescriptor pluginDescriptor = (PluginDescriptor) getPluginContext().get("pluginDescriptor");
diff --git a/j2cl-maven-plugin/j2cl-tasks/pom.xml b/j2cl-maven-plugin/j2cl-tasks/pom.xml
index 0c5f4b8d30..66a435896c 100644
--- a/j2cl-maven-plugin/j2cl-tasks/pom.xml
+++ b/j2cl-maven-plugin/j2cl-tasks/pom.xml
@@ -20,12 +20,6 @@
             <groupId>org.kie.j2cl.tools</groupId>
             <artifactId>transpiler</artifactId>
             <version>${j2cl.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.javascript</groupId>
-                    <artifactId>closure-compiler-unshaded</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kie.j2cl.tools</groupId>
diff --git a/j2cl/maven/backend-closure/pom.xml b/j2cl/maven/backend-closure/pom.xml
index e8f339e561..6e4d242c31 100644
--- a/j2cl/maven/backend-closure/pom.xml
+++ b/j2cl/maven/backend-closure/pom.xml
@@ -58,7 +58,7 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.javascript</groupId>
+            <groupId>org.kie.j2cl.tools</groupId>
             <artifactId>closure-compiler-unshaded</artifactId>
         </dependency>
         <dependency>
diff --git a/j2cl/maven/pom.xml b/j2cl/maven/pom.xml
index 0541755825..b4b139e221 100644
--- a/j2cl/maven/pom.xml
+++ b/j2cl/maven/pom.xml
@@ -249,7 +249,7 @@
       </dependency>
 
       <dependency>
-        <groupId>com.google.javascript</groupId>
+        <groupId>org.kie.j2cl.tools</groupId>
         <artifactId>closure-compiler-unshaded</artifactId>
         <version>v20241106-1</version>
         <exclusions>