From f8c53f6c23f63dfefe8514b715ab65dd9d1ceddb Mon Sep 17 00:00:00 2001
From: Fangjun Zhou <fangjun.zhou02@gmail.com>
Date: Mon, 19 Feb 2024 13:02:19 -0600
Subject: [PATCH 1/2] Added nixpkg support

---
 .gitignore |  5 ++++-
 flake.lock | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix  | 38 ++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/.gitignore b/.gitignore
index 993fb23a4..68ca14a1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,7 @@ bin/
 jdt-language-server-latest.tar.gz
 jdtls/
 
-!.mvn/wrapper/maven-wrapper.jar
\ No newline at end of file
+!.mvn/wrapper/maven-wrapper.jar
+
+# Nix artifacts
+result/
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 000000000..1428e7a09
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1708296515,
+        "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 000000000..17c710392
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,38 @@
+{
+  description = "Java Debug Flake";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    with flake-utils.lib;
+    eachSystem [
+      system.x86_64-linux
+      system.x86_64-darwin
+    ]
+      (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in
+        {
+          packages.default = pkgs.maven.buildMavenPackage {
+            pname = "vscode-debug";
+            version = "0.51.0";
+
+            src = ./.;
+            mvnHash = "sha256-Fx1EVnWRjRGBvVN7RfYCx+tBuPgG1gte3w8oVJkAkj8=";
+
+            buildPhase = ''
+              mvn clean package
+            '';
+
+            installPhase = ''
+              cp -r . $out
+            '';
+          };
+        }
+      );
+}

From cca0569308b7691479c2528acc1da85d88543710 Mon Sep 17 00:00:00 2001
From: Fangjun Zhou <fangjun.zhou02@gmail.com>
Date: Mon, 19 Feb 2024 13:02:43 -0600
Subject: [PATCH 2/2] Added maven-enforcer-plugin

---
 pom.xml | 379 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 202 insertions(+), 177 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8911c9d58..ce7daeee1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,183 +1,208 @@
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.java</groupId>
-    <artifactId>java-debug-parent</artifactId>
-    <name>${base.name} :: Parent</name>
-    <description>The Java Debug Server is an implementation of Visual Studio Code (VSCode) Debug Protocol. It can be used in Visual Studio Code to debug Java programs.</description>
-    <url>https://github.com/Microsoft/java-debug</url>
-    <version>0.51.0</version>
-    <packaging>pom</packaging>
-    <properties>
-        <base.name>Java Debug Server for Visual Studio Code</base.name>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tycho-version>4.0.5</tycho-version>
-        <checkstyleDir>${basedir}</checkstyleDir>
-    </properties>
+<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/xsd/maven-4.0.0.xsd">
 
-    <licenses>
-        <license>
-            <name>Eclipse Public License 1.0</name>
-            <url>https://github.com/Microsoft/java-debug/blob/master/LICENSE.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <id>akaroml</id>
-            <name>Rome Li</name>
-            <email>roml@microsoft.com</email>
-        </developer>
-        <developer>
-            <id>testforstephen</id>
-            <name>Jinbo Wang</name>
-            <email>jinbwan@microsoft.com</email>
-        </developer>
-        <developer>
-            <id>andxu</id>
-            <name>Andy Xu</name>
-            <email>andxu@microsoft.com</email>
-        </developer>
-        <developer>
-            <id>yaohaizh</id>
-            <name>Yaohai Zheng</name>
-            <email>yaozheng@microsoft.com</email>
-        </developer>
-    </developers>
-
-    <organization>
-        <name>Microsoft</name>
-        <url>https://www.microsoft.com</url>
-    </organization>
-
-    <scm>
-        <connection>scm:git:git://github.com/Microsoft/java-debug.git</connection>
-        <developerConnection>scm:git:ssh://github.com:Microsoft/java-debug.git</developerConnection>
-        <url>https://github.com/Microsoft/java-debug/tree/master</url>
-    </scm>
-
-    <modules>
-        <module>com.microsoft.java.debug.core</module>
-        <module>com.microsoft.java.debug.plugin</module>
-        <module>com.microsoft.java.debug.repository</module>
-        <module>com.microsoft.java.debug.target</module>
-    </modules>
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.15</version>
-                    <executions>
-                        <!-- Ensures that both integration-test and verify 
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.microsoft.java</groupId>
+  <artifactId>java-debug-parent</artifactId>
+  <name>${base.name} :: Parent</name>
+  <description>The Java Debug Server is an implementation of Visual
+  Studio Code (VSCode) Debug Protocol. It can be used in Visual
+  Studio Code to debug Java programs.</description>
+  <url>https://github.com/Microsoft/java-debug</url>
+  <version>0.51.0</version>
+  <packaging>pom</packaging>
+  <properties>
+    <base.name>Java Debug Server for Visual Studio Code</base.name>
+    <project.build.sourceEncoding>
+    UTF-8</project.build.sourceEncoding>
+    <tycho-version>4.0.5</tycho-version>
+    <checkstyleDir>${basedir}</checkstyleDir>
+  </properties>
+  <licenses>
+    <license>
+      <name>Eclipse Public License 1.0</name>
+      <url>
+      https://github.com/Microsoft/java-debug/blob/master/LICENSE.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>akaroml</id>
+      <name>Rome Li</name>
+      <email>roml@microsoft.com</email>
+    </developer>
+    <developer>
+      <id>testforstephen</id>
+      <name>Jinbo Wang</name>
+      <email>jinbwan@microsoft.com</email>
+    </developer>
+    <developer>
+      <id>andxu</id>
+      <name>Andy Xu</name>
+      <email>andxu@microsoft.com</email>
+    </developer>
+    <developer>
+      <id>yaohaizh</id>
+      <name>Yaohai Zheng</name>
+      <email>yaozheng@microsoft.com</email>
+    </developer>
+  </developers>
+  <organization>
+    <name>Microsoft</name>
+    <url>https://www.microsoft.com</url>
+  </organization>
+  <scm>
+    <connection>
+    scm:git:git://github.com/Microsoft/java-debug.git</connection>
+    <developerConnection>
+    scm:git:ssh://github.com:Microsoft/java-debug.git</developerConnection>
+    <url>https://github.com/Microsoft/java-debug/tree/master</url>
+  </scm>
+  <modules>
+    <module>com.microsoft.java.debug.core</module>
+    <module>com.microsoft.java.debug.plugin</module>
+    <module>com.microsoft.java.debug.repository</module>
+    <module>com.microsoft.java.debug.target</module>
+  </modules>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>3.3.0</version>
+          <executions>
+            <execution>
+              <id>enforce-plugin-versions</id>
+              <goals>
+                <goal>enforce</goal>
+              </goals>
+              <configuration>
+                <rules>
+                  <requirePluginVersions />
+                </rules>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>2.15</version>
+          <executions>
+            <!-- Ensures that both integration-test and verify 
                             goals of the Failsafe Maven plugin are executed. -->
