From dc4daa06f1eb4115679aeae9abd7fcba0462aeb0 Mon Sep 17 00:00:00 2001
From: Wayne Beaton <wayne.beaton@eclipse-foundation.org>
Date: Mon, 13 Nov 2023 16:02:38 -0500
Subject: [PATCH] Separate the creation of the core JAR from the shaded JAR

---
 DEPENDENCIES         |  2 +-
 core/pom.xml         | 35 +----------------
 maven-plugin/pom.xml |  2 +-
 pom.xml              |  1 +
 shaded/pom.xml       | 92 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+), 35 deletions(-)
 create mode 100644 shaded/pom.xml

diff --git a/DEPENDENCIES b/DEPENDENCIES
index 05cec3cf..427f58ee 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -54,7 +54,7 @@ maven/mavencentral/org.codehaus.plexus/plexus-interpolation/1.26, Apache-2.0, ap
 maven/mavencentral/org.codehaus.plexus/plexus-sec-dispatcher/2.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.codehaus.plexus/plexus-utils/3.5.1, Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause and LicenseRef-BSD-Style AND LicenseRef-Public-Domain, approved, #4119
 maven/mavencentral/org.eclipse.dash/eclipse-api-for-java/1.0.0, EPL-2.0, approved, technology.dash
-maven/mavencentral/org.eclipse.dash/org.eclipse.dash.licenses/1.0.3-SNAPSHOT, EPL-2.0, approved, technology.dash
+maven/mavencentral/org.eclipse.dash/org.eclipse.dash.licenses.core/1.0.3-SNAPSHOT, EPL-2.0, approved, technology.dash
 maven/mavencentral/org.eclipse.sisu/org.eclipse.sisu.inject/0.3.5, EPL-1.0, approved, technology.sisu
 maven/mavencentral/org.eclipse.sisu/org.eclipse.sisu.plexus/0.3.5, EPL-1.0, approved, technology.sisu
 maven/mavencentral/org.gitlab4j/gitlab4j-api/5.3.0, MIT, approved, #10054
diff --git a/core/pom.xml b/core/pom.xml
index 25be84ad..0264f9f7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -19,7 +19,7 @@
 		<version>1.0.3-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<artifactId>org.eclipse.dash.licenses</artifactId>
+	<artifactId>org.eclipse.dash.licenses.core</artifactId>
 
 	<licenses>
 		<license>
@@ -128,34 +128,12 @@
 	</dependencies>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.5.0</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<transformers>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>org.eclipse.dash.licenses.cli.Main</mainClass>
-								</transformer>
-							</transformers>
-							<createDependencyReducedPom>
-								false
-							</createDependencyReducedPom>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.1.2</version>
 				<configuration>
+					<test>org.eclipse.dash.licenses.tests.TestSuite</test>
 					<additionalClasspathElements>
 						<additionalClasspathElement>${basedir}/src/test/java</additionalClasspathElement>
 					</additionalClasspathElements>
@@ -176,13 +154,4 @@
 			</resource>
 		</resources>
 	</build>
-	<repositories>
-		<repository>
-			<id>dash-licenses-snapshots</id>
-			<url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
 </project>
\ No newline at end of file
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 29d5173d..cf76c597 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -94,7 +94,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.dash</groupId>
-			<artifactId>org.eclipse.dash.licenses</artifactId>
+			<artifactId>org.eclipse.dash.licenses.core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/pom.xml b/pom.xml
index a29a48a0..1d5c12e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
 	<modules>
 		<module>core</module>
 		<module>maven-plugin</module>
+		<module>shaded</module>
 	</modules>
 
 	<build>
diff --git a/shaded/pom.xml b/shaded/pom.xml
new file mode 100644
index 00000000..37cb58c6
--- /dev/null
+++ b/shaded/pom.xml
@@ -0,0 +1,92 @@
+<!--
+ * Copyright (C) 2023 Eclipse Foundation and others. 
+ * 
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-FileType: DOCUMENTATION
+ *
+ * SPDX-FileCopyrightText: 2023 Eclipse Foundation
+ * SPDX-License-Identifier: EPL-2.0
+-->
+
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.dash</groupId>
+		<artifactId>dash-licenses-parent</artifactId>
+		<version>1.0.3-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.dash.licenses</artifactId>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License 2.0</name>
+			<url>https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt</url>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<name>Wayne Beaton</name>
+			<organization>The Eclipse Foundation</organization>
+			<organizationUrl>https://eclipse.org</organizationUrl>
+		</developer>
+	</developers>
+
+	<organization>
+		<name>The Eclipse Dash Project</name>
+		<url>https://eclipse.org/dash</url>
+	</organization>
+
+	<name>Eclipse Dash License Tool Executable JAR</name>
+	<description>The Eclipse Dash License Tool bundled as an executable JAR.</description>
+	<url>https://github.com/eclipse/dash-licenses</url>
+
+	<scm>
+		<url>https://github.com/eclipse/dash-licenses</url>
+	  <tag>HEAD</tag>
+	</scm>
+
+	<issueManagement>
+		<system>GitHub</system>
+		<url>https://github.com/eclipse/dash-licenses/issues</url>
+	</issueManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.dash</groupId>
+			<artifactId>org.eclipse.dash.licenses.core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.5.0</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<transformers>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>org.eclipse.dash.licenses.cli.Main</mainClass>
+								</transformer>
+							</transformers>
+							<createDependencyReducedPom>
+								false
+							</createDependencyReducedPom>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>