Skip to content

Commit

Permalink
Separate the creation of the core JAR from the shaded JAR
Browse files Browse the repository at this point in the history
  • Loading branch information
waynebeaton committed Nov 13, 2023
1 parent 31e4cf3 commit dc4daa0
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 35 deletions.
2 changes: 1 addition & 1 deletion DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 2 additions & 33 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
2 changes: 1 addition & 1 deletion maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
<modules>
<module>core</module>
<module>maven-plugin</module>
<module>shaded</module>
</modules>

<build>
Expand Down
92 changes: 92 additions & 0 deletions shaded/pom.xml
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit dc4daa0

Please sign in to comment.