Add site.xml, inherit from turbine parent, remove duplicate settings in pom.xml, and update archetype plugins to 3.4.0
diff --git a/pom.xml b/pom.xml
index 5520daf..1bcd9fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>34</version>
- <relativePath/>
- <!-- like turbine parent -->
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>turbine-parent</artifactId>
+ <version>14</version>
+ <relativePath />
</parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-webapp-7.0-SNAPSHOT</artifactId>
@@ -69,7 +68,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.2.1</version>
+ <version>3.4.0</version>
</extension>
</extensions>
@@ -77,7 +76,7 @@
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.4.0</version>
<!-- skip tests in generated archetype's pom, here the integration-test would be skipped -->
<!--configuration>
<skip>true</skip>
@@ -161,9 +160,7 @@
<profile>
<id>apache-release</id>
- <properties>
- <dependency.check.skip>true</dependency.check.skip>
- </properties>
+ <!-- expanindg parent -profile -->
<build>
<plugins>
<plugin>
@@ -178,30 +175,11 @@
<configuration>
</configuration>
</plugin>
- <plugin>
- <groupId>net.nicoulaj.maven.plugins</groupId>
- <artifactId>checksum-maven-plugin</artifactId>
- <version>1.11</version>
- <configuration>
- <algorithms>
- <algorithm>SHA-512</algorithm>
- </algorithms>
- <!-- generate only sha for binaries and source zip/tar files from assembly -->
- <excludeMainArtifact>true</excludeMainArtifact>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>artifacts</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- force signatures to be created and uploaded on deploy -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>3.2.4</version>
+ <version>3.2.7</version>
<executions>
<execution>
<id>sign-artifacts</id>
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 0000000..780e474
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
+ name="Apache Turbine Webapp Archetype" combine.self="merge">
+
+ <!-- inherited from parent -->
+
+</site>
