♻️ Misc. clean-up

moditect · Nov 28, 2021 · e184ef2 · e184ef2
1 parent 15946e9
commit e184ef2
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Apache Maven archetypes for bootstrapping new open-source projects.
 
-Think _maven-quickstart-archetype_ and friends, but more modern and opinionated.
+Think [Maven Quickstart Archetype](https://maven.apache.org/archetypes/maven-archetype-quickstart/) and friends, but more modern, complete, and opinionated.
 
 ## Features
 
@@ -15,6 +15,7 @@ The archetypes aim add providing commonly used functionality, while defining sen
 
 ## Components
 
+* _oss-quickstart-archetype-simple_: A Maven archetype for creating a single module project following best practices
 * _oss-quickstart-template-simple_: A template for the single module archetype
 
 ## License

diff --git a/oss-quickstart-archetype-simple/src/main/resources/META-INF/maven/archetype-metadata.xml b/oss-quickstart-archetype-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 http://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd" name="oss-quickstart-template"
+<archetype-descriptor xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 http://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd" name="oss-quickstart-template-simple"
     xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <fileSets>

diff --git a/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/README.md b/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/README.md
@@ -1,6 +1,6 @@
-# OSS Bootstrap Simple Template
+# My OSS Project
 
-Project template used for creating the single module OSS Bootstrap Maven Archetype.
+An open-source project bootstrapped using the [ModiTect OSS Quickstart](https://github.com/moditect/oss-quickstart) archetype.
 
 ## Build
 

diff --git a/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/pom.xml b/oss-quickstart-archetype-simple/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>${groupId}</groupId>
@@ -30,10 +31,10 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
 
-  <name>OSS Quickstart Template</name>
-  <description>OSS Quickstart Template</description>
+  <name>My OSS Project</name>
+  <description>My Latest OSS Project</description>
   <inceptionYear>2021</inceptionYear>
-  <url>https://github.com/moditect/oss-quickstart</url>
+  <url>tbd.</url>
 
   <licenses>
     <license>

diff --git a/oss-quickstart-archetype-simple/src/test/resources/projects/basic/archetype.properties b/oss-quickstart-archetype-simple/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Sun Nov 28 11:29:36 CET 2021
+#Sun Nov 28 12:24:13 CET 2021
 package=it.pkg
 groupId=archetype.it
 artifactId=basic

diff --git a/oss-quickstart-template-simple/README.md b/oss-quickstart-template-simple/README.md
@@ -1,6 +1,6 @@
-# OSS Bootstrap Simple Template
+# My OSS Project
 
-Project template used for creating the single module OSS Bootstrap Maven Archetype.
+An open-source project bootstrapped using the [ModiTect OSS Quickstart](https://github.com/moditect/oss-quickstart) archetype.
 
 ## Build
 

diff --git a/update-from-templates.sh b/update-from-templates.sh
@@ -4,3 +4,10 @@ set -eo pipefail
 mvn clean verify -f oss-quickstart-template-simple/pom.xml
 mvn archetype:create-from-project -f oss-quickstart-template-simple/pom.xml
 cp -r oss-quickstart-template-simple/target/generated-sources/archetype/src oss-quickstart-archetype-simple
+
+# The archetype creation process drops the line-wrap after the license header in the pom.xml; adding this back
+# using gsed on macOS to have flag compatibility with gnu sed on Linux
+gsed -i 's/--><project/-->\n<project/g' oss-quickstart-archetype-simple/src/main/resources/archetype-resources/pom.xml
+gsed -i 's/<name>OSS.*<\/name>/<name>My OSS Project<\/name>/g' oss-quickstart-archetype-simple/src/main/resources/archetype-resources/pom.xml
+gsed -i 's/<description>.*<\/description>/<description>My Latest OSS Project<\/description>/g' oss-quickstart-archetype-simple/src/main/resources/archetype-resources/pom.xml
+gsed -i 's/<url>https.*<\/url>/<url>tbd.<\/url>/g' oss-quickstart-archetype-simple/src/main/resources/archetype-resources/pom.xml