From 7e7469eab8ff9daec4814507f9be0e5ea89c2b25 Mon Sep 17 00:00:00 2001
From: ede <edgar.soldin@web.de>
Date: Sun, 5 Sep 2021 21:34:38 +0200
Subject: [PATCH] cleanup, reformat, add checksummed distro-zip

---
 distro-zip.xml |  30 +++++++++++++
 pom.xml        | 117 ++++++++++++++++++++++++++++++++-----------------
 2 files changed, 107 insertions(+), 40 deletions(-)
 create mode 100644 distro-zip.xml

diff --git a/distro-zip.xml b/distro-zip.xml
new file mode 100644
index 0000000..aa0556b
--- /dev/null
+++ b/distro-zip.xml
@@ -0,0 +1,30 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+  <id>distro zip</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <!-- place extension jar in folder root to be parsed by OJ -->
+      <outputDirectory>/</outputDirectory>
+      <useTransitiveFiltering>false</useTransitiveFiltering>
+      <includes>
+        <include>${artifact}</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <!-- place deps in a extension lib/ subfolder, as jgrapht is a shared dependency -->
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <useProjectArtifact>false</useProjectArtifact>
+      <excludes>
+        <exclude>org.openjump:OpenJUMP</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b12b940..7edd2ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,46 +1,83 @@
-<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>
-    <groupId>org.openjump</groupId>
-    <artifactId>aggregation-extension</artifactId>
-    <version>2.0.0</version>
-    <name>aggregation-extension</name>
-    <description>Aggregation plugin</description>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.openjump</groupId>
+  <artifactId>aggregation-extension</artifactId>
+  <version>2.0.0</version>
+  <name>aggregation-extension</name>
+  <description>Aggregation plugin</description>
 
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.number>0.0.0</version.number>
-        <jts.version>1.18.1</jts.version>
-    </properties>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-    <repositories>
-        <repository>
-            <id>ojrepo</id>
-            <name>OpenJUMP Snapshot Repository</name>
-            <url>https://ojrepo.soldin.de/</url>
-        </repository>
-    </repositories>
+  <repositories>
+    <repository>
+      <id>ojrepo</id>
+      <name>OpenJUMP Snapshot Repository</name>
+      <url>https://ojrepo.soldin.de/</url>
+    </repository>
+  </repositories>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.openjump</groupId>
-            <artifactId>OpenJUMP</artifactId>
-            <version>2.0-main-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.locationtech.jts</groupId>
-            <artifactId>jts-core</artifactId>
-            <version>${jts.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.openjump</groupId>
+      <artifactId>OpenJUMP</artifactId>
+      <version>2.0-main-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.3.0</version>
+        <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
+        <executions>
+          <execution>
+            <id>distro zip</id>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>distro-zip.xml</descriptor>
+              </descriptors>
+              <attach>false</attach>
+            </configuration>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>net.nicoulaj.maven.plugins</groupId>
+        <artifactId>checksum-maven-plugin</artifactId>
+        <version>1.10</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>files</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <fileSets>
+                <fileSet>
+                  <directory>${project.build.directory}</directory>
+                  <includes>
+                    <include>${project.build.finalName}.zip</include>
+                  </includes>
+                </fileSet>
+              </fileSets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file