Skip to content
Snippets Groups Projects
Commit 9d28925f authored by Guilhem Bonnefille's avatar Guilhem Bonnefille
Browse files

Ensure LICENSE and NOTICE in sources.jar

Uses the standard maven source plugin instead
of rebuilding it with assembly.
parent c4a937b7
No related branches found
No related tags found
1 merge request!34Bundle licensing files
...@@ -356,7 +356,6 @@ ...@@ -356,7 +356,6 @@
<version>${orekit.maven-assembly-plugin.version}</version> <version>${orekit.maven-assembly-plugin.version}</version>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>src/main/assembly/source-jar-assembly.xml</descriptor>
<descriptor>src/main/assembly/source-distribution-assembly.xml</descriptor> <descriptor>src/main/assembly/source-distribution-assembly.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
...@@ -397,6 +396,7 @@ ...@@ -397,6 +396,7 @@
<goal>copy-resources</goal> <goal>copy-resources</goal>
</goals> </goals>
<configuration> <configuration>
<!-- Ensure LICENSE and NOTICE are shipped with binary jar -->
<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory> <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
<resources> <resources>
<resource> <resource>
...@@ -411,6 +411,33 @@ ...@@ -411,6 +411,33 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${orekit.build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>add-resource</id>
<phase>process-resources</phase>
<goals>
<goal>add-resource</goal>
</goals>
<configuration>
<!-- Ensure LICENSE and NOTICE are shipped with sources jar -->
<resources>
<resource>
<directory>.</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
......
...@@ -191,6 +191,7 @@ checksums: ...@@ -191,6 +191,7 @@ checksums:
- orekit-X.Y.jar - orekit-X.Y.jar
- orekit-X.Y-sources.jar - orekit-X.Y-sources.jar
- orekit-X.Y-javadoc.jar - orekit-X.Y-javadoc.jar
- orekit-X.Y-sources.zip
The signature and checksum files have similar names with added extensions `.asc`, The signature and checksum files have similar names with added extensions `.asc`,
`.md5` and `.sha1`. `.md5` and `.sha1`.
......
<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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment