Skip to content

Commit

Permalink
Merge pull request #11213 from bstansberry/WFLY-10363
Browse files Browse the repository at this point in the history 
[WFLY-10363] Simplify the licenses.xml generation to guard against ex…
  • Loading branch information
@stuartwdouglas
stuartwdouglas committed May 14, 2018
2 parents 79b2fbb + 8860cc7 commit f4b6b3a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 56 deletions.
31 changes: 3 additions & 28 deletions feature-pack/pom.xml
View file
Expand Up @@ -3119,45 +3119,20 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-licenses-xml</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${license.directory}</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/license</directory>
<includes>
<include>*licenses.xml</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.maven.plugins</groupId>
<artifactId>licenses-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>update-licenses-xml</id>
<id>generate-licenses-xml</id>
<goals>
<goal>insert-versions</goal>
</goals>
<phase>prepare-package</phase>
<phase>prepare-package</phase><!-- TODO why not generate-resources phase?-->
<configuration>
<sortByGroupIdAndArtifactId>true</sortByGroupIdAndArtifactId>
<licensesOutputDirectory>${license.directory}</licensesOutputDirectory>
<licensesConfigFile>${project.basedir}/src/license/full-feature-pack-licenses.xml</licensesConfigFile>
<licensesOutputFile>${license.directory}/full-feature-pack-licenses.xml</licensesOutputFile>
</configuration>
</execution>
Expand Down
31 changes: 3 additions & 28 deletions servlet-feature-pack/pom.xml
View file
Expand Up @@ -545,45 +545,20 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-licenses-xml</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${license.directory}</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/license</directory>
<includes>
<include>*licenses.xml</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.maven.plugins</groupId>
<artifactId>licenses-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>update-licenses-xml</id>
<id>generate-licenses-xml</id>
<goals>
<goal>insert-versions</goal>
</goals>
<phase>prepare-package</phase>
<phase>prepare-package</phase><!-- TODO why not generate-resources? -->
<configuration>
<sortByGroupIdAndArtifactId>true</sortByGroupIdAndArtifactId>
<licensesOutputDirectory>${license.directory}</licensesOutputDirectory>
<licensesConfigFile>${project.basedir}/src/license/servlet-feature-pack-licenses.xml</licensesConfigFile>
<licensesOutputFile>${license.directory}/servlet-feature-pack-licenses.xml</licensesOutputFile>
</configuration>
</execution>
Expand Down

0 comments on commit f4b6b3a

Please sign in to comment.