Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3578 - Adding build reactor local remote-resources 

+ LICENSE and NOTICE.txt are now part of the remote-resources
  bundle on org.eclipse.jetty:build-resources:${project.version}
+ LICENSE and NOTICE.txt are managed only in one place now,
  the project root.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2020-01-09 13:59:51 -06:00
parent 5f82e17d2f
commit 0e0f5822c3
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
build-resources/pom.xml
View File

@ -4,9 +4,44 @@
<artifactId>build-resources</artifactId>
<version>10.0.0-SNAPSHOT</version>
<name>Jetty :: Build Resources</name>
<packaging>jar</packaging>
<build>
<resources>
<resource>
<directory>${project.basedir}/src/main/resources</directory>
</resource>
<resource>
<directory>${project.basedir}/../</directory>
<includes>
<include>LICENSE</include>
<include>NOTICE.txt</include>
</includes>
<targetPath>META-INF</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<id>create-shared-resources</id>
<phase>process-resources</phase>
<goals>
<goal>bundle</goal>
</goals>
<configuration>
<resourcesDirectory>${project.build.outputDirectory}</resourcesDirectory>
<includes>
<include>META-INF/LICENSE</include>
<include>META-INF/NOTICE.txt</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>

5
pom.xml
View File

@ -284,13 +284,14 @@
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-shared-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>process</goal>
</goals>
<configuration>
<resourceBundles>
<resourceBundle>org.eclipse.jetty.toolchain:jetty-artifact-remote-resources:1.2</resourceBundle>
<resourceBundle>org.eclipse.jetty:build-resources:${project.version}</resourceBundle>
</resourceBundles>
</configuration>
</execution>
@ -604,7 +605,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version>
<version>1.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>