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:35 UTC
[httpcomponents-client] branch pom-cleanup created (now 9039f43)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch pom-cleanup
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git.
at 9039f43 Move public suffix list to generate-resources and apache-release profile
This branch includes the following new commits:
new c4444f1 Replace HTTP with HTTPS
new b776b16 Upgrade Parent to 12
new 20eec01 Update SCM URLs
new 3393df9 Remove default config
new 6bbfd4a Remove plugin executions run by release already
new 5a40175 Unify Javadoc report config
new 3032f1a Unify JXR and Surefire report config
new 655c8a8 Add project modules to dependency management
new 9039f43 Move public suffix list to generate-resources and apache-release profile
The 9 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.
[httpcomponents-client] 06/09: 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 pom-cleanup
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 5a401754c025f9bb95b5b13a9e3701502226851f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 11:15:47 2020 +0200
Unify Javadoc report config
---
httpclient5-cache/pom.xml | 23 -----------------------
httpclient5-fluent/pom.xml | 23 -----------------------
httpclient5-testing/pom.xml | 23 -----------------------
httpclient5-win/pom.xml | 22 ----------------------
httpclient5/pom.xml | 22 ----------------------
pom.xml | 29 ++++++++++++++++++++++-------
6 files changed, 22 insertions(+), 120 deletions(-)
diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml
index c368c16..cb44c42 100644
--- a/httpclient5-cache/pom.xml
+++ b/httpclient5-cache/pom.xml
@@ -122,29 +122,6 @@
<reporting>
<plugins>
-
- <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>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>
- <link>http://hc.apache.org/httpcomponents-client-5.0.x/httpclient5/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/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index 2b609c6..dd74faf 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -116,29 +116,6 @@
<reporting>
<plugins>
-
- <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>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>
- <link>http://hc.apache.org/httpcomponents-client-5.0.x/httpclient5/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/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index 7b93fc5..1824a74 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -106,29 +106,6 @@
<reporting>
<plugins>
-
- <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>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>
- <link>http://hc.apache.org/httpcomponents-client-5.0.x/httpclient5/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/httpclient5-win/pom.xml b/httpclient5-win/pom.xml
index 78356a0..282fcfe 100644
--- a/httpclient5-win/pom.xml
+++ b/httpclient5-win/pom.xml
@@ -85,28 +85,6 @@
<reporting>
<plugins>
-
- <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>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/httpclient5/pom.xml b/httpclient5/pom.xml
index 1f1c564..d4a7148 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -160,28 +160,6 @@
<reporting>
<plugins>
-
- <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>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/pom.xml b/pom.xml
index 776ace8..40fdb0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,13 +188,10 @@
<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>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>
+ <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
+ <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
+ <link>${project.url}/httpclient5/apidocs/</link>
</links>
</configuration>
</plugin>
@@ -301,7 +298,25 @@
</reportSet>
</reportSets>
</plugin>
-
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${hc.javadoc.version}</version>
+ <configuration>
+ <quiet>true</quiet>
+ <links>
+ <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
+ <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
+ <link>${project.url}/httpclient5/apidocs/</link>
+ </links>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
[httpcomponents-client] 09/09: Move public suffix list to
generate-resources and apache-release profile
Posted by mi...@apache.org.
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 9039f43808acf530e4853c2901784b5e78dccb95
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 11:43:02 2020 +0200
Move public suffix list to generate-resources and apache-release profile
---
httpclient5/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index 7a3d6af..8c6ce59 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -112,7 +112,7 @@
<executions>
<execution>
<id>download-public-suffix-list</id>
- <phase>generate-sources</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>wget</goal>
</goals>
@@ -178,7 +178,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
[httpcomponents-client] 02/09: 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 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>
[httpcomponents-client] 07/09: 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 pom-cleanup
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 3032f1a9b83eaaf9d5cef62ee10a8a6e87d58793
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 11:22:24 2020 +0200
Unify JXR and Surefire report config
---
httpclient5-cache/pom.xml | 9 ---------
httpclient5-fluent/pom.xml | 9 ---------
httpclient5-testing/pom.xml | 1 -
httpclient5-win/pom.xml | 9 ---------
httpclient5/pom.xml | 9 ---------
pom.xml | 10 ++++++++--
6 files changed, 8 insertions(+), 39 deletions(-)
diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml
index cb44c42..e3b3450 100644
--- a/httpclient5-cache/pom.xml
+++ b/httpclient5-cache/pom.xml
@@ -135,15 +135,6 @@
</reportSet>
</reportSets>
</plugin>
-
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
</plugins>
</reporting>
diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index dd74faf..9ba56bd 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -129,15 +129,6 @@
</reportSet>
</reportSets>
</plugin>
-
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
</plugins>
</reporting>
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index 1824a74..93fdb95 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -119,7 +119,6 @@
</reportSet>
</reportSets>
</plugin>
-
</plugins>
</reporting>
diff --git a/httpclient5-win/pom.xml b/httpclient5-win/pom.xml
index 282fcfe..b32c94a 100644
--- a/httpclient5-win/pom.xml
+++ b/httpclient5-win/pom.xml
@@ -98,15 +98,6 @@
</reportSet>
</reportSets>
</plugin>
-
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
</plugins>
</reporting>
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index d4a7148..7a3d6af 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -173,15 +173,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 40fdb0d..fd067f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,7 +271,6 @@
<reporting>
<plugins>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
@@ -280,7 +279,6 @@
<comparisonVersion>${api.comparison.version}</comparisonVersion>
</configuration>
</plugin>
-
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<inherited>false</inherited>
@@ -317,6 +315,14 @@
</reportSet>
</reportSets>
</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-client] 03/09: 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 pom-cleanup
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 20eec0129aa8792e47230c88c3107406db0bc8bf
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 10:58:51 2020 +0200
Update SCM URLs
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8507074..1892fe0 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-client.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/httpcomponents-client.git</developerConnection>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/httpcomponents-client.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/httpcomponents-client.git</developerConnection>
<url>https://github.com/apache/httpcomponents-client/tree/${project.scm.tag}</url>
- <tag>5.0.2-SNAPSHOT</tag>
+ <tag>master</tag>
</scm>
<properties>
[httpcomponents-client] 04/09: 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 pom-cleanup
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 3393df9c92a845bbef5916764faf575db82a165f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 11:03:08 2020 +0200
Remove default config
---
httpclient5-cache/pom.xml | 5 -----
httpclient5-fluent/pom.xml | 3 ---
httpclient5-testing/pom.xml | 6 ------
httpclient5-win/pom.xml | 3 ---
httpclient5/pom.xml | 6 ------
5 files changed, 23 deletions(-)
diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml
index 38510ab..c368c16 100644
--- a/httpclient5-cache/pom.xml
+++ b/httpclient5-cache/pom.xml
@@ -46,23 +46,19 @@
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ehcache.modules</groupId>
<artifactId>ehcache-api</artifactId>
- <scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -73,7 +69,6 @@
<dependency>
<groupId>net.spy</groupId>
<artifactId>spymemcached</artifactId>
- <scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index b2ddfb5..2b609c6 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -46,7 +46,6 @@
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
@@ -58,7 +57,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -98,7 +96,6 @@
<resources>
<resource>
<directory>src/test/java/org/apache/hc/client5/http/examples/fluent</directory>
- <filtering>false</filtering>
</resource>
</resources>
</configuration>
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index a7fab43..7b93fc5 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -44,7 +44,6 @@
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5-testing</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
@@ -55,23 +54,19 @@
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -105,7 +100,6 @@
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
- <version>${rxjava.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/httpclient5-win/pom.xml b/httpclient5-win/pom.xml
index 2669ce6..78356a0 100644
--- a/httpclient5-win/pom.xml
+++ b/httpclient5-win/pom.xml
@@ -45,7 +45,6 @@
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
@@ -57,7 +56,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -77,7 +75,6 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index c3306c9..1f1c564 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -44,22 +44,18 @@
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5-h2</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.conscrypt</groupId>
<artifactId>conscrypt-openjdk-uber</artifactId>
- <scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -85,7 +81,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -154,7 +149,6 @@
<resources>
<resource>
<directory>src/test/java/org/apache/hc/client5/http/examples</directory>
- <filtering>false</filtering>
</resource>
</resources>
</configuration>
[httpcomponents-client] 01/09: 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 pom-cleanup
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit c4444f1df21e24c8527510f78b7f2c13f0289f32
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 10:51:10 2020 +0200
Replace HTTP with HTTPS
---
httpclient5-cache/pom.xml | 2 +-
httpclient5-fluent/pom.xml | 2 +-
httpclient5-testing/pom.xml | 2 +-
httpclient5-win/pom.xml | 2 +-
httpclient5/pom.xml | 2 +-
pom.xml | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml
index f64982b..38510ab 100644
--- a/httpclient5-cache/pom.xml
+++ b/httpclient5-cache/pom.xml
@@ -34,7 +34,7 @@
<name>Apache HttpClient Cache</name>
<inceptionYear>2010</inceptionYear>
<description>Apache HttpComponents HttpClient Cache</description>
- <url>http://hc.apache.org/httpcomponents-client</url>
+ <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
<packaging>jar</packaging>
<properties>
diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index 26613f1..b2ddfb5 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -34,7 +34,7 @@
<name>Apache HttpClient Fluent</name>
<inceptionYear>2011</inceptionYear>
<description>Apache HttpComponents Client Fluent</description>
- <url>http://hc.apache.org/httpcomponents-client</url>
+ <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
<packaging>jar</packaging>
<properties>
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index 9e906d2..a7fab43 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -33,7 +33,7 @@
<artifactId>httpclient5-testing</artifactId>
<name>Apache HttpClient Integration Tests</name>
<description>Apache HttpClient integration tests</description>
- <url>http://hc.apache.org/httpcomponents-client</url>
+ <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
<packaging>jar</packaging>
<properties>
diff --git a/httpclient5-win/pom.xml b/httpclient5-win/pom.xml
index 71783aa..2669ce6 100644
--- a/httpclient5-win/pom.xml
+++ b/httpclient5-win/pom.xml
@@ -33,7 +33,7 @@
<artifactId>httpclient5-win</artifactId>
<name>Apache HttpClient Windows features</name>
<description>Apache HttpClient Windows specific functionality</description>
- <url>http://hc.apache.org/httpcomponents-client</url>
+ <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
<packaging>jar</packaging>
<properties>
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index 4ef1462..c3306c9 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -33,7 +33,7 @@
<artifactId>httpclient5</artifactId>
<name>Apache HttpClient</name>
<description>Apache HttpComponents Client</description>
- <url>http://hc.apache.org/httpcomponents-client</url>
+ <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
<packaging>jar</packaging>
<properties>
diff --git a/pom.xml b/pom.xml
index c0b3d40..2ca22f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<name>Apache HttpComponents Client Parent</name>
<version>5.0.2-SNAPSHOT</version>
<description>Apache HttpComponents Client is a library of components for building client side HTTP services</description>
- <url>http://hc.apache.org/httpcomponents-client-5.0.x/</url>
+ <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
<inceptionYear>1999</inceptionYear>
<packaging>pom</packaging>
@@ -54,7 +54,7 @@
<issueManagement>
<system>Jira</system>
- <url>http://issues.apache.org/jira/browse/HTTPCLIENT</url>
+ <url>https://issues.apache.org/jira/browse/HTTPCLIENT</url>
</issueManagement>
<scm>
[httpcomponents-client] 05/09: 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 pom-cleanup
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 6bbfd4ae15aba06a6e41e79fd2c6ee55b4499faf
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 11:07:50 2020 +0200
Remove plugin executions run by release already
---
pom.xml | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1892fe0..776ace8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,40 +186,7 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <!-- Ensure source jars have full manifest entries (note: defaults aren't suitable) -->
- <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>
- </manifestEntries>
- </archive>
- </configuration>
- </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-client] 08/09: Add project modules to dependency
management
Posted by mi...@apache.org.
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 655c8a8811f17ca64d4ae1be3ae6262ea1ee001f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 11:34:44 2020 +0200
Add project modules to dependency management
---
httpclient5-cache/pom.xml | 1 -
httpclient5-fluent/pom.xml | 2 --
httpclient5-testing/pom.xml | 4 ----
httpclient5-win/pom.xml | 2 --
pom.xml | 26 ++++++++++++++++++++++++++
5 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml
index e3b3450..5e10caf 100644
--- a/httpclient5-cache/pom.xml
+++ b/httpclient5-cache/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index 9ba56bd..d2e1884 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -45,12 +45,10 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index 93fdb95..70782fc 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -53,7 +53,6 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -72,19 +71,16 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5-cache</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5-fluent</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5-win</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/httpclient5-win/pom.xml b/httpclient5-win/pom.xml
index b32c94a..189e431 100644
--- a/httpclient5-win/pom.xml
+++ b/httpclient5-win/pom.xml
@@ -44,12 +44,10 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
diff --git a/pom.xml b/pom.xml
index fd067f8..1cdf79b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,32 @@
<version>${httpcore.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5-cache</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5-fluent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5-win</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>