OC-102: use shade plugin to repack and trim jars

.github/workflows/A-build-and-test-jdk11.yml

@@ -39,7 +39,6 @@ jobs:
           mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
-          mvn --batch-mode install -Pworkspace-setup -f clover-jtreemap/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
 
       - name: Download KTreemap fork

.github/workflows/A-build-and-test-jdk17.yml

@@ -39,7 +39,6 @@ jobs:
           mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
-          mvn --batch-mode install -Pworkspace-setup -f clover-jtreemap/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
 
       - name: Download KTreemap fork

.github/workflows/A-build-and-test-jdk21.yml

@@ -39,7 +39,6 @@ jobs:
           mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
-          mvn --batch-mode install -Pworkspace-setup -f clover-jtreemap/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
 
       - name: Download KTreemap fork

.github/workflows/A-build-and-test.yml

@@ -39,7 +39,6 @@ jobs:
           mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
-          mvn --batch-mode install -Pworkspace-setup -f clover-jtreemap/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
 
       - name: Download KTreemap fork

.github/workflows/B-combatibility-tests.yml

@@ -39,7 +39,6 @@ jobs:
           mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
-          mvn --batch-mode install -Pworkspace-setup -f clover-jtreemap/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
 
       - name: Download KTreemap fork

.github/workflows/D-release-openclover.yml

@@ -34,7 +34,6 @@ jobs:
           mvn --batch-mode install -f clover-core-libs/jarjar/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-core-libs/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
-          mvn --batch-mode install -Pworkspace-setup -f clover-jtreemap/pom.xml
           mvn --batch-mode install -Pworkspace-setup -f clover-idea-libs/pom.xml
 
       - name: Download KTreemap fork

README.md

@@ -63,7 +63,6 @@ See also:
 mvn install -f clover-core-libs/jarjar/pom.xml
 mvn install -Pworkspace-setup -f clover-core-libs/pom.xml
 mvn install -Pworkspace-setup -f clover-eclipse-libs/pom.xml
