You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2017/10/08 09:10:01 UTC

[1/3] httpcomponents-core git commit: Upgraded HttpCore version to 4.4.9-SNAPSHOT [Forced Update!]

Repository: httpcomponents-core
Updated Branches:
  refs/heads/4.4.x fb594acbd -> d2e19fcae (forced update)


Upgraded HttpCore version to 4.4.9-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/f23c0404
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/f23c0404
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/f23c0404

Branch: refs/heads/4.4.x
Commit: f23c04046cd5f89f908ffd1454f4615b0db39556
Parents: 6a16ab5
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu Oct 5 11:56:46 2017 -0600
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun Oct 8 11:03:01 2017 +0200

----------------------------------------------------------------------
 httpcore-ab/pom.xml   | 2 +-
 httpcore-nio/pom.xml  | 2 +-
 httpcore-osgi/pom.xml | 2 +-
 httpcore/pom.xml      | 2 +-
 pom.xml               | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/f23c0404/httpcore-ab/pom.xml
----------------------------------------------------------------------
diff --git a/httpcore-ab/pom.xml b/httpcore-ab/pom.xml
index 999d2bd..3446f68 100644
--- a/httpcore-ab/pom.xml
+++ b/httpcore-ab/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-core</artifactId>
-    <version>4.4.8</version>
+    <version>4.4.9-SNAPSHOT</version>
   </parent>
   <artifactId>httpcore-ab</artifactId>
   <name>Apache HttpCore Benchmarking Tool</name>

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/f23c0404/httpcore-nio/pom.xml
----------------------------------------------------------------------
diff --git a/httpcore-nio/pom.xml b/httpcore-nio/pom.xml
index 4cb5a6c..dc2bcc8 100644
--- a/httpcore-nio/pom.xml
+++ b/httpcore-nio/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-core</artifactId>
-    <version>4.4.8</version>
+    <version>4.4.9-SNAPSHOT</version>
   </parent>
   <artifactId>httpcore-nio</artifactId>
   <name>Apache HttpCore NIO</name>

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/f23c0404/httpcore-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/httpcore-osgi/pom.xml b/httpcore-osgi/pom.xml
index 674ffc0..d85811d 100644
--- a/httpcore-osgi/pom.xml
+++ b/httpcore-osgi/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-core</artifactId>
-    <version>4.4.8</version>
+    <version>4.4.9-SNAPSHOT</version>
   </parent>
   <artifactId>httpcore-osgi</artifactId>
   <name>Apache HttpCore OSGi bundle</name>

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/f23c0404/httpcore/pom.xml
----------------------------------------------------------------------
diff --git a/httpcore/pom.xml b/httpcore/pom.xml
index ae2606d..97e70be 100644
--- a/httpcore/pom.xml
+++ b/httpcore/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-core</artifactId>
-    <version>4.4.8</version>
+    <version>4.4.9-SNAPSHOT</version>
   </parent>
   <artifactId>httpcore</artifactId>
   <name>Apache HttpCore</name>

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/f23c0404/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8247b7d..cb3cfac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>httpcomponents-core</artifactId>
   <name>Apache HttpComponents Core</name>
-  <version>4.4.8</version>
+  <version>4.4.9-SNAPSHOT</version>
   <description>Apache HttpComponents Core is a library of components for building HTTP enabled services</description>
   <url>http://hc.apache.org/httpcomponents-core</url>
   <inceptionYear>2005</inceptionYear>
@@ -62,7 +62,7 @@
     <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>
     <url>https://github.com/apache/httpcomponents-core/tree/${project.scm.tag}</url>
-    <tag>4.4.8</tag>
+    <tag>4.4.9-SNAPSHOT</tag>
   </scm>
 
   <modules>


[2/3] httpcomponents-core git commit: [HTTPCORE-494] Add image constants to ContentType.

Posted by ol...@apache.org.
[HTTPCORE-494] Add image constants to ContentType.


Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/a42fd24b
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/a42fd24b
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/a42fd24b

