This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch releases/tools/1.0
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
The following commit(s) were added to refs/heads/releases/tools/1.0 by this
push:
new c8b4a13 - Merged back the changes from develop needed to address the
issues found in RC1
c8b4a13 is described below
commit c8b4a13f44cea8d993b4fe7bf425dd878b0cf0ca
Author: Christofer Dutz <[email protected]>
AuthorDate: Wed Sep 9 15:22:12 2020 +0200
- Merged back the changes from develop needed to address the issues found
in RC1
---
tools/NOTICE | 2 +-
tools/content-archetype/pom.xml | 26 ++++++++++++++--
.../META-INF/maven/archetype-metadata.xml | 9 +++++-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../resources/projects/basic/archetype.properties | 1 +
tools/pom.xml | 36 ++++++++++++++++++++++
6 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/tools/NOTICE b/tools/NOTICE
index 42c8ea1..fac3f46 100644
--- a/tools/NOTICE
+++ b/tools/NOTICE
@@ -1,5 +1,5 @@
Apache Training (incubating)
-Copyright 2019 The Apache Software Foundation
+Copyright 2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/tools/content-archetype/pom.xml b/tools/content-archetype/pom.xml
index 243c5da..ad33ddb 100644
--- a/tools/content-archetype/pom.xml
+++ b/tools/content-archetype/pom.xml
@@ -37,15 +37,37 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
</extension>
</extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <replace token="APACHE_TRAINING_TOOLS_VERSION"
value="${project.version}" dir="target/classes">
+ <include name="**/archetype-metadata.xml" />
+ </replace>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 29fbfa4..28d79d0 100644
---
a/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/tools/content-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -17,9 +17,15 @@
limitations under the License.
-->
-<archetype-descriptor
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd";
name="presentation-template"
+<archetype-descriptor
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd";
+ name="apache-training-presentation-template"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <requiredProperties>
+ <requiredProperty key="apacheTrainingToolsVersion">
+ <defaultValue>APACHE_TRAINING_TOOLS_VERSION</defaultValue>
+ </requiredProperty>
+ </requiredProperties>
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
@@ -45,6 +51,7 @@
<includes>
<include>install-deps-centos.sh</include>
<include>install-deps-mac.sh</include>
+ <include>pom.xml</include>
<include>README.md</include>
</includes>
</fileSet>
diff --git
a/tools/content-archetype/src/main/resources/archetype-resources/pom.xml
b/tools/content-archetype/src/main/resources/archetype-resources/pom.xml
index 6e27087..9805796 100644
--- a/tools/content-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/tools/content-archetype/src/main/resources/archetype-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.training</groupId>
<artifactId>content-parent-pom</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${apacheTrainingToolsVersion}</version>
<!-- Required in our case as per
http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent -->
<relativePath></relativePath>
diff --git
a/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
b/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
index e76dca7..984ff8e 100644
---
a/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
+++
b/tools/content-archetype/src/test/resources/projects/basic/archetype.properties
@@ -21,3 +21,4 @@ package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=basic
+apacheTrainingToolsVersion=1.0.0
diff --git a/tools/pom.xml b/tools/pom.xml
index fed4f31..7729103 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -60,7 +60,43 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
+ <!-- Generate the legally required text files in the jars -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.7.0</version>
+ <executions>
+ <execution>
+ <id>process-resource-bundles</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <!-- Will generate META-INF/{DEPENDENCIES,LICENSE,NOTICE} -->
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ <!-- Will generate META-INF/DISCLAIMER -->
+
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+ </resourceBundles>
+ <!-- Content in this directory will be appended to generated
resources -->
+
<appendedResourcesDirectory>${basedir}/src/remote-resources</appendedResourcesDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+
<finalName>apache-training-incubating-tools-${project.version}</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
