From 550a2d7ad791cc4612ce79a4a543ae5007cf8004 Mon Sep 17 00:00:00 2001
From: "Gunnar Inge G. Sortland" <gi@wgtwo.com>
Date: Fri, 20 Oct 2023 11:11:38 +0200
Subject: [PATCH] Add pre-commit and format XML

---
 .github/workflows/pre-commit.yml       |  16 +++
 .github/workflows/publish-npm.yml      |   1 -
 .pre-commit-config.yaml                |  11 +++
 wgtwo/callforward/v0/callforward.proto |   1 -
 wgtwo/pom-v0.xml                       | 130 +++++++++++++------------
 wgtwo/pom-v1.xml                       |  68 +++++++------
 6 files changed, 132 insertions(+), 95 deletions(-)
 create mode 100644 .github/workflows/pre-commit.yml
 create mode 100644 .pre-commit-config.yaml

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
new file mode 100644
index 0000000..701c45f
--- /dev/null
+++ b/.github/workflows/pre-commit.yml
@@ -0,0 +1,16 @@
+name: pre-commit
+
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request: {}
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: pre-commit
+        uses: pre-commit/action@v3.0.0
diff --git a/.github/workflows/publish-npm.yml b/.github/workflows/publish-npm.yml
index 479c497..0b6ba8a 100644
--- a/.github/workflows/publish-npm.yml
+++ b/.github/workflows/publish-npm.yml
@@ -49,4 +49,3 @@ jobs:
           access: public
           dry-run: false
           check-version: true
-
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..073969c
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,11 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-xml
+      - id: check-added-large-files
diff --git a/wgtwo/callforward/v0/callforward.proto b/wgtwo/callforward/v0/callforward.proto
index cb67738..68e5d6c 100644
--- a/wgtwo/callforward/v0/callforward.proto
+++ b/wgtwo/callforward/v0/callforward.proto
@@ -102,4 +102,3 @@ message CallForwardingResponse {
 
   string error_message = 2;
 }
-
diff --git a/wgtwo/pom-v0.xml b/wgtwo/pom-v0.xml
index 7a2bd10..96b99ad 100644
--- a/wgtwo/pom-v0.xml
+++ b/wgtwo/pom-v0.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,46 +30,48 @@
     </modules>
 
     <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <java.version>1.8</java.version>
-      <grpc.version>1.57.2</grpc.version>
-      <maven.deploy.skip>true</maven.deploy.skip>
-      <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+        <grpc.version>1.57.2</grpc.version>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
     </properties>
 
     <scm>
