You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by mi...@apache.org on 2020/09/21 09:46:37 UTC
[httpcomponents-client] 02/09: Upgrade Parent to 12
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch pom-cleanup
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit b776b169a147ff103c0a1a0cf49ea045b999e15a
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 10:56:49 2020 +0200
Upgrade Parent to 12
Massively remove everything already present in the parent POM.
---
pom.xml | 39 ++++++++-------------------------------
1 file changed, 8 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ca22f7..8507074 100644
--- 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>