Changed project groupId to org.apache.httpcomponents.core5; changed artifactIds to include major project version (httpclient -> httpclient5)

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1724989 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2016-01-16 15:16:44 +00:00
parent e9cd71c262
commit 7459a26370
25 changed files with 45 additions and 52 deletions

View File

@ -26,23 +26,21 @@
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpcomponents-client</artifactId> <artifactId>httpclient5-parent</artifactId>
<version>5.0-alpha1-SNAPSHOT</version> <version>5.0-alpha1-SNAPSHOT</version>
</parent> </parent>
<artifactId>httpclient-cache</artifactId> <artifactId>httpclient5-cache</artifactId>
<name>Apache HttpClient Cache</name> <name>Apache HttpClient Cache</name>
<inceptionYear>2010</inceptionYear> <inceptionYear>2010</inceptionYear>
<description> <description>Apache HttpComponents HttpClient Cache</description>
Apache HttpComponents HttpClient - Cache
</description>
<url>http://hc.apache.org/httpcomponents-client</url> <url>http://hc.apache.org/httpcomponents-client</url>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient5</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -90,8 +88,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient5</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>

View File

@ -26,29 +26,27 @@
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpcomponents-client</artifactId> <artifactId>httpclient5-parent</artifactId>
<version>5.0-alpha1-SNAPSHOT</version> <version>5.0-alpha1-SNAPSHOT</version>
</parent> </parent>
<artifactId>fluent-hc</artifactId> <artifactId>httpclient5-fluent</artifactId>
<name>Apache HttpClient Fluent API</name> <name>Apache HttpClient Fluent</name>
<inceptionYear>2011</inceptionYear> <inceptionYear>2011</inceptionYear>
<description> <description>Apache HttpComponents Client Fluent</description>
Apache HttpComponents Client fluent API
</description>
<url>http://hc.apache.org/httpcomponents-client</url> <url>http://hc.apache.org/httpcomponents-client</url>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient5</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient5</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
<classifier>tests</classifier> <classifier>tests</classifier>

View File

@ -26,11 +26,11 @@
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpcomponents-client</artifactId> <artifactId>httpclient5-parent</artifactId>
<version>5.0-alpha1-SNAPSHOT</version> <version>5.0-alpha1-SNAPSHOT</version>
</parent> </parent>
<artifactId>httpclient-osgi</artifactId> <artifactId>httpclient5-osgi</artifactId>
<name>Apache HttpClient OSGi bundle</name> <name>Apache HttpClient OSGi bundle</name>
<inceptionYear>1999</inceptionYear> <inceptionYear>1999</inceptionYear>
<description> <description>
@ -50,8 +50,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient5</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- Depend on the OSGi bundle - the bundle plugin knows what to do. --> <!-- Depend on the OSGi bundle - the bundle plugin knows what to do. -->
@ -61,7 +61,7 @@
<version>${httpcore.version}</version> <version>${httpcore.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpcore-nio</artifactId> <artifactId>httpcore-nio</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
@ -72,13 +72,13 @@
<version>${commons-codec.version}</version> <version>${commons-codec.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient-cache</artifactId> <artifactId>httpclient5-cache</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>fluent-hc</artifactId> <artifactId>httpclient5-fluent</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -26,28 +26,26 @@
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpcomponents-client</artifactId> <artifactId>httpclient5-parent</artifactId>
<version>5.0-alpha1-SNAPSHOT</version> <version>5.0-alpha1-SNAPSHOT</version>
</parent> </parent>
<artifactId>httpclient-win</artifactId> <artifactId>httpclient5-win</artifactId>
<name>Apache HttpClient Windows features</name> <name>Apache HttpClient Windows features</name>
<description> <description>Apache HttpClient Windows specific functionality</description>
Apache HttpClient Windows specific functionality
</description>
<url>http://hc.apache.org/httpcomponents-client</url> <url>http://hc.apache.org/httpcomponents-client</url>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient5</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient5</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
<classifier>tests</classifier> <classifier>tests</classifier>

View File

@ -26,15 +26,13 @@
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpcomponents-client</artifactId> <artifactId>httpclient5-parent</artifactId>
<version>5.0-alpha1-SNAPSHOT</version> <version>5.0-alpha1-SNAPSHOT</version>
</parent> </parent>
<artifactId>httpclient</artifactId> <artifactId>httpclient5</artifactId>
<name>Apache HttpClient</name> <name>Apache HttpClient</name>
<description> <description>Apache HttpComponents Client</description>
Apache HttpComponents Client
</description>
<url>http://hc.apache.org/httpcomponents-client</url> <url>http://hc.apache.org/httpcomponents-client</url>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -31,11 +31,12 @@
<relativePath>../project/pom.xml</relativePath> <relativePath>../project/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>httpcomponents-client</artifactId> <groupId>org.apache.httpcomponents.client5</groupId>
<name>Apache HttpComponents Client</name> <artifactId>httpclient5-parent</artifactId>
<name>Apache HttpComponents Client Parent</name>
<version>5.0-alpha1-SNAPSHOT</version> <version>5.0-alpha1-SNAPSHOT</version>
<description>Apache HttpComponents Client is a library of components for building client side HTTP services</description> <description>Apache HttpComponents Client is a library of components for building client side HTTP services</description>
<url>http://hc.apache.org/httpcomponents-client-dev/</url> <url>http://hc.apache.org/httpcomponents-client</url>
<inceptionYear>1999</inceptionYear> <inceptionYear>1999</inceptionYear>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -151,7 +152,7 @@
<modules> <modules>
<module>httpclient</module> <module>httpclient</module>
<module>fluent-hc</module> <module>httpclient-fluent</module>
<module>httpclient-cache</module> <module>httpclient-cache</module>
<module>httpclient-win</module> <module>httpclient-win</module>
<module>httpclient-osgi</module> <module>httpclient-osgi</module>