update to version 11
This commit is contained in:
parent
8d1f93bca6
commit
8c32473bb7
@ -30,11 +30,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.apache</groupId>
|
<groupId>org.apache</groupId>
|
||||||
<artifactId>apache</artifactId>
|
<artifactId>apache</artifactId>
|
||||||
<version>18</version>
|
<version>21</version>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpcomponents-parent</artifactId>
|
<artifactId>httpcomponents-parent</artifactId>
|
||||||
<version>9</version>
|
<version>11</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>Apache HttpComponents Parent</name>
|
<name>Apache HttpComponents Parent</name>
|
||||||
<url>http://hc.apache.org/</url>
|
<url>http://hc.apache.org/</url>
|
||||||
@ -43,6 +43,30 @@
|
|||||||
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
Version 11 - changes since version 10
|
||||||
|
=====================================
|
||||||
|
|
||||||
|
org.apache.apache 18 -> 21
|
||||||
|
maven-jar-plugin 3.0.2 ->
|
||||||
|
maven-resources-plugin 3.0.2 -> 3.1.0
|
||||||
|
maven-resources-plugin 2.5 -> 3.0.0
|
||||||
|
maven-project-info-reports-plugin 2.9 -> 3.0.0
|
||||||
|
maven-site-plugin 3.6 -> 3.7.1 (allows building with Java 9)
|
||||||
|
wagon-ssh 2.10 -> 3.2.0.
|
||||||
|
Added dependency-check-maven 3.3.1
|
||||||
|
maven-javadoc-plugin 3.0.0-M1 -> 3.0.1
|
||||||
|
maven-bundle-plugin 3.3.0 -> 3.5.1
|
||||||
|
jacoco-maven-plugin 0.7.9 -> 0.8.1
|
||||||
|
maven-clean-plugin 3.0.0 -> 3.1.0
|
||||||
|
maven-compiler-plugin 3.7.0 -> 3.8.0
|
||||||
|
maven-surefire-plugin 2.22.1 -> 2.22.1
|
||||||
|
|
||||||
|
Version 10 - changes since version 9
|
||||||
|
====================================
|
||||||
|
|
||||||
|
HC style check definition 1 -> 2
|
||||||
|
maven-surefire-plugin 2.20 -> 2.21.0 (required to build with Java 9 and Java 10)
|
||||||
|
|
||||||
Version 9 - changes since version 8
|
Version 9 - changes since version 8
|
||||||
===================================
|
===================================
|
||||||
|
|
||||||
@ -490,12 +514,12 @@ Fixed JIRA link
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
<version>3.0.0</version>
|
<version>3.1.0</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.7.0</version>
|
<version>3.8.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>${maven.compiler.source}</source>
|
<source>${maven.compiler.source}</source>
|
||||||
<target>${maven.compiler.target}</target>
|
<target>${maven.compiler.target}</target>
|
||||||
@ -528,7 +552,7 @@ Fixed JIRA link
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>3.0.2</version>
|
<version>3.1.0</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@ -563,7 +587,7 @@ Fixed JIRA link
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
<version>3.0.2</version>
|
<version>3.1.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>copy-resources</id>
|
<id>copy-resources</id>
|
||||||
@ -586,12 +610,12 @@ Fixed JIRA link
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-site-plugin</artifactId>
|
<artifactId>maven-site-plugin</artifactId>
|
||||||
<version>3.6</version>
|
<version>3.7.1</version>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.maven.wagon</groupId>
|
<groupId>org.apache.maven.wagon</groupId>
|
||||||
<artifactId>wagon-ssh</artifactId>
|
<artifactId>wagon-ssh</artifactId>
|
||||||
<version>2.10</version>
|
<version>3.2.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<executions>
|
<executions>
|
||||||
@ -643,7 +667,7 @@ Fixed JIRA link
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.felix</groupId>
|
<groupId>org.apache.felix</groupId>
|
||||||
<artifactId>maven-bundle-plugin</artifactId>
|
<artifactId>maven-bundle-plugin</artifactId>
|
||||||
<version>3.3.0</version>
|
<version>3.5.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
@ -666,7 +690,7 @@ Fixed JIRA link
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>hc-stylecheck</artifactId>
|
<artifactId>hc-stylecheck</artifactId>
|
||||||
<version>1</version>
|
<version>2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<configuration>
|
<configuration>
|
||||||
@ -689,11 +713,6 @@ Fixed JIRA link
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
|
||||||
<version>${hc.project-info.version}</version>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
</build>
|
</build>
|
||||||
@ -851,6 +870,21 @@ Fixed JIRA link
|
|||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>lax-doclint</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<additionalparam>-Xdoclint:-missing</additionalparam>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
|
||||||
<profile>
|
<profile>
|
||||||
<id>travis-cobertura</id>
|
<id>travis-cobertura</id>
|
||||||
<build>
|
<build>
|
||||||
@ -933,7 +967,25 @@ Fixed JIRA link
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>owasp</id>
|
||||||
|
<reporting>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.owasp</groupId>
|
||||||
|
<artifactId>dependency-check-maven</artifactId>
|
||||||
|
<version>3.3.1</version>
|
||||||
|
<reportSets>
|
||||||
|
<reportSet>
|
||||||
|
<reports>
|
||||||
|
<report>aggregate</report>
|
||||||
|
</reports>
|
||||||
|
</reportSet>
|
||||||
|
</reportSets>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</reporting>
|
||||||
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<prerequisites>
|
<prerequisites>
|
||||||
@ -950,16 +1002,16 @@ Fixed JIRA link
|
|||||||
|
|
||||||
<!-- Define versions of all report plugins, because they should match usage in pluginManagement and modules -->
|
<!-- Define versions of all report plugins, because they should match usage in pluginManagement and modules -->
|
||||||
<hc.clirr.version>2.8</hc.clirr.version>
|
<hc.clirr.version>2.8</hc.clirr.version>
|
||||||
<hc.javadoc.version>3.0.0-M1</hc.javadoc.version>
|
<hc.javadoc.version>3.0.1</hc.javadoc.version>
|
||||||
<hc.jxr.version>2.5</hc.jxr.version>
|
<hc.jxr.version>3.0.0</hc.jxr.version>
|
||||||
<hc.surefire-report.version>2.20</hc.surefire-report.version>
|
<hc.surefire-report.version>2.22.0</hc.surefire-report.version>
|
||||||
<hc.surefire.version>2.20</hc.surefire.version>
|
<hc.surefire.version>2.22.1</hc.surefire.version>
|
||||||
<hc.project-info.version>2.9</hc.project-info.version>
|
<hc.project-info.version>3.0.0</hc.project-info.version>
|
||||||
<hc.checkstyle.version>2.17</hc.checkstyle.version>
|
<hc.checkstyle.version>2.17</hc.checkstyle.version>
|
||||||
<hc.rat.version>0.12</hc.rat.version>
|
<hc.rat.version>0.12</hc.rat.version>
|
||||||
<hc.animal-sniffer.version>1.16</hc.animal-sniffer.version>
|
<hc.animal-sniffer.version>1.16</hc.animal-sniffer.version>
|
||||||
<hc.animal-sniffer.signature.version>1.0</hc.animal-sniffer.signature.version>
|
<hc.animal-sniffer.signature.version>1.0</hc.animal-sniffer.signature.version>
|
||||||
<hc.jacoco.version>0.7.9</hc.jacoco.version>
|
<hc.jacoco.version>0.8.1</hc.jacoco.version>
|
||||||
<hc.cobertura.version>2.7</hc.cobertura.version>
|
<hc.cobertura.version>2.7</hc.cobertura.version>
|
||||||
<hc.coveralls.version>4.3.0</hc.coveralls.version>
|
<hc.coveralls.version>4.3.0</hc.coveralls.version>
|
||||||
<hc.coveralls.timestampFormat>EpochMillis</hc.coveralls.timestampFormat>
|
<hc.coveralls.timestampFormat>EpochMillis</hc.coveralls.timestampFormat>
|
||||||
@ -1,10 +1,10 @@
|
|||||||
Name: httpcomponents-project
|
Name: httpcomponents-project
|
||||||
Summary: Apache components to build HTTP enabled services
|
Summary: Apache components to build HTTP enabled services
|
||||||
Version: 9
|
Version: 11
|
||||||
Release: 1
|
Release: 1
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://hc.apache.org/
|
URL: http://hc.apache.org/
|
||||||
Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/9/httpcomponents-parent-9.pom
|
Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/11/httpcomponents-parent-11.pom
|
||||||
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
|
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: maven-local mvn(org.apache:apache:pom:)
|
BuildRequires: maven-local mvn(org.apache:apache:pom:)
|
||||||
@ -35,5 +35,8 @@ cp -p %{SOURCE1} .
|
|||||||
%doc LICENSE-2.0.txt
|
%doc LICENSE-2.0.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 26 2023 Ge Wang <wang__ge@126.com> - 11-1
|
||||||
|
- update to version 11
|
||||||
|
|
||||||
* Tue Jun 9 2020 huanghaitao <huanghaitao8@huawei.com> - 9-1
|
* Tue Jun 9 2020 huanghaitao <huanghaitao8@huawei.com> - 9-1
|
||||||
- package init
|
- package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user