From 81e149a62c56c4bda6fd5f62711ae1d294565520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Michaud?= <m.michael.michaud@orange.fr>
Date: Wed, 12 Jan 2022 23:12:43 +0100
Subject: [PATCH] Cadplan extension deprecated (separated in several projects)

---
 README.md                        |  7 ++++
 distro-zip.xml                   | 36 +++++++++++++++++++++
 jump-chart/distro-zip.xml        | 32 +++++++++++++++++++
 jump-chart/pom.xml               | 53 ++++++++++++++++++++++++++++--
 jump-fill-pattern/distro-zip.xml | 33 +++++++++++++++++++
 jump-fill-pattern/pom.xml        | 53 ++++++++++++++++++++++++++++--
 jump-printer/distro-zip.xml      | 32 +++++++++++++++++++
 jump-printer/pom.xml             | 55 ++++++++++++++++++++++++++++++--
 pom.xml                          | 36 +++------------------
 vertex-symbols/distro-zip.xml    | 32 +++++++++++++++++++
 vertex-symbols/pom.xml           | 53 ++++++++++++++++++++++++++++--
 11 files changed, 381 insertions(+), 41 deletions(-)
 create mode 100644 distro-zip.xml
 create mode 100644 jump-chart/distro-zip.xml
 create mode 100644 jump-fill-pattern/distro-zip.xml
 create mode 100644 jump-printer/distro-zip.xml
 create mode 100644 vertex-symbols/distro-zip.xml

