From 79cd02c682d062182b2d41bff810d25d69f19271 Mon Sep 17 00:00:00 2001
From: gprat <guylaine.prat@c-s.fr>
Date: Mon, 20 Jul 2020 10:48:08 +0200
Subject: [PATCH] Remove production of sources.zip, ensure LICENSE and NOTICE
in sources.jar
An archive for sources can be downloaded
directly from Gitlab, in pages related to
tags or releases.
Uses the standard maven source plugin instead
of rebuilding it with assembly.
---
pom.xml | 12 ---------
.../assembly/source-distribution-assembly.xml | 25 -------------------
src/main/assembly/source-jar-assembly.xml | 24 ------------------
3 files changed, 61 deletions(-)
delete mode 100644 src/main/assembly/source-distribution-assembly.xml
delete mode 100644 src/main/assembly/source-jar-assembly.xml
diff --git a/pom.xml b/pom.xml
index 753dd31e..87f9b1a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<rugged.spotbugs-maven-plugin.version>4.0.4</rugged.spotbugs-maven-plugin.version>
<rugged.jacoco-maven-plugin.version>0.8.5</rugged.jacoco-maven-plugin.version>
- <rugged.maven-assembly-plugin.version>3.1.1</rugged.maven-assembly-plugin.version>
<rugged.maven-bundle-plugin.version>4.2.1</rugged.maven-bundle-plugin.version>
<rugged.maven-changes-plugin.version>2.12.1</rugged.maven-changes-plugin.version>
<rugged.maven-checkstyle-plugin.version>3.1.1</rugged.maven-checkstyle-plugin.version>
@@ -196,17 +195,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${rugged.maven-assembly-plugin.version}</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/source-distribution-assembly.xml</descriptor>
- <descriptor>src/main/assembly/source-jar-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
diff --git a/src/main/assembly/source-distribution-assembly.xml b/src/main/assembly/source-distribution-assembly.xml
deleted file mode 100644
index c7f81d8b..00000000
--- a/src/main/assembly/source-distribution-assembly.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<assembly>
- <id>sources</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <includes>
- <include>README.txt</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>BUILDING.txt</include>
- <include>pom.xml</include>
- <include>checkstyle.xml</include>
- <include>spotbugs-exclude-filter.xml</include>
- <include>license-header.txt</include>
- </includes>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/src/main/assembly/source-jar-assembly.xml b/src/main/assembly/source-jar-assembly.xml
deleted file mode 100644
index b79e54ba..00000000
--- a/src/main/assembly/source-jar-assembly.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<assembly>
- <id>sources</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- <outputDirectory>META-INF</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/java</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>**/*.java</include>
- </includes>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
-</assembly>
--
GitLab