-mvn install -Pworkspace-setup -f clover-jtreemap/pom.xml
 mvn install -Pworkspace-setup -f clover-idea-libs/pom.xml
 ```
 

clover-all/pom.xml

@@ -61,60 +61,52 @@
         </dependency>
         <!-- packaging into clover.jar via assembly plugin -->
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-annotations</artifactId>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-antlr</artifactId>
+            <groupId>gnu.cajo</groupId>
+            <artifactId>cajo</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-cajo</artifactId>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-commons-codec</artifactId>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-commons-collections</artifactId>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-commons-lang3</artifactId>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-fastutil</artifactId>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-gson</artifactId>
+            <groupId>com.lowagie</groupId>
+            <artifactId>itext</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-itext</artifactId>
+            <groupId>org.jfree</groupId>
+            <artifactId>jcommon</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-jcommon</artifactId>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-jdom</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-jfreechart</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-slf4j</artifactId>
+            <groupId>org.jfree</groupId>
+            <artifactId>jfreechart</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openclover</groupId>
@@ -130,6 +122,17 @@
             </extension>
         </extensions>
         <plugins>
+            <!-- use assembly plugin instead of jar plugin to create an artifact -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- generate clover.jar, a combination of clover-ant + clover-core + clover-runtime + clover+groovy +
                  repacked clover-* third-party libraries -->
             <plugin>
@@ -220,6 +223,16 @@
                                     <artifactId>junit-platform-launcher</artifactId>
                                     <version>1.9.2</version>
                                 </additionalDependency>
+                                <additionalDependency>
+                                    <groupId>antlr</groupId>
+                                    <artifactId>antlr</artifactId>
+                                    <version>2.7.7</version>
+                                </additionalDependency>
+                                <additionalDependency>
+                                    <groupId>org.slf4j</groupId>
+                                    <artifactId>slf4j-api</artifactId>
+                                    <version>1.7.36</version>
+                                </additionalDependency>
                             </additionalDependencies>
                             <!-- clover-runtime contains a package in a folder different from package name, leading to warning -->
                             <excludePackageNames>annotations.*</excludePackageNames>

clover-all/src/assembly/clover-jar.xml

@@ -63,34 +63,6 @@
             </includes>
             <unpack>false</unpack>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>.</outputDirectory>
-            <includes>
-                <include>org.openclover:clover-annotations</include>
-                <include>org.openclover:clover-antlr</include>
-                <include>org.openclover:clover-cajo</include>
-                <include>org.openclover:clover-commons-codec</include>
-                <include>org.openclover:clover-commons-collections</include>
-                <include>org.openclover:clover-commons-lang</include>
-                <include>org.openclover:clover-commons-lang3</include>
-                <include>org.openclover:clover-fastutil</include>
-                <include>org.openclover:clover-gson</include>
-                <include>org.openclover:clover-itext</include>
-                <include>org.openclover:clover-jcommon</include>
-                <include>org.openclover:clover-jdom</include>
-                <include>org.openclover:clover-jfreechart</include>
-                <include>org.openclover:clover-slf4j</include>
-                <include>org.openclover:clover-velocity</include>
-            </includes>
-            <unpack>true</unpack>
-            <unpackOptions>
-                <excludes>
-                    <exclude>licenses/*.TXT</exclude>
-                    <exclude>LICENSE.txt</exclude>
-                    <exclude>META-INF/MANIFEST.MF</exclude>
-                </excludes>
-            </unpackOptions>
-        </dependencySet>
     </dependencySets>
     <fileSets>
         <fileSet>

clover-ant/pom.xml

@@ -48,8 +48,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.openclover</groupId>
-            <artifactId>clover-jdom</artifactId>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -116,6 +116,46 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>package-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.apache.commons:commons-lang3</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.apache.commons:commons-lang3</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/LICENSE.txt</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                        <exclude>META-INF/NOTICE.txt</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.apache.commons.lang3</pattern>
+                                    <shadedPattern>clover.org.apache.commons.lang3</shadedPattern>
+                                    <includes>
+                                        <include>org.apache.commons.lang3.**</include>
+                                    </includes>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- don't deploy jar, clover-ant-zip is distributed via website -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

clover-ant/src/main/java/org/openclover/ant/AntFileSetUtils.java

@@ -1,7 +1,7 @@
 package org.openclover.ant;
 
-import clover.org.apache.commons.lang3.ArrayUtils;
-import clover.org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.PatternSet;

clover-ant/src/main/java/org/openclover/ant/AntInstrUtils.java

@@ -1,6 +1,6 @@
 package org.openclover.ant;
 
-import clover.org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;

clover-ant/src/main/java/org/openclover/ant/taskdefs/CloverCompilerAdapter.java

@@ -1,6 +1,6 @@
 package org.openclover.ant.taskdefs;
 
-import clover.org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Javac;

clover-ant/src/main/java/org/openclover/ant/tasks/AbstractInstrTask.java

@@ -1,6 +1,6 @@
 package org.openclover.ant.tasks;
 
-import clover.org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.FileSet;
 import org.openclover.ant.AntCloverProfile;

clover-ant/src/main/java/org/openclover/ci/AntIntegrator.java

@@ -4,8 +4,6 @@
 import org.openclover.runtime.CloverNames;
 import org.openclover.runtime.Logger;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.List;
 
 /**
@@ -73,14 +71,13 @@ private String addQuotesIfNecessary(String input) {
     }
 
     private static boolean isWindows() {
-        final String osName = AccessController.doPrivileged((PrivilegedAction<String>) () -> {
-            try {
-                return System.getProperty("os.name");
-            } catch (SecurityException ex) {
-                return null;
-            }
-        });
-        return osName != null && osName.toLowerCase().indexOf("windows") == 0;
+        try {
+            final String osName = System.getProperty("os.name");
+            return osName != null && osName.toLowerCase().indexOf("windows") == 0;
+        } catch (SecurityException ex) {
+            Logger.getInstance().debug("Unable to read os.name property");
+            return false;
+        }
     }
 
 }

clover-core-libs/cajo/pom.xml

@@ -0,0 +1,55 @@
+<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>gnu.cajo</groupId>
+    <artifactId>cajo</artifactId>
+    <version>1.117</version>
+    <packaging>jar</packaging>
+    <licenses>
+        <license>
+            <name>LGPL v3</name>
+            <url>http://java.net/projects/cajo/pages/Home</url>
+        </license>
+    </licenses>
+    <name>Cajo Library</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <skipIfEmpty>true</skipIfEmpty>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-install</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>install-file</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <file>src/main/resources/cajo-1.117.jar</file>
+                            <pomFile>pom.xml</pomFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>