-                        <execution>
-                            <id>integration-tests</id>
-                            <goals>
-                                <goal>integration-test</goal>
-                                <goal>verify</goal>
-                            </goals>
-                            <configuration>
-                                <!-- Sets the VM argument line used when 
+            <execution>
+              <id>integration-tests</id>
+              <goals>
+                <goal>integration-test</goal>
+                <goal>verify</goal>
+              </goals>
+              <configuration>
+                <!-- Sets the VM argument line used when 
                                     integration tests are run. -->
-                                <argLine>${failsafeArgLine}</argLine>
-                                <!-- Skips integration tests if the value 
+                <argLine>${failsafeArgLine}</argLine>
+                <!-- Skips integration tests if the value 
                                     of skip.integration.tests property is true -->
-                                <skipTests>${skip.integration.tests}</skipTests>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <?m2e execute onConfiguration?>
-                            <id>get-libs</id>
-                            <goals>
-                                <goal>copy</goal>
-                            </goals>
-                            <phase>validate</phase>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <skip>false</skip>
-                        <outputDirectory>${basedir}/lib/</outputDirectory>
-                        <!-- baseVersion is to avoid SNAPSHOT dependencies 
+                <skipTests>${skip.integration.tests}</skipTests>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <executions>
+            <execution>
+              <?m2e execute onConfiguration?>
+              <id>get-libs</id>
+              <goals>
+                <goal>copy</goal>
+              </goals>
+              <phase>validate</phase>
+            </execution>
+          </executions>
+          <configuration>
+            <skip>false</skip>
+            <outputDirectory>${basedir}/lib/</outputDirectory>
+            <!-- baseVersion is to avoid SNAPSHOT dependencies 
                             being copied with ever daily changing timestamp -->
-                        <useBaseVersion>true</useBaseVersion>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.1.0</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>com.puppycrawl.tools</groupId>
-                            <artifactId>checkstyle</artifactId>
-                            <version>8.29</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>com.github.sevntu-checkstyle</groupId>
-                            <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
-                            <version>1.24.1</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <configLocation>${checkstyleDir}/check_style.xml</configLocation>
-                        <failOnViolation>true</failOnViolation>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>target-platform-configuration</artifactId>
-                    <version>${tycho-version}</version>
-                    <configuration>
-                        <resolver>p2</resolver>
-                        <target>
-                            <artifact>
-                                <groupId>com.microsoft.java</groupId>
-                                <artifactId>com.microsoft.java.debug.tp</artifactId>
-                                <version>${project.version}</version>
-                            </artifact>
-                        </target>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-maven-plugin</artifactId>
-                <version>${tycho-version}</version>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>activate-in-module</id>
-            <activation>
-                <file>
-                    <exists>${basedir}/../check_style.xml</exists>
-                </file>
-            </activation>
-            <properties>
-                <checkstyleDir>${basedir}/..</checkstyleDir>
-            </properties>
-        </profile>
-    </profiles>
-    <repositories>
-        <repository>
-            <id>oss.sonatype.org</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
+            <useBaseVersion>true</useBaseVersion>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>3.1.0</version>
+          <dependencies>
+            <dependency>
+              <groupId>com.puppycrawl.tools</groupId>
+              <artifactId>checkstyle</artifactId>
+              <version>8.29</version>
+            </dependency>
+            <dependency>
+              <groupId>com.github.sevntu-checkstyle</groupId>
+              <artifactId>
+              sevntu-checkstyle-maven-plugin</artifactId>
+              <version>1.24.1</version>
+            </dependency>
+          </dependencies>
+          <configuration>
+            <configLocation>
+            ${checkstyleDir}/check_style.xml</configLocation>
+            <failOnViolation>true</failOnViolation>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>target-platform-configuration</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <resolver>p2</resolver>
+            <target>
+              <artifact>
+                <groupId>com.microsoft.java</groupId>
+                <artifactId>
+                com.microsoft.java.debug.tp</artifactId>
+                <version>${project.version}</version>
+              </artifact>
+            </target>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-maven-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>activate-in-module</id>
+      <activation>
+        <file>
+          <exists>${basedir}/../check_style.xml</exists>
+        </file>
+      </activation>
+      <properties>
+        <checkstyleDir>${basedir}/..</checkstyleDir>
+      </properties>
+    </profile>
+  </profiles>
+  <repositories>
+    <repository>
+      <id>oss.sonatype.org</id>
+      <url>
+      https://oss.sonatype.org/content/repositories/snapshots/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 </project>