Merge remote-tracking branch 'asf/trunk' into trunk
diff --git a/kerby-dist/has-dist/assembly.xml b/kerby-dist/has-dist/assembly.xml
index 66d5402..a2a4ee6 100644
--- a/kerby-dist/has-dist/assembly.xml
+++ b/kerby-dist/has-dist/assembly.xml
@@ -37,7 +37,13 @@
<includes>
<include>log4j.properties</include>
<include>README.txt</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>licenses</directory>
+ <outputDirectory>licenses</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
diff --git a/kerby-dist/has-dist/pom.xml b/kerby-dist/has-dist/pom.xml
index 06c0876..970a0b9 100644
--- a/kerby-dist/has-dist/pom.xml
+++ b/kerby-dist/has-dist/pom.xml
@@ -57,44 +57,50 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>dist</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeArtifactIds>jdk.tools</excludeArtifactIds>
+ <outputDirectory>target/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <outputDirectory>target/lib</outputDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/kerby-dist/kdc-dist/assembly.xml b/kerby-dist/kdc-dist/assembly.xml
index 33030cb..52c6287 100644
--- a/kerby-dist/kdc-dist/assembly.xml
+++ b/kerby-dist/kdc-dist/assembly.xml
@@ -37,7 +37,13 @@
<includes>
<include>log4j.properties</include>
<include>README.txt</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>licenses</directory>
+ <outputDirectory>licenses</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
diff --git a/kerby-dist/tool-dist/assembly.xml b/kerby-dist/tool-dist/assembly.xml
index 66d5402..a2a4ee6 100644
--- a/kerby-dist/tool-dist/assembly.xml
+++ b/kerby-dist/tool-dist/assembly.xml
@@ -37,7 +37,13 @@
<includes>
<include>log4j.properties</include>
<include>README.txt</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>licenses</directory>
+ <outputDirectory>licenses</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
