This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
The following commit(s) were added to refs/heads/develop by this push:
new 1028c1f Bumped the Apache parent to the new version 25
1028c1f is described below
commit 1028c1f123d6b89c87760182cff39cae70ccf73a
Author: cdutz <[email protected]>
AuthorDate: Mon Feb 21 14:17:25 2022 +0100
Bumped the Apache parent to the new version 25
Added documentation on how to use the archetype on Windows systems
---
pom.xml | 2 +-
site/pom.xml | 2 +-
site/src/site/asciidoc/users/index.adoc | 6 +++++-
tools/content-archetype/README.md | 10 +++++++++-
.../main/resources/archetype-resources/install-deps-centos.sh | 0
.../src/main/resources/archetype-resources/install-deps-mac.sh | 0
tools/pom.xml | 2 +-
7 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 10691a6..85584a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>25</version>
</parent>
<groupId>org.apache.training</groupId>
diff --git a/site/pom.xml b/site/pom.xml
index a79bf5c..09b3809 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>25</version>
<!-- Otherwise maven complains about the pom upstairs having different
coordinates. -->
<relativePath></relativePath>
</parent>
diff --git a/site/src/site/asciidoc/users/index.adoc
b/site/src/site/asciidoc/users/index.adoc
index fa7e98f..7934580 100644
--- a/site/src/site/asciidoc/users/index.adoc
+++ b/site/src/site/asciidoc/users/index.adoc
@@ -32,7 +32,11 @@ Please read the following chapter on how to do this.
In order to create an empty presentation to start with, please execute the
following command:
- mvn archetype:generate -DarchetypeGroupId=org.apache.training
-DarchetypeArtifactId=content-archetype -DarchetypeVersion=1.0.0-SNAPSHOT
+ mvn archetype:generate -DarchetypeGroupId=org.apache.training
-DarchetypeArtifactId=content-archetype -DarchetypeVersion=1.1.0-SNAPSHOT
+
+For Windows, you need to wrap every argument in double-quotes:
+
+ mvn archetype:generate "-DarchetypeGroupId=org.apache.training"
"-DarchetypeArtifactId=content-archetype" "-DarchetypeVersion=1.1.0-SNAPSHOT"
After choosing `groupId`, `artifactId`, `version` and `package` there should
be a new directory that matches the `artifactId` that you selected.
diff --git a/tools/content-archetype/README.md
b/tools/content-archetype/README.md
index 23cbc55..93011be 100644
--- a/tools/content-archetype/README.md
+++ b/tools/content-archetype/README.md
@@ -1,4 +1,12 @@
# Usage
- mvn archetype:generate -DarchetypeGroupId=org.apache.training
-DarchetypeArtifactId=content-archetype -DarchetypeVersion=1.0.0-SNAPSHOT
\ No newline at end of file
+## Non-Windows
+
+ mvn archetype:generate -DarchetypeGroupId=org.apache.training
-DarchetypeArtifactId=content-archetype -DarchetypeVersion=1.1.0-SNAPSHOT
+
+## Windows
+
+For Windows, you need to put each argument in double-quotes.
+
+ mvn archetype:generate "-DarchetypeGroupId=org.apache.training"
"-DarchetypeArtifactId=content-archetype" "-DarchetypeVersion=1.1.0-SNAPSHOT"
\ No newline at end of file
diff --git
a/tools/content-archetype/src/main/resources/archetype-resources/install-deps-centos.sh
b/tools/content-archetype/src/main/resources/archetype-resources/install-deps-centos.sh
old mode 100755
new mode 100644
diff --git
a/tools/content-archetype/src/main/resources/archetype-resources/install-deps-mac.sh
b/tools/content-archetype/src/main/resources/archetype-resources/install-deps-mac.sh
old mode 100755
new mode 100644
diff --git a/tools/pom.xml b/tools/pom.xml
index c14e25a..4b6636c 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>25</version>
<!-- Required in our case as per
http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_parent -->
<relativePath />