From 36fcc1334e700783f4719066f8336ff5ed77ef8f Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Thu, 28 Dec 2017 09:48:39 +0000 Subject: [PATCH 01/11] Use manifest entry for java 9 module name --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index 4b81396e1209..96520ebf0b5f 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,18 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.artifactId} + + + + + org.apache.maven.plugins maven-compiler-plugin From bf6895085ed143f56fd69bc05c91648f339ea2b2 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 28 Jan 2018 16:39:47 +0000 Subject: [PATCH 02/11] add group --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96520ebf0b5f..ff5cfeedf903 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ - ${project.artifactId} + ${project.groupId}.${project.artifactId} From faf2ffca9d2b32031a0b095a02481b52c1f3afb9 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 28 Jan 2018 16:57:42 +0000 Subject: [PATCH 03/11] specific names --- mockwebserver/pom.xml | 11 +++++++++++ okcurl/pom.xml | 11 +++++++++++ okhttp-android-support/pom.xml | 11 +++++++++++ okhttp-apache/pom.xml | 11 +++++++++++ okhttp-logging-interceptor/pom.xml | 16 ++++++++++++++++ okhttp-testing-support/pom.xml | 16 ++++++++++++++++ okhttp-urlconnection/pom.xml | 11 +++++++++++ okhttp/pom.xml | 11 +++++++++++ pom.xml | 12 ------------ 9 files changed, 98 insertions(+), 12 deletions(-) diff --git a/mockwebserver/pom.xml b/mockwebserver/pom.xml index de258420ef40..9017d22d2dda 100644 --- a/mockwebserver/pom.xml +++ b/mockwebserver/pom.xml @@ -63,6 +63,17 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.groupId}.mockwebserver + + + + diff --git a/okcurl/pom.xml b/okcurl/pom.xml index c444a23b4d72..ae1239b06f53 100644 --- a/okcurl/pom.xml +++ b/okcurl/pom.xml @@ -91,6 +91,17 @@ -Xbootclasspath/p:$0 + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.groupId}.okcurl + + + + diff --git a/okhttp-android-support/pom.xml b/okhttp-android-support/pom.xml index e2ff34c2e44f..acd1c2a2caed 100644 --- a/okhttp-android-support/pom.xml +++ b/okhttp-android-support/pom.xml @@ -58,6 +58,17 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.groupId}.androidsupport + + + + diff --git a/okhttp-apache/pom.xml b/okhttp-apache/pom.xml index 4cf68781381e..edf5cb611e57 100644 --- a/okhttp-apache/pom.xml +++ b/okhttp-apache/pom.xml @@ -56,6 +56,17 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.groupId}.apache + + + + diff --git a/okhttp-logging-interceptor/pom.xml b/okhttp-logging-interceptor/pom.xml index 275570d4675b..16fc5b1030b5 100644 --- a/okhttp-logging-interceptor/pom.xml +++ b/okhttp-logging-interceptor/pom.xml @@ -42,4 +42,20 @@ test + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.groupId}.logginginterceptor + + + + + + diff --git a/okhttp-testing-support/pom.xml b/okhttp-testing-support/pom.xml index 3605a66add66..30e0e7bc4f80 100644 --- a/okhttp-testing-support/pom.xml +++ b/okhttp-testing-support/pom.xml @@ -29,4 +29,20 @@ provided + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.groupId}.testingsupport + + + + + + diff --git a/okhttp-urlconnection/pom.xml b/okhttp-urlconnection/pom.xml index 3894bbcd838b..200358162e78 100644 --- a/okhttp-urlconnection/pom.xml +++ b/okhttp-urlconnection/pom.xml @@ -61,6 +61,17 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.groupId}.urlconnection + + + + diff --git a/okhttp/pom.xml b/okhttp/pom.xml index 09015c18e0df..066ef1c15e30 100644 --- a/okhttp/pom.xml +++ b/okhttp/pom.xml @@ -53,6 +53,17 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.groupId} + + + + diff --git a/pom.xml b/pom.xml index ff5cfeedf903..4b81396e1209 100644 --- a/pom.xml +++ b/pom.xml @@ -132,18 +132,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - - ${project.groupId}.${project.artifactId} - - - - - org.apache.maven.plugins maven-compiler-plugin From e93ec2c1440c83582d32e57c3c905b72bdda931b Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 4 Feb 2018 06:14:25 +0000 Subject: [PATCH 04/11] Update pom.xml --- mockwebserver/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockwebserver/pom.xml b/mockwebserver/pom.xml index 9017d22d2dda..a94cdf7bbcf5 100644 --- a/mockwebserver/pom.xml +++ b/mockwebserver/pom.xml @@ -69,7 +69,7 @@ - ${project.groupId}.mockwebserver + okhttp3.mockwebserver From deeac4302c6d61f4812be0ccf1cc6f462d32fc69 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 4 Feb 2018 06:14:46 +0000 Subject: [PATCH 05/11] Update pom.xml --- okcurl/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/okcurl/pom.xml b/okcurl/pom.xml index ae1239b06f53..0a44e199e39f 100644 --- a/okcurl/pom.xml +++ b/okcurl/pom.xml @@ -97,7 +97,7 @@ - ${project.groupId}.okcurl + okhttp3.curl From 6eb2137fb63039d109e6b142eb621a9014284fcc Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 4 Feb 2018 06:15:49 +0000 Subject: [PATCH 06/11] Update pom.xml --- okhttp-android-support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/okhttp-android-support/pom.xml b/okhttp-android-support/pom.xml index acd1c2a2caed..91df638a01e6 100644 --- a/okhttp-android-support/pom.xml +++ b/okhttp-android-support/pom.xml @@ -64,7 +64,7 @@ - ${project.groupId}.androidsupport + okhttp3.androidsupport From 22e3148048694dfb052a0fbd9ec1cd9231fd2f7c Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 4 Feb 2018 06:16:12 +0000 Subject: [PATCH 07/11] Update pom.xml --- okhttp-apache/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/okhttp-apache/pom.xml b/okhttp-apache/pom.xml index edf5cb611e57..8ee6b0ccfc7a 100644 --- a/okhttp-apache/pom.xml +++ b/okhttp-apache/pom.xml @@ -62,7 +62,7 @@ - ${project.groupId}.apache + okhttp3.apache From 3907657acd2f8ec4fd41c3b11911744177f03191 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 4 Feb 2018 06:16:33 +0000 Subject: [PATCH 08/11] Update pom.xml --- okhttp-logging-interceptor/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/okhttp-logging-interceptor/pom.xml b/okhttp-logging-interceptor/pom.xml index 16fc5b1030b5..ce35ec3329bd 100644 --- a/okhttp-logging-interceptor/pom.xml +++ b/okhttp-logging-interceptor/pom.xml @@ -51,7 +51,7 @@ - ${project.groupId}.logginginterceptor + okhttp3.logging From f6e46f849f7ba22012f788eadd48ed00a865a91f Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 4 Feb 2018 06:16:55 +0000 Subject: [PATCH 09/11] Update pom.xml --- okhttp-testing-support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/okhttp-testing-support/pom.xml b/okhttp-testing-support/pom.xml index 30e0e7bc4f80..e96c41561f61 100644 --- a/okhttp-testing-support/pom.xml +++ b/okhttp-testing-support/pom.xml @@ -38,7 +38,7 @@ - ${project.groupId}.testingsupport + okhttp3.testing From 6b06b4ebbad5cfc5561f7a6f3ad4c4762b6b67c5 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 4 Feb 2018 06:17:43 +0000 Subject: [PATCH 10/11] Update pom.xml --- okhttp-urlconnection/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/okhttp-urlconnection/pom.xml b/okhttp-urlconnection/pom.xml index 200358162e78..c22a40da68de 100644 --- a/okhttp-urlconnection/pom.xml +++ b/okhttp-urlconnection/pom.xml @@ -67,7 +67,7 @@ - ${project.groupId}.urlconnection + okhttp3.urlconnection From db1971ba4f8d590198cefc064361b2de98a61cfe Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 4 Feb 2018 06:18:01 +0000 Subject: [PATCH 11/11] Update pom.xml --- okhttp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/okhttp/pom.xml b/okhttp/pom.xml index 066ef1c15e30..ae0cc676f1b6 100644 --- a/okhttp/pom.xml +++ b/okhttp/pom.xml @@ -59,7 +59,7 @@ - ${project.groupId} + okhttp3