Spotless and fix plugin publishing.

Author: ntwigg

gradle.properties

@@ -5,7 +5,7 @@ org=diffplug
 license=apache
 git_url=github.com/diffplug/webtools
 plugin_tags=node
-plugin_list=node jte
+plugin_list=node jte flywayjooq
 
 ver_java=21
 
@@ -20,3 +20,8 @@ plugin_jte_id=com.diffplug.webtools.jte
 plugin_jte_impl=com.diffplug.webtools.jte.JtePlugin
 plugin_jte_name=DiffPlug JTE
 plugin_jte_desc=Runs the JTE plugin and adds typesafe model classes
+
+plugin_flywayjooq_id=com.diffplug.webtools.flywayjooq
+plugin_flywayjooq_impl=com.diffplug.webtools.flywayjooq.FlywayJooqPlugin
+plugin_flywayjooq_name=DiffPlug Flyway jOOQ
+plugin_flywayjooq_desc=Coordinates Docker Compose, Flyway, and jOOQ for fast testing and easy deployment. 

src/main/java/com/diffplug/webtools/flywayjooq/FlywayJooqPlugin.java

@@ -1,5 +1,25 @@
+/*
+ * Copyright (C) 2025 DiffPlug
+ *
+ * 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
+ *
+ *     https://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.diffplug.webtools.flywayjooq;
 
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.inject.Inject;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
@@ -16,12 +36,6 @@
 import org.gradle.api.tasks.TaskProvider;
 import org.jooq.codegen.gradle.CodegenPluginExtension;
 
-import javax.inject.Inject;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
  * This plugin spools up a fresh postgres session,
  * runs flyway on it, then runs jooq on the result.
@@ -34,9 +48,8 @@ public class FlywayJooqPlugin implements Plugin<Project> {
 	public static class Extension extends CodegenPluginExtension {
 		@Inject
 		public Extension(
-			ObjectFactory objects,
-			ProjectLayout layout
-		) {
+				ObjectFactory objects,
+				ProjectLayout layout) {
 			super(objects, layout);
 		}
 
@@ -131,7 +144,6 @@ public void dockerDown() throws Exception {
 		}
 	}
 
-
 	/** Detects the jooq version. */
 	private static String detectJooqVersion() {
 		URLClassLoader loader = (URLClassLoader) FlywayJooqPlugin.class.getClassLoader();

src/main/java/com/diffplug/webtools/flywayjooq/JooqTask.java

@@ -1,7 +1,24 @@
+/*
+ * Copyright (C) 2025 DiffPlug
+ *
+ * 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
+ *
+ *     https://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.diffplug.webtools.flywayjooq;
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.base.Throwables;
+import java.io.File;
+import java.net.ConnectException;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.DirectoryProperty;
@@ -11,9 +28,6 @@
 import org.jooq.meta.jaxb.Generator;
 import org.jooq.meta.jaxb.Logging;
 
-import java.io.File;
-import java.net.ConnectException;
-
 @CacheableTask
 public abstract class JooqTask extends DefaultTask {
 	SetupCleanupDockerFlyway setup;
@@ -59,4 +73,3 @@ public void generate() throws Exception {
 		}
 	}
 }
-

src/main/java/com/diffplug/webtools/flywayjooq/SetupCleanupDockerFlyway.java

@@ -1,9 +1,25 @@
+/*
+ * Copyright (C) 2025 DiffPlug
+ *
+ * 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
+ *
+ *     https://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.diffplug.webtools.flywayjooq;
 
 import com.diffplug.common.base.Either;
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.base.Throwables;
 import com.diffplug.common.base.Throwing;
+import com.diffplug.webtools.node.SetupCleanup;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Files;
@@ -15,12 +31,6 @@
 import com.palantir.docker.compose.execution.DockerCompose;
 import com.palantir.docker.compose.execution.DockerComposeExecArgument;
 import com.palantir.docker.compose.execution.DockerComposeExecOption;
-import org.flywaydb.core.Flyway;
-import org.gradle.api.GradleException;
-import org.postgresql.ds.PGSimpleDataSource;
-import webtools.Env;
-import com.diffplug.webtools.node.SetupCleanup;
-
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
@@ -29,6 +39,10 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import org.flywaydb.core.Flyway;
+import org.gradle.api.GradleException;
+import org.postgresql.ds.PGSimpleDataSource;
+import webtools.Env;
 
 public class SetupCleanupDockerFlyway implements Serializable {
 	private static final long serialVersionUID = -8606504827780656288L;
@@ -71,7 +85,6 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 		}
 	}
 
-
 	void forceStop(File projectDir) throws Exception {
 		try {
 			new Impl().doStop(this);
@@ -107,8 +120,8 @@ PGSimpleDataSource getConnection() throws IOException {
 			port = Integer.parseInt(connectionProps.getProperty("port"));
 		}
 		PGSimpleDataSource dataSource = new PGSimpleDataSource();
-		dataSource.setServerNames(new String[] {ip});
-		dataSource.setPortNumbers(new int[] {port});
+		dataSource.setServerNames(new String[]{ip});
+		dataSource.setPortNumbers(new int[]{port});
 		dataSource.setUser("root");
 		dataSource.setPassword("password");
 		dataSource.setDatabaseName("template1");
@@ -144,7 +157,6 @@ public static void keepTrying(Throwing.Runnable toAttempt) {
 		}
 	}
 
-
 	DockerComposeRule rule() {
 		return DockerComposeRule.builder()
 				.file(dockerComposeFile.getAbsolutePath())
@@ -187,19 +199,19 @@ protected void doStart(SetupCleanupDockerFlyway key) throws IOException, Interru
 			PGSimpleDataSource postgres = key.getConnection();
 			keepTrying(() -> {
 				Flyway.configure()
-					.dataSource(postgres)
-					.locations("filesystem:" + key.flywayMigrations.getAbsolutePath())
-					.schemas("public")
-					.load()
-					.migrate();
+						.dataSource(postgres)
+						.locations("filesystem:" + key.flywayMigrations.getAbsolutePath())
+						.schemas("public")
+						.load()
+						.migrate();
 			});
 
 			// write out the schema to disk
 			String schema;
 			List<String> pg_dump_args = Arrays.asList("-d", "template1", "-U", postgres.getUser(), "--schema-only", "--restrict-key=reproduciblediff");
 			if (rule == null) {
-				Process process = Runtime.getRuntime().exec(ImmutableList.<String>builder().add(
-						"pg_dump", 
+				Process process = Runtime.getRuntime().exec(ImmutableList.<String> builder().add(
+						"pg_dump",
 						"-h", GITHUB_IP, "-p", Integer.toString(GITHUB_PORT))
 						.addAll(pg_dump_args).build().toArray(new String[0]));
 				// swallow errors (not great...)
@@ -212,7 +224,7 @@ protected void doStart(SetupCleanupDockerFlyway key) throws IOException, Interru
 				schema = rule.dockerCompose().exec(DockerComposeExecOption.noOptions(),
 						"postgres", DockerComposeExecArgument.arguments(ImmutableList.builder().add("pg_dump")
 								.addAll(pg_dump_args)
-						.build().toArray(new String[0])));
+								.build().toArray(new String[0])));
 			}
 			Files.createParentDirs(key.flywaySchemaDump);
 			Files.write(schema, key.flywaySchemaDump, StandardCharsets.UTF_8);