diff --git a/README.md b/README.md
index bba84c2..4e0bbc2 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,9 @@
 # cadplan-extension
 Extensions from CadPlan (http://www.cadplan.com.au/)
+
+**DEPRECATED** Each cadplan plugin has now its own project. Namely :
+
+- vertex-symbols
+- jump-fill-pattern
+- jump-chart-extension
+- cadplan-printer-extension
diff --git a/distro-zip.xml b/distro-zip.xml
new file mode 100644
index 0000000..efdb3a6
--- /dev/null
+++ b/distro-zip.xml
@@ -0,0 +1,36 @@
+<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>
+        <!-- for development purposes -->
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useTransitiveFiltering>false</useTransitiveFiltering>
+            <includes>
+                <include>*:cadplan-extension</include>
+                <include>*:jump-chart</include>
+                <include>*:jump-fill-pattern</include>
+                <include>*:jump-printer</include>
+                <include>*:vertex-symbol</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <useProjectArtifact>false</useProjectArtifact>
+            <excludes>
+                <exclude>org.openjump:OpenJUMP</exclude>
+                <!-- some unneeded openpdf dependency -->
+                <exclude>com.google.code.findbugs:*</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/jump-chart/distro-zip.xml b/jump-chart/distro-zip.xml
new file mode 100644
index 0000000..6d2f082
--- /dev/null
+++ b/jump-chart/distro-zip.xml
@@ -0,0 +1,32 @@
+<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>
+        <!-- for development purposes -->
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useTransitiveFiltering>false</useTransitiveFiltering>
+            <includes>
+                <include>*:jump-chart</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <useProjectArtifact>false</useProjectArtifact>
+            <excludes>
+                <exclude>org.openjump:OpenJUMP</exclude>
+                <!-- some unneeded openpdf dependency -->
+                <exclude>com.google.code.findbugs:*</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/jump-chart/pom.xml b/jump-chart/pom.xml
index 6ca6976..18a2dfd 100644
--- a/jump-chart/pom.xml
+++ b/jump-chart/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>cadplan4openjump</artifactId>
         <groupId>cadplan</groupId>
-        <version>2.1.0</version>
+        <version>${project.build.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jump-chart</artifactId>
-    <version>2.1.0</version>
+    <version>${project.build.version}</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -20,4 +20,53 @@
     <dependencies>
     </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>
+                        </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
diff --git a/jump-fill-pattern/distro-zip.xml b/jump-fill-pattern/distro-zip.xml
new file mode 100644
index 0000000..3cb45f4
--- /dev/null
+++ b/jump-fill-pattern/distro-zip.xml
@@ -0,0 +1,33 @@
+<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>
+        <!-- for development purposes -->
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useTransitiveFiltering>false</useTransitiveFiltering>
+            <includes>
+                <include>*:jump-fill-pattern</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <useProjectArtifact>false</useProjectArtifact>
+            <excludes>
+                <exclude>org.openjump:OpenJUMP</exclude>
+                <!-- some unneeded openpdf dependency -->
+                <exclude></exclude>
+                <exclude>com.google.code.findbugs:*</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/jump-fill-pattern/pom.xml b/jump-fill-pattern/pom.xml
index 901db6b..aeee919 100644
--- a/jump-fill-pattern/pom.xml
+++ b/jump-fill-pattern/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>cadplan4openjump</artifactId>
         <groupId>cadplan</groupId>
-        <version>2.1.0</version>
+        <version>${project.build.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jump-fill-pattern</artifactId>
-    <version>2.1.0</version>
+    <version>${project.build.version}</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -20,4 +20,53 @@
     <dependencies>
     </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>
+                        </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
diff --git a/jump-printer/distro-zip.xml b/jump-printer/distro-zip.xml
new file mode 100644
index 0000000..f81e0a1
--- /dev/null
+++ b/jump-printer/distro-zip.xml
@@ -0,0 +1,32 @@
+<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>
+        <!-- for development purposes -->
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useTransitiveFiltering>false</useTransitiveFiltering>
+            <includes>
+                <include>*:jump-printer</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <useProjectArtifact>false</useProjectArtifact>
+            <excludes>
+                <exclude>org.openjump:OpenJUMP</exclude>
+                <!-- some unneeded openpdf dependency -->
+                <exclude>com.google.code.findbugs:*</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/jump-printer/pom.xml b/jump-printer/pom.xml
index b913279..fb14212 100644
--- a/jump-printer/pom.xml
+++ b/jump-printer/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>cadplan4openjump</artifactId>
         <groupId>cadplan</groupId>
-        <version>2.1.0</version>
+        <version>${project.build.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jump-printer</artifactId>
-    <version>2.1.0</version>
+    <version>${project.build.version}</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.github.librepdf</groupId>
             <artifactId>openpdf</artifactId>
-            <version>1.3.25</version>
+            <version>1.3.26</version>
         </dependency>
 
         <!--dependency>
@@ -59,4 +59,53 @@
 
     </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>
+                        </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
diff --git a/pom.xml b/pom.xml
index 992b79a..faf36b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,8 @@
     <artifactId>cadplan4openjump</artifactId>
     <groupId>cadplan</groupId>
     <packaging>pom</packaging>
-    <version>2.1.0</version>
+    <!-- reuse version property as suported by maven 3.5+ -->
+    <version>${project.build.version}</version>
 
     <modules>
         <module>vertex-symbols</module>
@@ -18,6 +19,8 @@
     </modules>
 
     <properties>
+        <!-- update version property here, used by all submodules instantly -->
+        <project.build.version>2.1.1</project.build.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -41,37 +44,6 @@
             <version>2.0-main-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.locationtech.jts</groupId>
-            <artifactId>jts-core</artifactId>
-            <version>${jts.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-awt-util</artifactId>
-            <version>${batik.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-dom</artifactId>
-            <version>${batik.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-svggen</artifactId>
-            <version>${batik.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-squiggle</artifactId>
-            <version>${batik.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/vertex-symbols/distro-zip.xml b/vertex-symbols/distro-zip.xml
new file mode 100644
index 0000000..81623d0
--- /dev/null
+++ b/vertex-symbols/distro-zip.xml
@@ -0,0 +1,32 @@
+<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>
+        <!-- for development purposes -->
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useTransitiveFiltering>false</useTransitiveFiltering>
+            <includes>
+                <include>*:vertex-symbols</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <useProjectArtifact>false</useProjectArtifact>
+            <excludes>
+                <exclude>org.openjump:OpenJUMP</exclude>
+                <!-- some unneeded openpdf dependency -->
+                <exclude>com.google.code.findbugs:*</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/vertex-symbols/pom.xml b/vertex-symbols/pom.xml
index a7ff0db..edde906 100644
--- a/vertex-symbols/pom.xml
+++ b/vertex-symbols/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>cadplan4openjump</artifactId>
         <groupId>cadplan</groupId>
-        <version>2.1.0</version>
+        <version>${project.build.version}</version>
     </parent>
 
     <artifactId>vertex-symbols</artifactId>
-    <version>2.1.0</version>
+    <version>${project.build.version}</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -21,4 +21,53 @@
     <dependencies>
     </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>
+                        </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