Branch: refs/heads/4.4.x
Commit: a42fd24b8da58dc999d2c051776231c570a51341
Parents: f23c040
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu Oct 5 11:55:49 2017 -0600
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun Oct 8 11:03:27 2017 +0200

----------------------------------------------------------------------
 RELEASE_NOTES.txt                               | 14 ++++++++++++-
 .../org/apache/http/entity/ContentType.java     | 21 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/a42fd24b/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index eb5f71f..db6d1a1 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,7 +1,19 @@
+Release 4.4.9
+-------------------
+
+This is a maintenance release that fixes a number of issues discovered since 4.4.8.
+
+Changelog
+-------------------
+
+* HTTPCORE-494: Add image constants to ContentType.
+  Contributed by Gary Gregory <ggregory at apache.org>
+
+
 Release 4.4.8
 -------------------
 
-This is a maintenance release that fixes a number of issues discovered since 4.4.6.
+This is a maintenance release that fixes a number of issues discovered since 4.4.7.
 
 Changelog
 -------------------

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/a42fd24b/httpcore/src/main/java/org/apache/http/entity/ContentType.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java/org/apache/http/entity/ContentType.java b/httpcore/src/main/java/org/apache/http/entity/ContentType.java
index 4491e56..8398ddb 100644
--- a/httpcore/src/main/java/org/apache/http/entity/ContentType.java
+++ b/httpcore/src/main/java/org/apache/http/entity/ContentType.java
@@ -83,6 +83,20 @@ public final class ContentType implements Serializable {
             "application/xhtml+xml", Consts.ISO_8859_1);
     public static final ContentType APPLICATION_XML = create(
             "application/xml", Consts.ISO_8859_1);
+    public static final ContentType IMAGE_BMP = create(
+            "image/bmp");
+    public static final ContentType IMAGE_GIF= create(
+            "image/gif");
+    public static final ContentType IMAGE_JPEG = create(
+            "image/jpeg");
+    public static final ContentType IMAGE_PNG = create(
+            "image/png");
+    public static final ContentType IMAGE_SVG= create(
+            "image/svg+xml");
+    public static final ContentType IMAGE_TIFF = create(
+            "image/tiff");
+    public static final ContentType IMAGE_WEBP = create(
+            "image/webp");
     public static final ContentType MULTIPART_FORM_DATA = create(
             "multipart/form-data", Consts.ISO_8859_1);
     public static final ContentType TEXT_HTML = create(
@@ -105,6 +119,13 @@ public final class ContentType implements Serializable {
             APPLICATION_SVG_XML,
             APPLICATION_XHTML_XML,
             APPLICATION_XML,
+            IMAGE_BMP,
+            IMAGE_GIF,
+            IMAGE_JPEG,
+            IMAGE_PNG,
+            IMAGE_SVG,
+            IMAGE_TIFF,
+            IMAGE_WEBP,
             MULTIPART_FORM_DATA,
             TEXT_HTML,
             TEXT_PLAIN,


[3/3] httpcomponents-core git commit: Update tests from JUnit 4.11 to 4.12.

Posted by ol...@apache.org.
Update tests from JUnit 4.11 to 4.12.

Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/d2e19fca
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/d2e19fca
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/d2e19fca

Branch: refs/heads/4.4.x
Commit: d2e19fcaeac85122ccbd6510ab54c5f983b0207d
Parents: a42fd24
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu Oct 5 12:06:34 2017 -0600
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun Oct 8 11:03:27 2017 +0200

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d2e19fca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cb3cfac..48d6346 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
     <maven.compiler.source>1.6</maven.compiler.source>
     <maven.compiler.target>1.6</maven.compiler.target>
     <maven.compiler.showDeprecation>false</maven.compiler.showDeprecation>
-    <junit.version>4.11</junit.version>
+    <junit.version>4.12</junit.version>
     <mockito.version>1.10.19</mockito.version>
     <commons-logging.version>1.2</commons-logging.version>
     <api.comparison.version>4.4</api.comparison.version>