Merge pull request #62 from timothyjward/package-default

Update default package name used in Archetypes
osgi · Jun 19, 2018 · 2497da5 · 2497da5
2 parents 4632cae + 332deeb
commit 2497da5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 0 deletions.
diff --git a/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -5,6 +5,11 @@
     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="package">
+            <defaultValue>${groupId.replaceAll('-','.')}.${artifactId.replaceAll('-','.')}</defaultValue>
+        </requiredProperty>
+    </requiredProperties>
 
     <fileSets>
         <fileSet filtered="true" packaged="true"

diff --git a/archetypes/bundle-test/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/bundle-test/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -5,6 +5,11 @@
     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="package">
+            <defaultValue>${groupId.replaceAll('-','.')}.${artifactId.replaceAll('-','.')}</defaultValue>
+        </requiredProperty>
+    </requiredProperties>
 
     <fileSets>
         <fileSet filtered="true" encoding="UTF-8">

diff --git a/archetypes/ds-component/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/ds-component/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -5,6 +5,11 @@
     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="package">
+            <defaultValue>${groupId.replaceAll('-','.')}.${artifactId.replaceAll('-','.')}</defaultValue>
+        </requiredProperty>
+    </requiredProperties>
 
     <fileSets>
         <fileSet filtered="true" packaged="true"

diff --git a/archetypes/project/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/project/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -12,6 +12,9 @@
         <requiredProperty key="app-artifactId">
             <defaultValue>app</defaultValue>
         </requiredProperty>
+        <requiredProperty key="package">
+            <defaultValue>${groupId.replaceAll('-','.')}.${artifactId.replaceAll('-','.')}</defaultValue>
+        </requiredProperty>
     </requiredProperties>
 
     <fileSets>

diff --git a/archetypes/rest-component/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/rest-component/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -5,6 +5,11 @@
     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="package">
+            <defaultValue>${groupId.replaceAll('-','.')}.${artifactId.replaceAll('-','.')}</defaultValue>
+        </requiredProperty>
+    </requiredProperties>
 
     <fileSets>
         <fileSet filtered="true" packaged="true"