-      <connection>scm:git:git@github.com:working-group-two/wgtwoapis.git</connection>
-      <developerConnection>scm:git:[push=]git@github.com:working-group-two/wgtwoapis.git[fetch=]git@github.com:working-group-two/wgtwoapis.git</developerConnection>
-      <url>https://github.com/working-group-two/wgtwoapis.git</url>
-      <tag>HEAD</tag>
+        <connection>scm:git:git@github.com:working-group-two/wgtwoapis.git</connection>
+        <developerConnection>
+            scm:git:[push=]git@github.com:working-group-two/wgtwoapis.git[fetch=]git@github.com:working-group-two/wgtwoapis.git
+        </developerConnection>
+        <url>https://github.com/working-group-two/wgtwoapis.git</url>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
-      <repository>
-        <id>ossrh</id>
-        <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-      </repository>
-      <snapshotRepository>
-        <id>ossrh</id>
-        <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-      </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>io.grpc</groupId>
-          <artifactId>grpc-bom</artifactId>
-          <version>${grpc.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-          <version>1.3.2</version>
-        </dependency>
-      </dependencies>
+        <dependencies>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-bom</artifactId>
+                <version>${grpc.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.annotation</groupId>
+                <artifactId>javax.annotation-api</artifactId>
+                <version>1.3.2</version>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
 
     <build>
@@ -85,7 +88,8 @@
                     <version>0.6.1</version>
                     <configuration>
                         <protoSourceRoot>${maven.multiModuleProjectDirectory}</protoSourceRoot>
-                        <protocArtifact>com.google.protobuf:protoc:3.21.12:exe:${os.detected.classifier}</protocArtifact>
+                        <protocArtifact>com.google.protobuf:protoc:3.21.12:exe:${os.detected.classifier}
+                        </protocArtifact>
                         <pluginId>grpc-java</pluginId>
                         <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.52.1:exe:${os.detected.classifier}
                         </pluginArtifact>
@@ -116,8 +120,10 @@
                     <artifactId>maven-release-plugin</artifactId>
                     <version>${maven-release-plugin.version}</version>
                     <configuration>
-                        <scmCommentPrefix>[RELEASE] </scmCommentPrefix>
-                        <tagNameFormat>v${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</tagNameFormat>
+                        <scmCommentPrefix>[RELEASE]</scmCommentPrefix>
+                        <tagNameFormat>
+                            v${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}
+                        </tagNameFormat>
                         <pomFileName>pom-v0.xml</pomFileName>
                     </configuration>
                 </plugin>
@@ -158,7 +164,7 @@
                         </execution>
                     </executions>
                     <configuration>
-                      <failOnError>false</failOnError>
+                        <failOnError>false</failOnError>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -187,39 +193,39 @@
             </plugins>
         </pluginManagement>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
     <licenses>
-      <license>
-        <name>The Apache License, Version 2.0</name>
-        <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      </license>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
     </licenses>
 
     <developers>
-      <developer>
-        <name>WG2 Products Team</name>
-        <email>products@wgtwo.com</email>
-        <organization>Working Group Two</organization>
-        <organizationUrl>https://www.wgtwo.com</organizationUrl>
-      </developer>
+        <developer>
+            <name>WG2 Products Team</name>
+            <email>products@wgtwo.com</email>
+            <organization>Working Group Two</organization>
+            <organizationUrl>https://www.wgtwo.com</organizationUrl>
+        </developer>
     </developers>
 
 </project>
diff --git a/wgtwo/pom-v1.xml b/wgtwo/pom-v1.xml
index c8971f6..2dfa01c 100644
--- a/wgtwo/pom-v1.xml
+++ b/wgtwo/pom-v1.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +34,9 @@
 
     <scm>
         <connection>scm:git:git@github.com:working-group-two/wgtwoapis.git</connection>
-        <developerConnection>scm:git:[push=]git@github.com:working-group-two/wgtwoapis.git[fetch=]git@github.com:working-group-two/wgtwoapis.git</developerConnection>
+        <developerConnection>
+            scm:git:[push=]git@github.com:working-group-two/wgtwoapis.git[fetch=]git@github.com:working-group-two/wgtwoapis.git
+        </developerConnection>
         <url>https://github.com/working-group-two/wgtwoapis.git</url>
         <tag>v1.10.1</tag>
     </scm>
@@ -80,7 +83,8 @@
                     <version>0.6.1</version>
                     <configuration>
                         <protoSourceRoot>${maven.multiModuleProjectDirectory}</protoSourceRoot>
-                        <protocArtifact>com.google.protobuf:protoc:3.21.12:exe:${os.detected.classifier}</protocArtifact>
+                        <protocArtifact>com.google.protobuf:protoc:3.21.12:exe:${os.detected.classifier}
+                        </protocArtifact>
                         <pluginId>grpc-java</pluginId>
                         <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.52.1:exe:${os.detected.classifier}
                         </pluginArtifact>
@@ -111,8 +115,10 @@
                     <artifactId>maven-release-plugin</artifactId>
                     <version>${maven-release-plugin.version}</version>
                     <configuration>
-                        <scmCommentPrefix>[RELEASE] </scmCommentPrefix>
-                        <tagNameFormat>v${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</tagNameFormat>
+                        <scmCommentPrefix>[RELEASE]</scmCommentPrefix>
+                        <tagNameFormat>
+                            v${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}
+                        </tagNameFormat>
                         <pomFileName>pom-v1.xml</pomFileName>
                     </configuration>
                 </plugin>
@@ -182,39 +188,39 @@
             </plugins>
         </pluginManagement>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
     <licenses>
-      <license>
-        <name>The Apache License, Version 2.0</name>
-        <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      </license>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
     </licenses>
 
     <developers>
-      <developer>
-        <name>WG2 Products Team</name>
-        <email>products@wgtwo.com</email>
-        <organization>Working Group Two</organization>
-        <organizationUrl>https://www.wgtwo.com</organizationUrl>
-      </developer>
+        <developer>
+            <name>WG2 Products Team</name>
+            <email>products@wgtwo.com</email>
+            <organization>Working Group Two</organization>
+            <organizationUrl>https://www.wgtwo.com</organizationUrl>
+        </developer>
     </developers>
 
 </project>