Upgrade Parent to 12

Massively remove everything already present in the parent POM.
apache · Sep 22, 2020 · 14e2f3b · 14e2f3b
1 parent 4b5a2f4
commit 14e2f3b
Showing 1 changed file with 8 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-parent</artifactId>
-    <version>11</version>
+    <version>12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.httpcomponents.client5</groupId>
@@ -39,19 +39,6 @@
   <inceptionYear>1999</inceptionYear>
   <packaging>pom</packaging>
 
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
   <issueManagement>
     <system>Jira</system>
     <url>https://issues.apache.org/jira/browse/HTTPCLIENT</url>
@@ -192,15 +179,8 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Specification-Title>HttpComponents ${project.name}</Specification-Title>
-              <Specification-Version>${project.version}</Specification-Version>
-              <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-              <Implementation-Title>HttpComponents ${project.name}</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-              <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
-              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
               <Automatic-Module-Name>${Automatic-Module-Name}</Automatic-Module-Name>
-              <url>${project.url}</url>
+              <Implementation-URL>${project.url}</Implementation-URL>
             </manifestEntries>
           </archive>
         </configuration>
@@ -254,9 +234,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
         <executions>
           <execution>
             <id>validate-main</id>
@@ -267,7 +244,9 @@
               <consoleOutput>true</consoleOutput>
               <failsOnError>true</failsOnError>
               <linkXRef>false</linkXRef>
-              <sourceDirectory>${basedir}/src/main</sourceDirectory>
+              <sourceDirectories>
+                <sourceDirectory>${basedir}/src/main</sourceDirectory>
+              </sourceDirectories>
             </configuration>
             <goals>
               <goal>checkstyle</goal>
@@ -282,7 +261,9 @@
               <consoleOutput>true</consoleOutput>
               <failsOnError>true</failsOnError>
               <linkXRef>false</linkXRef>
-              <sourceDirectory>${basedir}/src/test</sourceDirectory>
+              <sourceDirectories>
+                <sourceDirectory>${basedir}/src/test</sourceDirectory>
+              </sourceDirectories>
             </configuration>
             <goals>
               <goal>checkstyle</goal>
@@ -321,10 +302,6 @@
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>