diff --git a/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml
index dc88fe13f38..af777dd4a09 100644
--- a/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml
@@ -1,7 +1,7 @@
-
-
- jersey-quickstart-grizzly2
-
-
-
-
-
-
-
-
diff --git a/archetypes/jersey-quickstart-grizzly2/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/jersey-quickstart-grizzly2/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 00000000000..b55039641ba
--- /dev/null
+++ b/archetypes/jersey-quickstart-grizzly2/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+ src/main/java
+
+
+
+ src/test/java
+
+
+
\ No newline at end of file
diff --git a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
index 779f0802aff..9f25d21dc99 100644
--- a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
@@ -40,7 +40,7 @@
org.junit.jupiter
junit-jupiter
- \${junit-jupiter.version}
+ ${junit5.version}
test
@@ -83,8 +83,6 @@
${project.version}
- 5.10.2
UTF-8
- 3.2.5
diff --git a/archetypes/jersey-quickstart-webapp/pom.xml b/archetypes/jersey-quickstart-webapp/pom.xml
index 4fab9283191..21aa6b3d727 100644
--- a/archetypes/jersey-quickstart-webapp/pom.xml
+++ b/archetypes/jersey-quickstart-webapp/pom.xml
@@ -36,7 +36,7 @@
org.apache.maven.plugins
maven-resources-plugin
- 2.5
+ ${resources.mvn.plugin.version}
\
diff --git a/archetypes/jersey-quickstart-webapp/src/main/resources/META-INF/archetype.xml b/archetypes/jersey-quickstart-webapp/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index cea1eea5e9d..00000000000
--- a/archetypes/jersey-quickstart-webapp/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
- jersey-quickstart-webapp
-
-
-
-
- src/main/webapp/index.jsp
- src/main/webapp/WEB-INF/web.xml
-
-
diff --git a/archetypes/jersey-quickstart-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/jersey-quickstart-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 00000000000..831f0acb060
--- /dev/null
+++ b/archetypes/jersey-quickstart-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+ src/main/java
+
+
+ src/main/webapp
+
+
+ src/test/java
+
+
+
\ No newline at end of file
diff --git a/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml
index fc70d513571..341fb67664e 100644
--- a/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ ${compiler.mvn.plugin.version}
true
@@ -63,6 +63,5 @@
${project.version}
UTF-8
- 3.4.0
diff --git a/examples/pom.xml b/examples/pom.xml
index fd0009e5901..b3d8cfcbd46 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -202,7 +202,7 @@
org.apache.maven.plugins
maven-resources-plugin
- 2.6
+ ${resources.mvn.plugin.version}