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/08 13:29:43 UTC
[httpcomponents-core] branch 5.1.x updated (65726a3 -> 3bcaeb7)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git.
from 65726a3 HTTPCORE-649: Implement ByteArrayBuffer.append(ByteBuffer)
new ebcdbc2 Upgrade Parent to 12
new 5e414bb Use unique Surefire version throughout
new 2c8a264 Update SCM URLs
new aab4e9c Remove default config
new 3a0fcc0 Remove plugin executions run by release already
new 6b1b52e Unify Javadoc report config
new cca3a89 Unify JXR and Surefire report config
new a956855 Remove redundant plugin
new 05fc379 Replace HTTP with HTTPS
new 3bcaeb7 Add automatic module name
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
httpcore5-h2/pom.xml | 44 +++---------------
httpcore5-reactive/pom.xml | 40 +++-------------
httpcore5-testing/pom.xml | 46 +++----------------
httpcore5/pom.xml | 37 ++-------------
pom.xml | 111 ++++++++++++++++++---------------------------
5 files changed, 69 insertions(+), 209 deletions(-)
[httpcomponents-core] 07/10: Unify JXR and Surefire report config
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit cca3a8928593409c9940b6dfcb915a829e2a9c59
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 7 09:19:55 2020 +0200
Unify JXR and Surefire report config
---
httpcore5-h2/pom.xml | 9 ---------
httpcore5-reactive/pom.xml | 9 ---------
httpcore5-testing/pom.xml | 9 ---------
httpcore5/pom.xml | 9 ---------
pom.xml | 9 ++++++++-
5 files changed, 8 insertions(+), 37 deletions(-)
diff --git a/httpcore5-h2/pom.xml b/httpcore5-h2/pom.xml
index d2667b0..0986bb4 100644
--- a/httpcore5-h2/pom.xml
+++ b/httpcore5-h2/pom.xml
@@ -114,15 +114,6 @@
</reportSet>
</reportSets>
</plugin>
-
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
</plugins>
</reporting>
diff --git a/httpcore5-reactive/pom.xml b/httpcore5-reactive/pom.xml
index 7c67c0b..3f2173b 100644
--- a/httpcore5-reactive/pom.xml
+++ b/httpcore5-reactive/pom.xml
@@ -101,15 +101,6 @@
</reportSet>
</reportSets>
</plugin>
-
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
</plugins>
</reporting>
diff --git a/httpcore5-testing/pom.xml b/httpcore5-testing/pom.xml
index 28f3e48..096d383 100644
--- a/httpcore5-testing/pom.xml
+++ b/httpcore5-testing/pom.xml
@@ -171,15 +171,6 @@
</reportSet>
</reportSets>
</plugin>
-
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
</plugins>
</reporting>
diff --git a/httpcore5/pom.xml b/httpcore5/pom.xml
index 6986027..c9773cc 100644
--- a/httpcore5/pom.xml
+++ b/httpcore5/pom.xml
@@ -137,15 +137,6 @@
</reportSet>
</reportSets>
</plugin>
-
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
</plugins>
</reporting>
diff --git a/pom.xml b/pom.xml
index f99f4f0..b26b0f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,7 +274,14 @@
<comparisonVersion>${api.comparison.version}</comparisonVersion>
</configuration>
</plugin>
-
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>${hc.jxr.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${hc.surefire.version}</version>
+ </plugin>
</plugins>
</reporting>
[httpcomponents-core] 09/10: Replace HTTP with HTTPS
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 05fc379616cfe63740d9470b6db78699abe20827
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 7 08:35:34 2020 +0200
Replace HTTP with HTTPS
---
httpcore5-h2/pom.xml | 2 +-
httpcore5-reactive/pom.xml | 2 +-
httpcore5-testing/pom.xml | 2 +-
httpcore5/pom.xml | 2 +-
pom.xml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/httpcore5-h2/pom.xml b/httpcore5-h2/pom.xml
index 0986bb4..bb61da4 100644
--- a/httpcore5-h2/pom.xml
+++ b/httpcore5-h2/pom.xml
@@ -33,7 +33,7 @@
<artifactId>httpcore5-h2</artifactId>
<name>Apache HttpComponents Core HTTP/2</name>
<description>Apache HttpComponents HTTP/2 Core Components</description>
- <url>http://hc.apache.org/httpcomponents-core-ga</url>
+ <url>https://hc.apache.org/httpcomponents-core-5.1.x/</url>
<packaging>jar</packaging>
<dependencies>
diff --git a/httpcore5-reactive/pom.xml b/httpcore5-reactive/pom.xml
index 3f2173b..1cb0338 100644
--- a/httpcore5-reactive/pom.xml
+++ b/httpcore5-reactive/pom.xml
@@ -34,7 +34,7 @@
<artifactId>httpcore5-reactive</artifactId>
<name>Apache HttpComponents Core Reactive Extensions</name>
<description>Apache HttpComponents Reactive Streams Bindings</description>
- <url>http://hc.apache.org/httpcomponents-core-ga</url>
+ <url>https://hc.apache.org/httpcomponents-core-5.1.x/</url>
<packaging>jar</packaging>
<dependencies>
diff --git a/httpcore5-testing/pom.xml b/httpcore5-testing/pom.xml
index 096d383..1ae7f4d 100644
--- a/httpcore5-testing/pom.xml
+++ b/httpcore5-testing/pom.xml
@@ -33,7 +33,7 @@
<artifactId>httpcore5-testing</artifactId>
<name>Apache HttpComponents Core Integration Tests</name>
<description>Apache HttpComponents HTTP/2 and HTTP/1.1 core component integration tests</description>
- <url>http://hc.apache.org/httpcomponents-core-ga</url>
+ <url>https://hc.apache.org/httpcomponents-core-5.1.x/</url>
<packaging>jar</packaging>
<dependencies>
diff --git a/httpcore5/pom.xml b/httpcore5/pom.xml
index c9773cc..c8fb5bc 100644
--- a/httpcore5/pom.xml
+++ b/httpcore5/pom.xml
@@ -34,7 +34,7 @@
<name>Apache HttpComponents Core HTTP/1.1</name>
<inceptionYear>2005</inceptionYear>
<description>Apache HttpComponents HTTP/1.1 core components</description>
- <url>http://hc.apache.org/httpcomponents-core-ga</url>
+ <url>https://hc.apache.org/httpcomponents-core-5.1.x/</url>
<packaging>jar</packaging>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 1062863..f214514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,13 +35,13 @@
<name>Apache HttpComponents Core Parent</name>
<version>5.1-alpha1-SNAPSHOT</version>
<description>Apache HttpComponents Core is a library of components for building HTTP enabled services</description>
- <url>http://hc.apache.org/httpcomponents-core-5.0.x/</url>
+ <url>https://hc.apache.org/httpcomponents-core-5.1.x/</url>
<inceptionYear>2005</inceptionYear>
<packaging>pom</packaging>
<issueManagement>
<system>Jira</system>
- <url>http://issues.apache.org/jira/browse/HTTPCORE</url>
+ <url>https://issues.apache.org/jira/browse/HTTPCORE</url>
</issueManagement>
<scm>
[httpcomponents-core] 03/10: Update SCM URLs
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 2c8a264c190fe2ca270260fb7cb0361402a93472
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 7 09:14:02 2020 +0200
Update SCM URLs
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index b407399..b8dfc94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,10 +45,10 @@
</issueManagement>
<scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/httpcomponents-core.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/httpcomponents-core.git</developerConnection>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/httpcomponents-core.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/httpcomponents-core.git</developerConnection>
<url>https://github.com/apache/httpcomponents-core/tree/${project.scm.tag}</url>
- <tag>5.1-alpha1-SNAPSHOT</tag>
+ <tag>5.1.x</tag>
</scm>
<modules>
[httpcomponents-core] 05/10: Remove plugin executions run by
release already
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 3a0fcc00bc65cee47b7ad946778b33b8e6b3f861
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 7 09:16:47 2020 +0200
Remove plugin executions run by release already
---
pom.xml | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index b8dfc94..a0995a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,26 +123,7 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<!-- reduce console output. Can override with -Dquiet=false -->
<quiet>true</quiet>
[httpcomponents-core] 04/10: Remove default config
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit aab4e9caa87e2556040e39114a87d52b1e8ecf2c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 7 09:16:06 2020 +0200
Remove default config
---
httpcore5-h2/pom.xml | 3 ---
httpcore5-reactive/pom.xml | 2 --
httpcore5-testing/pom.xml | 6 ------
httpcore5/pom.xml | 1 -
4 files changed, 12 deletions(-)
diff --git a/httpcore5-h2/pom.xml b/httpcore5-h2/pom.xml
index ec695ce..8c41405 100644
--- a/httpcore5-h2/pom.xml
+++ b/httpcore5-h2/pom.xml
@@ -41,12 +41,10 @@
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.conscrypt</groupId>
<artifactId>conscrypt-openjdk-uber</artifactId>
- <scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -92,7 +90,6 @@
<resources>
<resource>
<directory>src/test/java/org/apache/hc/core5/http2/examples</directory>
- <filtering>false</filtering>
</resource>
</resources>
</configuration>
diff --git a/httpcore5-reactive/pom.xml b/httpcore5-reactive/pom.xml
index 58142fd..b13e147 100644
--- a/httpcore5-reactive/pom.xml
+++ b/httpcore5-reactive/pom.xml
@@ -42,7 +42,6 @@
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
@@ -78,7 +77,6 @@
<resources>
<resource>
<directory>src/test/java/org/apache/hc/core5/reactive/examples</directory>
- <filtering>false</filtering>
</resource>
</resources>
</configuration>
diff --git a/httpcore5-testing/pom.xml b/httpcore5-testing/pom.xml
index c4e7113..21c12b7 100644
--- a/httpcore5-testing/pom.xml
+++ b/httpcore5-testing/pom.xml
@@ -41,36 +41,30 @@
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5-h2</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5-reactive</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.4</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/httpcore5/pom.xml b/httpcore5/pom.xml
index f70ea5c..3e3ddc7 100644
--- a/httpcore5/pom.xml
+++ b/httpcore5/pom.xml
@@ -104,7 +104,6 @@
<resources>
<resource>
<directory>src/test/java/org/apache/hc/core5/http/examples</directory>
- <filtering>false</filtering>
</resource>
</resources>
</configuration>
[httpcomponents-core] 10/10: Add automatic module name
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 3bcaeb76df2255df54c298c23bc3da8ffe706b23
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Sep 8 10:52:39 2020 +0200
Add automatic module name
---
httpcore5-h2/pom.xml | 8 ++++++--
httpcore5-reactive/pom.xml | 6 +++++-
httpcore5-testing/pom.xml | 4 ++++
httpcore5/pom.xml | 4 ++++
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/httpcore5-h2/pom.xml b/httpcore5-h2/pom.xml
index bb61da4..004d5e2 100644
--- a/httpcore5-h2/pom.xml
+++ b/httpcore5-h2/pom.xml
@@ -36,6 +36,10 @@
<url>https://hc.apache.org/httpcomponents-core-5.1.x/</url>
<packaging>jar</packaging>
+ <properties>
+ <Automatic-Module-Name>org.apache.httpcomponents.core5.httpcore5.h2</Automatic-Module-Name>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
@@ -96,9 +100,9 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
-
+
<reporting>
<plugins>
<plugin>
diff --git a/httpcore5-reactive/pom.xml b/httpcore5-reactive/pom.xml
index 1cb0338..4fe7aa4 100644
--- a/httpcore5-reactive/pom.xml
+++ b/httpcore5-reactive/pom.xml
@@ -37,6 +37,10 @@
<url>https://hc.apache.org/httpcomponents-core-5.1.x/</url>
<packaging>jar</packaging>
+ <properties>
+ <Automatic-Module-Name>org.apache.httpcomponents.core5.httpcore5.reactive</Automatic-Module-Name>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
@@ -83,7 +87,7 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
<reporting>
diff --git a/httpcore5-testing/pom.xml b/httpcore5-testing/pom.xml
index 1ae7f4d..2d11b5a 100644
--- a/httpcore5-testing/pom.xml
+++ b/httpcore5-testing/pom.xml
@@ -36,6 +36,10 @@
<url>https://hc.apache.org/httpcomponents-core-5.1.x/</url>
<packaging>jar</packaging>
+ <properties>
+ <Automatic-Module-Name>org.apache.httpcomponents.core5.httpcore5.testing</Automatic-Module-Name>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
diff --git a/httpcore5/pom.xml b/httpcore5/pom.xml
index c8fb5bc..3cfe0b9 100644
--- a/httpcore5/pom.xml
+++ b/httpcore5/pom.xml
@@ -37,6 +37,10 @@
<url>https://hc.apache.org/httpcomponents-core-5.1.x/</url>
<packaging>jar</packaging>
+ <properties>
+ <Automatic-Module-Name>org.apache.httpcomponents.core5.httpcore5</Automatic-Module-Name>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
[httpcomponents-core] 02/10: Use unique Surefire version throughout
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 5e414bbd60c612bf49f25187774225f7789e73ff
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 7 09:13:27 2020 +0200
Use unique Surefire version throughout
---
httpcore5-testing/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/httpcore5-testing/pom.xml b/httpcore5-testing/pom.xml
index a0f55a2..c4e7113 100644
--- a/httpcore5-testing/pom.xml
+++ b/httpcore5-testing/pom.xml
@@ -108,7 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.2</version>
+ <version>${hc.surefire.version}</version>
<executions>
<execution>
<goals>
[httpcomponents-core] 08/10: Remove redundant plugin
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit a9568551352c3d5d6e646e08a554e3212ea3ebb0
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 7 09:20:14 2020 +0200
Remove redundant plugin
---
pom.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index b26b0f2..1062863 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,9 +132,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<executions>
[httpcomponents-core] 01/10: Upgrade Parent to 12
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit ebcdbc202e301f6bd2c6b2b2bf0a33830e3a20cf
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 7 09:12:51 2020 +0200
Upgrade Parent to 12
Massively remove everything already present in the parent POM.
---
pom.xml | 45 ++++++++++++---------------------------------
1 file changed, 12 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f48130..b407399 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.core5</groupId>
@@ -39,19 +39,6 @@
<inceptionYear>2005</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>http://issues.apache.org/jira/browse/HTTPCORE</url>
@@ -129,14 +116,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>
- <url>${project.url}</url>
+ <Automatic-Module-Name>${Automatic-Module-Name}</Automatic-Module-Name>
+ <Implementation-URL>${project.url}</Implementation-URL>
</manifestEntries>
</archive>
</configuration>
@@ -177,9 +158,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>
@@ -190,7 +168,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>
@@ -205,7 +185,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>
@@ -220,7 +202,9 @@
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
- <sourceDirectory>${basedir}/src/examples</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/examples</sourceDirectory>
+ </sourceDirectories>
</configuration>
<goals>
<goal>checkstyle</goal>
@@ -262,11 +246,6 @@
</excludes>
</configuration>
</plugin>
- <!-- Remove after upgrade of HC Parent -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
</plugins>
</build>
[httpcomponents-core] 06/10: Unify Javadoc report config
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 5.1.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 6b1b52eb056bceec309fd7779f4bb17a566f1c28
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 7 09:19:12 2020 +0200
Unify Javadoc report config
---
httpcore5-h2/pom.xml | 22 ----------------------
httpcore5-reactive/pom.xml | 21 ---------------------
httpcore5-testing/pom.xml | 23 -----------------------
httpcore5/pom.xml | 21 ---------------------
pom.xml | 25 ++++++++++++++++++++-----
5 files changed, 20 insertions(+), 92 deletions(-)
diff --git a/httpcore5-h2/pom.xml b/httpcore5-h2/pom.xml
index 8c41405..d2667b0 100644
--- a/httpcore5-h2/pom.xml
+++ b/httpcore5-h2/pom.xml
@@ -101,28 +101,6 @@
<reporting>
<plugins>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${hc.javadoc.version}</version>
- <configuration>
- <!-- reduce console output. Can override with -Dquiet=false -->
- <quiet>true</quiet>
- <source>${maven.compiler.source}</source>
- <links>
- <link>http://docs.oracle.com/javase/7/docs/api/</link>
- <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
- </links>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<inherited>false</inherited>
diff --git a/httpcore5-reactive/pom.xml b/httpcore5-reactive/pom.xml
index b13e147..7c67c0b 100644
--- a/httpcore5-reactive/pom.xml
+++ b/httpcore5-reactive/pom.xml
@@ -88,27 +88,6 @@
<reporting>
<plugins>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${hc.javadoc.version}</version>
- <configuration>
- <!-- reduce console output. Can override with -Dquiet=false -->
- <quiet>true</quiet>
- <source>${maven.compiler.source}</source>
- <links>
- <link>http://docs.oracle.com/javase/7/docs/api/</link>
- </links>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<inherited>false</inherited>
diff --git a/httpcore5-testing/pom.xml b/httpcore5-testing/pom.xml
index 21c12b7..28f3e48 100644
--- a/httpcore5-testing/pom.xml
+++ b/httpcore5-testing/pom.xml
@@ -158,29 +158,6 @@
<reporting>
<plugins>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${hc.javadoc.version}</version>
- <configuration>
- <!-- reduce console output. Can override with -Dquiet=false -->
- <quiet>true</quiet>
- <source>${maven.compiler.source}</source>
- <links>
- <link>http://docs.oracle.com/javase/7/docs/api/</link>
- <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
- <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
- </links>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<inherited>false</inherited>
diff --git a/httpcore5/pom.xml b/httpcore5/pom.xml
index 3e3ddc7..6986027 100644
--- a/httpcore5/pom.xml
+++ b/httpcore5/pom.xml
@@ -124,27 +124,6 @@
<reporting>
<plugins>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${hc.javadoc.version}</version>
- <configuration>
- <!-- reduce console output. Can override with -Dquiet=false -->
- <quiet>true</quiet>
- <source>${maven.compiler.source}</source>
- <links>
- <link>http://docs.oracle.com/javase/7/docs/api/</link>
- </links>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<inherited>false</inherited>
diff --git a/pom.xml b/pom.xml
index a0995a9..f99f4f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,11 +125,9 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <!-- reduce console output. Can override with -Dquiet=false -->
- <quiet>true</quiet>
- <source>${maven.compiler.source}</source>
<links>
- <link>http://docs.oracle.com/javase/7/docs/api/</link>
+ <link>${project.url}/httpcore5/apidocs/</link>
+ <link>${project.url}/httpcore5-h2/apidocs/</link>
</links>
</configuration>
</plugin>
@@ -250,7 +248,24 @@
</reportSet>
</reportSets>
</plugin>
-
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${hc.javadoc.version}</version>
+ <configuration>
+ <quiet>true</quiet>
+ <links>
+ <link>${project.url}/httpcore5/apidocs/</link>
+ <link>${project.url}/httpcore5-h2/apidocs/</link>
+ </links>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>