From 5afd78d90edf56ed6a3be7d455d53086e1880957 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 19 Mar 2014 18:13:36 -0400 Subject: [PATCH 001/107] Allow passing in http client so it's possible to cleanly shut down without leaving behind non-daemon threads --- .../java/com/justinsb/etcd/EtcdClient.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/justinsb/etcd/EtcdClient.java b/src/main/java/com/justinsb/etcd/EtcdClient.java index babc363..89d4381 100644 --- a/src/main/java/com/justinsb/etcd/EtcdClient.java +++ b/src/main/java/com/justinsb/etcd/EtcdClient.java @@ -37,20 +37,29 @@ import com.google.gson.JsonParser; public class EtcdClient { - static final CloseableHttpAsyncClient httpClient = buildDefaultHttpClient(); + static CloseableHttpAsyncClient defaultHttpClient; static final Gson gson = new GsonBuilder().create(); - - static CloseableHttpAsyncClient buildDefaultHttpClient() { - // TODO: Increase timeout?? - RequestConfig requestConfig = RequestConfig.custom().build(); - CloseableHttpAsyncClient httpClient = HttpAsyncClients.custom().setDefaultRequestConfig(requestConfig).build(); - httpClient.start(); - return httpClient; + + static synchronized CloseableHttpAsyncClient buildDefaultHttpClient() { + if (defaultHttpClient == null) { + // TODO: Increase timeout?? + RequestConfig requestConfig = RequestConfig.custom().build(); + CloseableHttpAsyncClient httpClient = HttpAsyncClients.custom().setDefaultRequestConfig(requestConfig).build(); + httpClient.start(); + EtcdClient.defaultHttpClient = httpClient; + } + return defaultHttpClient; } final URI baseUri; + private final CloseableHttpAsyncClient httpClient; public EtcdClient(URI baseUri) { + this(baseUri, buildDefaultHttpClient()); + } + + public EtcdClient(URI baseUri, CloseableHttpAsyncClient client) { + this.httpClient = client; String uri = baseUri.toString(); if (!uri.endsWith("/")) { uri += "/"; From fa7161c99f0418c14c87d226954748e1ac1bd986 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 19 Mar 2014 18:13:48 -0400 Subject: [PATCH 002/107] Version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c6f8c7..7de4150 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.justinsb etcd-client - 0.1-SNAPSHOT + 0.1-tboudreau-fork ${project.build.directory} From b46bf79a260e64a4a9beecc7c5712cf4eb43c75e Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 19 Mar 2014 22:35:38 -0400 Subject: [PATCH 003/107] Use less resource-consumptive netty instead of apache http client --- nb-configuration.xml | 18 + pom.xml | 27 +- .../java/com/justinsb/etcd/EtcdClient.java | 321 ++++++++++-------- 3 files changed, 205 insertions(+), 161 deletions(-) create mode 100644 nb-configuration.xml diff --git a/nb-configuration.xml b/nb-configuration.xml new file mode 100644 index 0000000..ec4540c --- /dev/null +++ b/nb-configuration.xml @@ -0,0 +1,18 @@ + + + + + + none + + diff --git a/pom.xml b/pom.xml index 7de4150..27f05f3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,28 +3,13 @@ 4.0.0 com.justinsb etcd-client - 0.1-tboudreau-fork + 0.2-tboudreau-fork ${project.build.directory} - - org.slf4j - slf4j-api - 1.7.5 - - - org.apache.httpcomponents - httpasyncclient - 4.0-beta4 - - - com.google.guava - guava - 14.0.1 - com.google.code.gson gson @@ -37,11 +22,10 @@ test - org.slf4j - slf4j-simple - 1.7.5 - test - + com.mastfrog + netty-http-client + 1.4.13 + @@ -73,6 +57,7 @@ 1.6 1.6 UTF-8 + true diff --git a/src/main/java/com/justinsb/etcd/EtcdClient.java b/src/main/java/com/justinsb/etcd/EtcdClient.java index 89d4381..ac67e88 100644 --- a/src/main/java/com/justinsb/etcd/EtcdClient.java +++ b/src/main/java/com/justinsb/etcd/EtcdClient.java @@ -1,31 +1,8 @@ package com.justinsb.etcd; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutionException; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.StatusLine; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.concurrent.FutureCallback; -import org.apache.http.impl.nio.client.CloseableHttpAsyncClient; -import org.apache.http.impl.nio.client.HttpAsyncClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; - -import com.google.common.base.Charsets; import com.google.common.base.Splitter; import com.google.common.collect.Lists; +import com.google.common.net.MediaType; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -35,30 +12,51 @@ import com.google.gson.JsonArray; import com.google.gson.JsonParseException; import com.google.gson.JsonParser; +import com.mastfrog.acteur.headers.Method; +import com.mastfrog.netty.http.client.HttpClient; +import com.mastfrog.netty.http.client.HttpRequestBuilder; +import com.mastfrog.netty.http.client.ResponseFuture; +import com.mastfrog.netty.http.client.ResponseHandler; +import com.mastfrog.netty.http.client.State; +import com.mastfrog.url.Parameters; +import com.mastfrog.url.ParametersElement; +import com.mastfrog.util.AbstractBuilder; +import com.mastfrog.util.Exceptions; +import com.mastfrog.util.Streams; +import com.mastfrog.util.thread.Receiver; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufInputStream; +import io.netty.handler.codec.http.HttpHeaders; +import io.netty.handler.codec.http.HttpResponseStatus; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutionException; public class EtcdClient { - static CloseableHttpAsyncClient defaultHttpClient; + static final Gson gson = new GsonBuilder().create(); - - static synchronized CloseableHttpAsyncClient buildDefaultHttpClient() { - if (defaultHttpClient == null) { - // TODO: Increase timeout?? - RequestConfig requestConfig = RequestConfig.custom().build(); - CloseableHttpAsyncClient httpClient = HttpAsyncClients.custom().setDefaultRequestConfig(requestConfig).build(); - httpClient.start(); - EtcdClient.defaultHttpClient = httpClient; - } - return defaultHttpClient; - } final URI baseUri; - private final CloseableHttpAsyncClient httpClient; + private final HttpClient httpClient; public EtcdClient(URI baseUri) { - this(baseUri, buildDefaultHttpClient()); + this(baseUri, HttpClient.builder() + .maxChunkSize(512) + .noCompression() + .maxInitialLineLength(255) + .followRedirects() + .threadCount(1) + .dontSend100Continue() + .build()); } - public EtcdClient(URI baseUri, CloseableHttpAsyncClient client) { + public EtcdClient(URI baseUri, HttpClient client) { this.httpClient = client; String uri = baseUri.toString(); if (!uri.endsWith("/")) { @@ -73,9 +71,9 @@ public EtcdClient(URI baseUri, CloseableHttpAsyncClient client) { */ public EtcdResult get(String key) throws EtcdClientException { URI uri = buildKeyUri("v2/keys", key, ""); - HttpGet request = new HttpGet(uri); + UriRequest request = new UriRequest(Method.GET, uri); - EtcdResult result = syncExecute(request, new int[] { 200, 404 }, 100); + EtcdResult result = syncExecute(request, new int[]{200, 404}, 100); if (result.isError()) { if (result.errorCode == 100) { return null; @@ -89,9 +87,9 @@ public EtcdResult get(String key) throws EtcdClientException { */ public EtcdResult delete(String key) throws EtcdClientException { URI uri = buildKeyUri("v2/keys", key, ""); - HttpDelete request = new HttpDelete(uri); + UriRequest request = new UriRequest(Method.DELETE, uri); - return syncExecute(request, new int[] { 200, 404 }); + return syncExecute(request, new int[]{200, 404}); } /** @@ -104,7 +102,6 @@ public EtcdResult set(String key, String value) throws EtcdClientException { /** * Sets a key to a new value with an (optional) ttl */ - public EtcdResult set(String key, String value, Integer ttl) throws EtcdClientException { List data = Lists.newArrayList(); data.add(new BasicNameValuePair("value", value)); @@ -112,7 +109,7 @@ public EtcdResult set(String key, String value, Integer ttl) throws EtcdClientEx data.add(new BasicNameValuePair("ttl", Integer.toString(ttl))); } - return set0(key, data, new int[] { 200, 201 }); + return set0(key, data, new int[]{200, 201}); } /** @@ -121,26 +118,27 @@ public EtcdResult set(String key, String value, Integer ttl) throws EtcdClientEx public EtcdResult createDirectory(String key) throws EtcdClientException { List data = Lists.newArrayList(); data.add(new BasicNameValuePair("dir", "true")); - return set0(key, data, new int[] { 200, 201 }); + return set0(key, data, new int[]{200, 201}); } - + /** * Lists a directory */ public List listDirectory(String key) throws EtcdClientException { - EtcdResult result = get(key + "/"); - if (result == null || result.node == null) { - return null; - } - return result.node.nodes; + EtcdResult result = get(key + "/"); + if (result == null || result.node == null) { + return null; + } + return result.node.nodes; } + /** * Delete a directory */ public EtcdResult deleteDirectory(String key) throws EtcdClientException { URI uri = buildKeyUri("v2/keys", key, "?dir=true"); - HttpDelete request = new HttpDelete(uri); - return syncExecute(request, new int[] { 202 }); + UriRequest request = new UriRequest(Method.DELETE, uri); + return syncExecute(request, new int[]{202}); } /** @@ -151,7 +149,7 @@ public EtcdResult cas(String key, String prevValue, String value) throws EtcdCli data.add(new BasicNameValuePair("value", value)); data.add(new BasicNameValuePair("prevValue", prevValue)); - return set0(key, data, new int[] { 200, 412 }, 101); + return set0(key, data, new int[]{200, 412}, 101); } /** @@ -165,18 +163,18 @@ public ListenableFuture watch(String key) throws EtcdClientException * Watches the given subtree */ public ListenableFuture watch(String key, Long index, boolean recursive) throws EtcdClientException { - String suffix = "?wait=true"; - if (index != null) { - suffix += "&waitIndex=" + index; - } - if (recursive) { - suffix += "&recursive=true"; - } + String suffix = "?wait=true"; + if (index != null) { + suffix += "&waitIndex=" + index; + } + if (recursive) { + suffix += "&recursive=true"; + } URI uri = buildKeyUri("v2/keys", key, suffix); - HttpGet request = new HttpGet(uri); + UriRequest request = new UriRequest(Method.GET, uri); - return asyncExecute(request, new int[] { 200 }); + return asyncExecute(request, new int[]{200}); } /** @@ -185,7 +183,7 @@ public ListenableFuture watch(String key, Long index, boolean recurs public String getVersion() throws EtcdClientException { URI uri = baseUri.resolve("version"); - HttpGet request = new HttpGet(uri); + UriRequest request = new UriRequest(Method.GET, uri); // Technically not JSON, but it'll work // This call is the odd one out @@ -196,27 +194,73 @@ public String getVersion() throws EtcdClientException { return s.json; } + static class BasicNameValuePair { + + private final String key; + private final String value; + + public BasicNameValuePair(String key, String value) { + this.key = key; + this.value = value; + } + + } + + private String encodePairs(List pairs) { + AbstractBuilder b = com.mastfrog.url.Parameters.builder(); + StringBuilder sb = new StringBuilder(); + for (BasicNameValuePair p : pairs) { + try { + if (sb.length() > 0) { + sb.append('&'); + } + sb.append(URLEncoder.encode(p.key, "UTF-8")).append('=').append(URLEncoder.encode(p.value, "UTF-8")); + } catch (UnsupportedEncodingException ex) { + Exceptions.chuck(ex); + } + } + return sb.toString(); + } + private EtcdResult set0(String key, List data, int[] httpErrorCodes, int... expectedErrorCodes) throws EtcdClientException { URI uri = buildKeyUri("v2/keys", key, ""); - - HttpPut request = new HttpPut(uri); - - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(data, Charsets.UTF_8); - request.setEntity(entity); + String body = encodePairs(data); + UriRequest request = new UriRequest(Method.PUT, uri, body); return syncExecute(request, httpErrorCodes, expectedErrorCodes); } public EtcdResult listChildren(String key) throws EtcdClientException { URI uri = buildKeyUri("v2/keys", key, "/"); - HttpGet request = new HttpGet(uri); + UriRequest request = new UriRequest(Method.GET, uri); - EtcdResult result = syncExecute(request, new int[] { 200 }); + EtcdResult result = syncExecute(request, new int[]{200}); return result; } - protected ListenableFuture asyncExecute(HttpUriRequest request, int[] expectedHttpStatusCodes, final int... expectedErrorCodes) + static class UriRequest { + + public final Method method; + public final URI uri; + public final String body; + + public UriRequest(Method method, URI uri) { + this(method, uri, null); + } + + public UriRequest(Method method, URI uri, String body) { + this.method = method; + this.uri = uri; + this.body = body; + } + + public String toString() { + return method.name() + ' ' + uri + (body == null ? "" : " --> " + body); + } + } + + protected ListenableFuture asyncExecute(UriRequest request, int[] expectedHttpStatusCodes, final int... expectedErrorCodes) throws EtcdClientException { ListenableFuture json = asyncExecuteJson(request, expectedHttpStatusCodes); return Futures.transform(json, new AsyncFunction() { @@ -227,7 +271,7 @@ public ListenableFuture apply(JsonResponse json) throws Exception { }); } - protected EtcdResult syncExecute(HttpUriRequest request, int[] expectedHttpStatusCodes, int... expectedErrorCodes) throws EtcdClientException { + protected EtcdResult syncExecute(UriRequest request, int[] expectedHttpStatusCodes, int... expectedErrorCodes) throws EtcdClientException { try { return asyncExecute(request, expectedHttpStatusCodes, expectedErrorCodes).get(); } catch (InterruptedException e) { @@ -282,7 +326,7 @@ private static boolean contains(int[] list, int find) { return false; } - protected List syncExecuteList(HttpUriRequest request) throws EtcdClientException { + protected List syncExecuteList(UriRequest request) throws EtcdClientException { JsonResponse response = syncExecuteJson(request, 200); if (response.json == null) { return null; @@ -307,7 +351,7 @@ protected List syncExecuteList(HttpUriRequest request) throws EtcdCl } } - protected JsonResponse syncExecuteJson(HttpUriRequest request, int... expectedHttpStatusCodes) throws EtcdClientException { + protected JsonResponse syncExecuteJson(UriRequest request, int... expectedHttpStatusCodes) throws EtcdClientException { try { return asyncExecuteJson(request, expectedHttpStatusCodes).get(); } catch (InterruptedException e) { @@ -316,30 +360,13 @@ protected JsonResponse syncExecuteJson(HttpUriRequest request, int... expectedHt } catch (ExecutionException e) { throw unwrap(e); } + } - // ListenableFuture response = asyncExecuteHttp(request); - // - // HttpResponse httpResponse; - // try { - // httpResponse = response.get(); - // } catch (InterruptedException e) { - // Thread.currentThread().interrupt(); - // throw new - // EtcdClientException("Interrupted during request processing", e); - // } catch (ExecutionException e) { - // // TODO: Unwrap? - // throw new EtcdClientException("Error executing request", e); - // } - // - // String json = parseJsonResponse(httpResponse); - // return json; - } - - protected ListenableFuture asyncExecuteJson(HttpUriRequest request, final int[] expectedHttpStatusCodes) throws EtcdClientException { - ListenableFuture response = asyncExecuteHttp(request); - - return Futures.transform(response, new AsyncFunction() { - public ListenableFuture apply(HttpResponse httpResponse) throws Exception { + protected ListenableFuture asyncExecuteJson(UriRequest request, final int[] expectedHttpStatusCodes) throws EtcdClientException { + ListenableFuture response = asyncExecuteHttp(request); + + return Futures.transform(response, new AsyncFunction() { + public ListenableFuture apply(Response httpResponse) throws Exception { JsonResponse json = extractJsonResponse(httpResponse, expectedHttpStatusCodes); return Futures.immediateFuture(json); } @@ -350,6 +377,7 @@ public ListenableFuture apply(HttpResponse httpResponse) throws Ex * We need the status code & the response to parse an error response. */ static class JsonResponse { + final String json; final int httpStatusCode; @@ -360,34 +388,22 @@ public JsonResponse(String json, int statusCode) { } - protected JsonResponse extractJsonResponse(HttpResponse httpResponse, int[] expectedHttpStatusCodes) throws EtcdClientException { - try { - StatusLine statusLine = httpResponse.getStatusLine(); - int statusCode = statusLine.getStatusCode(); + protected JsonResponse extractJsonResponse(Response httpResponse, int[] expectedHttpStatusCodes) throws EtcdClientException { + HttpResponseStatus statusLine = httpResponse.status; + int statusCode = statusLine.code(); - String json = null; + String json = httpResponse.entity; - if (httpResponse.getEntity() != null) { - try { - json = EntityUtils.toString(httpResponse.getEntity()); - } catch (IOException e) { - throw new EtcdClientException("Error reading response", e); - } + if (!contains(expectedHttpStatusCodes, statusCode)) { + if (statusCode == 400 && json != null) { + // More information in JSON + } else { + throw new EtcdClientException("Error response from etcd: " + statusLine.toString(), + statusCode); } - - if (!contains(expectedHttpStatusCodes, statusCode)) { - if (statusCode == 400 && json != null) { - // More information in JSON - } else { - throw new EtcdClientException("Error response from etcd: " + statusLine.getReasonPhrase(), - statusCode); - } - } - - return new JsonResponse(json, statusCode); - } finally { - close(httpResponse); } + + return new JsonResponse(json, statusCode); } private URI buildKeyUri(String prefix, String key, String suffix) { @@ -406,34 +422,59 @@ private URI buildKeyUri(String prefix, String key, String suffix) { return uri; } - protected ListenableFuture asyncExecuteHttp(HttpUriRequest request) { - final SettableFuture future = SettableFuture.create(); + protected ListenableFuture asyncExecuteHttp(UriRequest request) { + final SettableFuture future = SettableFuture.create(); - httpClient.execute(request, new FutureCallback() { - public void completed(HttpResponse result) { - future.set(result); + class Handler extends ResponseHandler { + + public Handler() { + super(String.class); } - public void failed(Exception ex) { - future.setException(ex); + @Override + protected void onError(Throwable err) { + future.setException(err); } - public void cancelled() { - future.setException(new InterruptedException()); + @Override + protected void onErrorResponse(HttpResponseStatus status, HttpHeaders headers, String content) { +// future.setException(new IOException(status + content)); + future.set(new Response(status, headers, content)); } - }); + @Override + protected void receive(HttpResponseStatus status, HttpHeaders headers, String content) { + future.set(new Response(status, headers, content)); + } + } + + HttpRequestBuilder bldr = httpClient.request(request.method).setURL(request.uri.toASCIIString()); + + if (request.body != null) { + try { + bldr.setBody(request.body, MediaType.parse("application/x-www-form-urlencoded")); + } catch (IOException ex) { + Exceptions.chuck(ex); + } + } + ResponseFuture fut = bldr.execute(new Handler()); + // Pending - could listen on the FullContentReceived state and respond + // without waiting for the connection to be idle/closed return future; } - public static void close(HttpResponse response) { - if (response == null) { - return; - } - HttpEntity entity = response.getEntity(); - if (entity != null) { - EntityUtils.consumeQuietly(entity); + static class Response { + + public final HttpResponseStatus status; + public final HttpHeaders headers; + public final String entity; + + public Response(HttpResponseStatus status, HttpHeaders headers, String entity) { + this.status = status; + this.headers = headers; + this.entity = entity; } + } protected static String urlEscape(String s) { From e178c568b14f14375634f00ec8e7543fd85b9b0b Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 20 Mar 2014 00:28:28 -0400 Subject: [PATCH 004/107] Cleanup --- src/main/java/com/justinsb/etcd/EtcdClient.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/com/justinsb/etcd/EtcdClient.java b/src/main/java/com/justinsb/etcd/EtcdClient.java index ac67e88..11d4ed1 100644 --- a/src/main/java/com/justinsb/etcd/EtcdClient.java +++ b/src/main/java/com/justinsb/etcd/EtcdClient.java @@ -17,15 +17,10 @@ import com.mastfrog.netty.http.client.HttpRequestBuilder; import com.mastfrog.netty.http.client.ResponseFuture; import com.mastfrog.netty.http.client.ResponseHandler; -import com.mastfrog.netty.http.client.State; import com.mastfrog.url.Parameters; import com.mastfrog.url.ParametersElement; import com.mastfrog.util.AbstractBuilder; import com.mastfrog.util.Exceptions; -import com.mastfrog.util.Streams; -import com.mastfrog.util.thread.Receiver; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufInputStream; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpResponseStatus; import java.io.IOException; @@ -33,9 +28,7 @@ import java.net.URI; import java.net.URLEncoder; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.ExecutionException; public class EtcdClient { From c4d0eb796992092a09671715e668254207c90fc0 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 20 Mar 2014 00:48:47 -0400 Subject: [PATCH 005/107] Source level 1.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 27f05f3..2be808e 100644 --- a/pom.xml +++ b/pom.xml @@ -54,8 +54,8 @@ maven-compiler-plugin 2.3.2 - 1.6 - 1.6 + 1.7 + 1.7 UTF-8 true From 070a8c29350a62ec7a70e345eb5f92c9cb8dafac Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 20 Mar 2014 00:52:05 -0400 Subject: [PATCH 006/107] Versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2be808e..5a24cd1 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.1 1.7 1.7 @@ -68,7 +68,7 @@ org.codehaus.mojo findbugs-maven-plugin - 2.5.2 + 2.5.3 true ${artifactTargetPath} From efb1fe1fc19ed951472e81fb57ca41dc48a30dea Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 20 Mar 2014 00:53:09 -0400 Subject: [PATCH 007/107] Client version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a24cd1..84542b3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.mastfrog netty-http-client - 1.4.13 + 1.4.14 From 832dc36d14c86ddc203e2c7331c44d86de8ea0e1 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 20 Mar 2014 00:58:11 -0400 Subject: [PATCH 008/107] Client version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84542b3..d389a3c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.mastfrog netty-http-client - 1.4.14 + 1.4.15 From 3b1c63e4d4785e61102b196814e4afadb68d2438 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 20 Mar 2014 01:05:06 -0400 Subject: [PATCH 009/107] Client version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d389a3c..84542b3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.mastfrog netty-http-client - 1.4.15 + 1.4.14 From c434e4cadb0843f05a625b77f431ba6696b1b9b3 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 20 Mar 2014 01:08:07 -0400 Subject: [PATCH 010/107] Version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84542b3..d389a3c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.mastfrog netty-http-client - 1.4.14 + 1.4.15 From f22dfc3a0a0dacab8514c4775dfa71500420acb8 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 20 Mar 2014 01:12:09 -0400 Subject: [PATCH 011/107] Skip tests by default - requires running local etcd, not appropriate for continuous builds without a harness to start it --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index d389a3c..2d1ce1b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,7 @@ ${project.build.directory} + true From c40c8618aabb28740ab20559fd60b0ff745de88d Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sat, 22 Mar 2014 16:36:30 -0400 Subject: [PATCH 012/107] Make readme reflect reality --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d6570b3..937f9d1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,9 @@ CircleCI: ![CircleCI Status](https://circleci.com/gh/justinsb/jetcd.png?circle-t A simple Java client library for the awesome [etcd] -Uses the Apache [HttpAsyncClient] to implement watches without blocking a thread, and Google's [Guava] to give us the nice [ListenableFuture] interface. +This fork of jetcd uses [Netty HTTP Client](https://github.com/timboudreau/netty-http-client) to do asynchronous HTTP +requests with minimal resource utilization (the [original](https://github.com/justinsb/jetcd) uses [HttpAsyncClient] +to do the same - the Netty client is lighter-weight, but has more dependencies). Check out [SmokeTest.java] to see how this is used (and tested), but here's a quick code example: From 4378442bcaf5ca8bfcf4959660b0a5573be6b589 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 18 Apr 2014 21:08:01 -0400 Subject: [PATCH 013/107] Update library versions --- pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2d1ce1b..08e17f0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,14 @@ 4.0.0 + + com.mastfrog + 1.4.16 + mastfrog-parent + com.justinsb etcd-client - 0.2-tboudreau-fork + 0.3-tboudreau-fork ${project.build.directory} @@ -25,7 +30,7 @@ com.mastfrog netty-http-client - 1.4.15 + 1.4.16 From 6443da4708de91e74ea5c9f564ac9d852d2539d2 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sat, 28 Jun 2014 03:43:30 -0400 Subject: [PATCH 014/107] Bugfix in ServerBuilder for scope bindings --- pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 08e17f0..a585013 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ - + + 4.0.0 com.mastfrog - 1.4.16 + 1.4.17 mastfrog-parent com.justinsb @@ -30,7 +31,7 @@ com.mastfrog netty-http-client - 1.4.16 + 1.4.17 From 38fb369ce0a30e71749161a43845a51741527ac0 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 8 Sep 2014 23:57:04 -0400 Subject: [PATCH 015/107] Add cookie store support to http client --- pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a585013..874ab8a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,9 @@ - - + + 4.0.0 com.mastfrog - 1.4.17 + 1.4.18 mastfrog-parent com.justinsb @@ -84,4 +83,4 @@ - + \ No newline at end of file From 8d4999e3a7e0cedbfcc81dc0ef2bb39bf2b354e8 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 9 Sep 2014 00:14:10 -0400 Subject: [PATCH 016/107] Fix dependency --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 874ab8a..7a8fbfb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mastfrog 1.4.18 mastfrog-parent - + com.justinsb etcd-client 0.3-tboudreau-fork @@ -30,8 +30,8 @@ com.mastfrog netty-http-client - 1.4.17 - + ${mastfrog.version} + From 9a69a441aa952583d6650fa422ce962a0126b546 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 16 Oct 2014 03:40:27 -0400 Subject: [PATCH 017/107] Fix same send/receive port in http client; fix annotation processors never to reopen an index file --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a8fbfb..302c607 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.4.18 + 1.4.19 mastfrog-parent com.justinsb From 37e6cb56f6feea5d5223d94883488158fccc27a7 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 5 Nov 2014 04:06:14 -0500 Subject: [PATCH 018/107] Add numble, bump to 1.5.0 - switching source level to 1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 302c607..627297e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.4.19 + 1.5.0 mastfrog-parent com.justinsb From 7085f61d88283ff4c4063bcde12c8b4076a01ece Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 6 Nov 2014 16:18:00 -0500 Subject: [PATCH 019/107] Pom cleanup --- pom.xml | 174 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 95 insertions(+), 79 deletions(-) diff --git a/pom.xml b/pom.xml index 627297e..ecc2338 100644 --- a/pom.xml +++ b/pom.xml @@ -1,86 +1,102 @@ - 4.0.0 - - com.mastfrog - 1.5.0 - mastfrog-parent - - com.justinsb - etcd-client - 0.3-tboudreau-fork + 4.0.0 + + com.mastfrog + 1.5.0 + mastfrog-parent + + + com.justinsb + etcd-client + 0.3-tboudreau-fork - - ${project.build.directory} - true - + + ${project.build.directory} + true + - - - com.google.code.gson - gson - 2.2.4 - - - junit - junit - 4.11 - test - - - com.mastfrog - netty-http-client - ${mastfrog.version} - - + + + com.google.code.gson + gson + 2.2.4 + + + junit + junit + 4.11 + test + + + com.mastfrog + netty-http-client + ${mastfrog.version} + + - - - - maven-assembly-plugin - 2.4 - - 1.5 - - jar-with-dependencies - - - - - make-assembly - package - - single - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - UTF-8 - true - - - - + + + + maven-assembly-plugin + 2.4 + + 1.5 + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + UTF-8 + true + + + + - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.3 - - true - ${artifactTargetPath} - ${artifactTargetPath} - - - - + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.5.3 + + true + ${artifactTargetPath} + ${artifactTargetPath} + + + + + + + timboudreau-builds + timboudreau.com builds + http://timboudreau.com/builds/plugin/repository/everything/ + + true + never + + + true + never + + + \ No newline at end of file From ee86dfbb7657e61ad213c3f40adc041b7c93b24f Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 10 Nov 2014 23:33:41 -0500 Subject: [PATCH 020/107] HttpClient updates --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ecc2338..9fbbf97 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.5.0 + 1.5.1 mastfrog-parent From 09d3aa76cddd0cbfbd5614731fe6e2c6933a4a49 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 26 Nov 2014 01:23:35 -0500 Subject: [PATCH 021/107] Bump version to 1.5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9fbbf97..b282f2e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.5.1 + 1.5.2 mastfrog-parent From a5e270721c5faa22a934f67ab449a58a6e2a5ed0 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 30 Dec 2014 03:56:31 -0500 Subject: [PATCH 022/107] Bump version; give Output a way to close deferred writes --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b282f2e..1f72d74 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.5.2 + 1.5.3 mastfrog-parent @@ -99,4 +99,4 @@ - \ No newline at end of file + From 93e9d17deb68b224897ae75d772b77e28687cec0 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 6 Jan 2015 22:20:29 -0500 Subject: [PATCH 023/107] Update to 1.5.4; timeout fixes in netty-http-client --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f72d74..4e02d9b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.5.3 + 1.5.4 mastfrog-parent From 7f309d43b1b8a967142170c220998d46bcc26171 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sat, 10 Jan 2015 03:46:59 -0500 Subject: [PATCH 024/107] Acteur 1.6 with factored out and rewritten engine; simplified scopes implementation --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e02d9b..9899a95 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.5.4 + 1.6.0-dev mastfrog-parent From ab93d00d8057084d461f4b7ebd05fa5cc4146ee8 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 6 Mar 2015 21:33:48 -0500 Subject: [PATCH 025/107] Back to JDK 7. Sigh. --- nb-configuration.xml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 nb-configuration.xml diff --git a/nb-configuration.xml b/nb-configuration.xml deleted file mode 100644 index ec4540c..0000000 --- a/nb-configuration.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - none - - From 6ada1e3ff154a90f2903d1d2f69f6f929e0a4136 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 6 Mar 2015 22:26:48 -0500 Subject: [PATCH 026/107] Release 1.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9899a95..8b35b63 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.6.0-dev + 1.6.0 mastfrog-parent From 99078178e961b5639c2023dd3eaa4fce415bc340 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 6 Mar 2015 23:28:41 -0500 Subject: [PATCH 027/107] -m --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b35b63..659cce6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.6.0 + 1.6.1-dev mastfrog-parent From 16d06cf092bbbb2b397b845b0aa4fb281ba52b98 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 10 Mar 2015 16:36:43 -0400 Subject: [PATCH 028/107] Bump version to 1.6.1.1-dev to accomodate logging changes --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 659cce6..6c8eec6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.6.1-dev + 1.6.1.1-dev mastfrog-parent From beb57b89e20592d9321352ef35cbc34e329c3995 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 17 Mar 2015 00:58:40 -0400 Subject: [PATCH 029/107] A provision for simple suites with selenium --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c8eec6..d5c5bdf 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.6.1.1-dev + 1.6.1.2-dev mastfrog-parent From 0005c2278684d587afbe6fbeb6bf8a37c9d96679 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 8 Jun 2015 02:16:44 -0400 Subject: [PATCH 030/107] Update to Netty 4.0.28 and Guice 4.0 release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d5c5bdf..3ea5103 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.6.1.2-dev + 1.6.1.3-dev mastfrog-parent From daef0e19598d853dda6f31752d8bdf3c77f6b7ce Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 14 Jun 2015 08:32:16 -0400 Subject: [PATCH 031/107] Fix some test harness issues and bump version to 1.6.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ea5103..327c677 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.6.1.3-dev + 1.6.2 mastfrog-parent From 4b1fd0560ffe92d58050fadd5312b9efa94df6af Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 1 Sep 2015 18:21:21 -0400 Subject: [PATCH 032/107] Expose LogSink in bunyan-java; bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 327c677..e446629 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.6.2 + 1.6.3 mastfrog-parent From afdb5b02f61222a21ecf21b57dc104d1f8725561 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 18 Dec 2015 02:04:29 -0500 Subject: [PATCH 033/107] Version 1.6.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e446629..d3edb82 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.6.3 + 1.6.4 mastfrog-parent From 1edc6071b2609f439011403bb37c2d7710fa622a Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 18 Dec 2015 03:26:33 -0500 Subject: [PATCH 034/107] POM file cleanup and bump version of a few libraries --- pom.xml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index d3edb82..3b3de99 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 com.mastfrog @@ -20,21 +21,17 @@ com.google.code.gson gson - 2.2.4 junit junit - 4.11 test com.mastfrog netty-http-client - ${mastfrog.version} - @@ -48,8 +45,10 @@ - make-assembly - package + make-assembly + + package + single @@ -69,7 +68,6 @@ - From 0daf848e1fa801bc4fcdb2a8789397bec617e46f Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 18 Dec 2015 04:47:03 -0500 Subject: [PATCH 035/107] Add missing POM sections --- pom.xml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3b3de99..05ed87b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,12 +11,10 @@ com.justinsb etcd-client 0.3-tboudreau-fork - ${project.build.directory} true - com.google.code.gson @@ -97,4 +95,23 @@ + https://github.com/timboudreau/jetcd + + https://github.com/timboudreau/jetcd + scm:git:https://github.com/timboudreau/jetcd.git + git@github.com/timboudreau/jetcd.git + + + + MIT + http://opensource.org/licenses/MIT + + + + + Tim Boudreau + tim@timboudreau.com + https://timboudreau.com + + From 3fa62c6fb789f4053775a097018e696d774ce632 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 4 Jan 2017 00:52:32 -0500 Subject: [PATCH 036/107] License notices; some additions to util + JDK 8 required there; bump version --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 05ed87b..098a8ea 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,9 @@ - - + + 4.0.0 com.mastfrog - 1.6.4 + 1.6.5 mastfrog-parent From a588d2fe8e078279cc2eaca3f482fcdf5a980ca4 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 21 May 2017 02:23:52 -0400 Subject: [PATCH 037/107] Netty 4.2 compatibility --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 098a8ea..ff626d1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.6.5 + 1.7.0-dev mastfrog-parent From 84c6a5e33d80e6eb35e44fdf4fcc9db208fd16ac Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 22 May 2017 13:33:08 -0400 Subject: [PATCH 038/107] Use project.groupId where possible --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 098a8ea..1cb0c17 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ com.mastfrog netty-http-client + ${mastfrog.version} From 34e98abd9fbf7707fd4ccd9bddc717d5182db03f Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sat, 27 May 2017 06:09:06 -0400 Subject: [PATCH 039/107] Code changes due to incompatible changes in library --- src/main/java/com/justinsb/etcd/EtcdClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/justinsb/etcd/EtcdClient.java b/src/main/java/com/justinsb/etcd/EtcdClient.java index 11d4ed1..5028454 100644 --- a/src/main/java/com/justinsb/etcd/EtcdClient.java +++ b/src/main/java/com/justinsb/etcd/EtcdClient.java @@ -256,7 +256,7 @@ public String toString() { protected ListenableFuture asyncExecute(UriRequest request, int[] expectedHttpStatusCodes, final int... expectedErrorCodes) throws EtcdClientException { ListenableFuture json = asyncExecuteJson(request, expectedHttpStatusCodes); - return Futures.transform(json, new AsyncFunction() { + return Futures.transformAsync(json, new AsyncFunction() { public ListenableFuture apply(JsonResponse json) throws Exception { EtcdResult result = jsonToEtcdResult(json, expectedErrorCodes); return Futures.immediateFuture(result); @@ -358,7 +358,7 @@ protected JsonResponse syncExecuteJson(UriRequest request, int... expectedHttpSt protected ListenableFuture asyncExecuteJson(UriRequest request, final int[] expectedHttpStatusCodes) throws EtcdClientException { ListenableFuture response = asyncExecuteHttp(request); - return Futures.transform(response, new AsyncFunction() { + return Futures.transformAsync(response, new AsyncFunction() { public ListenableFuture apply(Response httpResponse) throws Exception { JsonResponse json = extractJsonResponse(httpResponse, expectedHttpStatusCodes); return Futures.immediateFuture(json); From 92d0193d01a0f8d02ddfd71cb4c218108e424eb5 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 29 May 2017 01:14:23 -0400 Subject: [PATCH 040/107] 1.7.0 release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd81ce7..c28e3f2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.7.0-dev + 1.7.0 mastfrog-parent From 40171ac2f3927c2b5ea7d44377d21948cf702b14 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 29 May 2017 01:24:47 -0400 Subject: [PATCH 041/107] Move to 2.0.0-dev version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c28e3f2..dcbb93b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 1.7.0 + 2.0.0-dev mastfrog-parent From a18fed8f1d809a7438542f2ff1126d94c47b2419 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 1 Sep 2017 18:18:41 -0400 Subject: [PATCH 042/107] Allow acteur to have default scope objects; bump version to 2.0.1-dev --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dcbb93b..e5fbaae 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.0-dev + 2.0.1-dev mastfrog-parent From fb74411a13ccf2eddf914b39327434a912122d8b Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 5 Oct 2017 04:22:00 -0400 Subject: [PATCH 043/107] Fix order bug with async logging in bunyan-java; test verbosity reduction; bump version to 2.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5fbaae..7d84d43 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.1-dev + 2.0.1 mastfrog-parent From b6d80ba3d9ed994253e1148b8ee9b2219247f8eb Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 5 Oct 2017 07:03:19 -0400 Subject: [PATCH 044/107] Eliminate a lot of output from tests; misc cleanup; use newer versions of several libraries; release 2.0.1 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d84d43..28064fd 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,6 @@ com.mastfrog netty-http-client - ${mastfrog.version} From a546c6348af688c9bc797ad3033e53b50035995a Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 11 Oct 2017 08:16:27 -0400 Subject: [PATCH 045/107] Roll a 2.0.2 release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28064fd..41a3e6a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.1 + 2.0.2 mastfrog-parent From 283d3d979cee41d7a9b57db93e658f8275d4c3e0 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 17 Oct 2017 03:26:10 -0400 Subject: [PATCH 046/107] Version 2.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41a3e6a..71bd29b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.2 + 2.0.3 mastfrog-parent From bee91dcb2e1f17e2c26382385a08987a62fcbd04 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sat, 28 Oct 2017 13:45:04 -0400 Subject: [PATCH 047/107] v2.0.4 with new methods in MongoUpdater.Updater --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71bd29b..83f8ece 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.3 + 2.0.4 mastfrog-parent From 209139007bf0fcad047c57df4d2d979b0f035209 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 29 Oct 2017 06:18:39 -0400 Subject: [PATCH 048/107] Add probe for in depth tracing and logging in Acteur; better support for java.time.* for MongoDB; consolidated some time-related utility code --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83f8ece..1945965 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.4 + 2.0.5 mastfrog-parent From add8d4456f68974d05ebdc7ca718f6633d850714 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 2 Nov 2017 00:33:08 -0400 Subject: [PATCH 049/107] Add update methods to MongoUpdater, v2.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1945965..e961a75 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.5 + 2.0.6 mastfrog-parent From 02d6a0288a4c25afd8c6e7d7f8c5ecf056e760e9 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 16 Nov 2017 17:30:36 -0500 Subject: [PATCH 050/107] Improve CORS handling in Acteur --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e961a75..e45f1bf 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.6 + 2.0.7 mastfrog-parent From cf63367508f3f2dda46e5a2a51a5c1a7716f045c Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 27 Nov 2017 18:06:55 -0500 Subject: [PATCH 051/107] Improve env handling in giulius-settings --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e45f1bf..5a7752f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.7 + 2.0.8 mastfrog-parent From 18e43f44614ca4b61794fe9793dea7a1f9ad7a3d Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 15 Dec 2017 07:35:50 -0500 Subject: [PATCH 052/107] Improved selenium support --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a7752f..65ffef6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.8 + 2.0.9 mastfrog-parent From 3e4fbd80d5e70b379702c6646e5bddf95edcbdc7 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 28 Dec 2017 02:30:37 -0500 Subject: [PATCH 053/107] Much simplified API for async operations in Acteur --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65ffef6..e86ef18 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.0.9 + 2.1.0 mastfrog-parent From d51ba8515873600ca1cadf09cff73f3058c0a492 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 12 Jan 2018 13:37:11 -0500 Subject: [PATCH 054/107] v2.1.1 - util enhancements --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e86ef18..4e6ac58 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.1.0 + 2.1.1 mastfrog-parent From 162585947e5106d9dd05b6d556b4bf2aeca6b1fc Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 24 Jan 2018 03:07:58 -0500 Subject: [PATCH 055/107] Version 2.2.0 - main change is range headers in Acteur --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e6ac58..6270236 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.1.1 + 2.2.0 mastfrog-parent From 267d9c91783527ee7478b852653228439f4cb032 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 30 Jan 2018 04:55:42 -0500 Subject: [PATCH 056/107] Remove some blocking from the mongodb async bindings startup path --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6270236..05536d6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.2.0 + 2.2.1 mastfrog-parent From 606358f3401c0deec85c76c51579b57e18eb93cf Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 8 Feb 2018 09:59:24 -0500 Subject: [PATCH 057/107] Fix multiple cookie parsing; v2.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05536d6..e7ad76f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.2.1 + 2.2.2 mastfrog-parent From 122862c5f351f72acb964d85a3bda744b832f53f Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 25 Feb 2018 05:50:08 -0500 Subject: [PATCH 058/107] Major optimization to filter list of applicable pages to ones that could possibly answer the request based on their annotations or contained acteurs --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7ad76f..58928bd 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.2.2 + 2.3.0 mastfrog-parent From 856b7b18f68c5f45fc1e8f0affae727318e53def Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 27 Feb 2018 16:05:48 -0500 Subject: [PATCH 059/107] Fix CORS decorator adding cache control headers to every response it touches --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 58928bd..2a70034 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.3.0 + 2.3.1 mastfrog-parent From ad3655b0c257ed2d6482f6ba2e5d1ce3eb6eb6c9 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 27 Feb 2018 18:59:29 -0500 Subject: [PATCH 060/107] Add ability to set some buffer sizes in Acteur --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a70034..26a0e2d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.3.1 + 2.3.2 mastfrog-parent From aa6665f5b357eb9319bfb83c5c9f34124b57f777 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 9 Mar 2018 00:42:09 -0500 Subject: [PATCH 061/107] Eliminate dependency on org.openide.util caused by older versions of simple-validation and use of the @ServiceProvider annotation (replaced with our own); add annotation processor base classes to util; optimized pending replacement of ReentrantScope --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26a0e2d..fad7ec8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.3.2 + 2.4.0 mastfrog-parent From 5182273bb8832424b696c18207cac5807e0a346d Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 12 Mar 2018 17:21:29 -0400 Subject: [PATCH 062/107] Use new maven repo url --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fad7ec8..6b8e239 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ timboudreau-builds timboudreau.com builds - http://timboudreau.com/builds/plugin/repository/everything/ + https://timboudreau.com/maven/ true never From 48fdd7fbc5ac6de80afb9cff0ddf847411232b52 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 20 Apr 2018 17:28:25 -0400 Subject: [PATCH 063/107] Version 2.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b8e239..ffa393f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.4.0 + 2.4.1 mastfrog-parent From 2a7b90d0550af6775cd634d92f6f6fce64a0a9ac Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 1 Jul 2018 16:00:25 -0400 Subject: [PATCH 064/107] Factor out annotation processors; generate meta-inf file for @Inject; acteur-resources improvements --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffa393f..616933d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.4.1 + 2.5.0-dev mastfrog-parent From cc0691b65b8625843875ebf7eac39b5855272b57 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 16 Jul 2018 15:09:41 -0400 Subject: [PATCH 065/107] Split util into several libraries and leave stubs in com.mastfrog.util --- src/main/java/com/justinsb/etcd/EtcdClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/justinsb/etcd/EtcdClient.java b/src/main/java/com/justinsb/etcd/EtcdClient.java index 5028454..3746c4d 100644 --- a/src/main/java/com/justinsb/etcd/EtcdClient.java +++ b/src/main/java/com/justinsb/etcd/EtcdClient.java @@ -19,8 +19,8 @@ import com.mastfrog.netty.http.client.ResponseHandler; import com.mastfrog.url.Parameters; import com.mastfrog.url.ParametersElement; -import com.mastfrog.util.AbstractBuilder; -import com.mastfrog.util.Exceptions; +import com.mastfrog.util.builder.AbstractBuilder; +import com.mastfrog.util.preconditions.Exceptions; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpResponseStatus; import java.io.IOException; From 180c262badecc0702ad1622f38eb2a360333c608 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 28 Apr 2019 16:59:30 -0400 Subject: [PATCH 066/107] Get this building with newer guava; should probably just delete it - unused --- pom.xml | 8 ++++---- src/main/java/com/justinsb/etcd/EtcdClient.java | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 616933d..a43f7a1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.justinsb etcd-client - 0.3-tboudreau-fork + 0.3-tboudreau-fork-1 ${project.build.directory} true @@ -33,7 +33,7 @@ maven-assembly-plugin - 2.4 + 3.1.1 1.5 @@ -55,7 +55,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.8.0 1.7 1.7 @@ -70,7 +70,7 @@ org.codehaus.mojo findbugs-maven-plugin - 2.5.3 + 3.0.5 true ${artifactTargetPath} diff --git a/src/main/java/com/justinsb/etcd/EtcdClient.java b/src/main/java/com/justinsb/etcd/EtcdClient.java index 3746c4d..8f82582 100644 --- a/src/main/java/com/justinsb/etcd/EtcdClient.java +++ b/src/main/java/com/justinsb/etcd/EtcdClient.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; +import java.util.concurrent.ForkJoinPool; public class EtcdClient { @@ -248,6 +249,7 @@ public UriRequest(Method method, URI uri, String body) { this.body = body; } + @Override public String toString() { return method.name() + ' ' + uri + (body == null ? "" : " --> " + body); } @@ -261,7 +263,7 @@ public ListenableFuture apply(JsonResponse json) throws Exception { EtcdResult result = jsonToEtcdResult(json, expectedErrorCodes); return Futures.immediateFuture(result); } - }); + }, ForkJoinPool.commonPool()); } protected EtcdResult syncExecute(UriRequest request, int[] expectedHttpStatusCodes, int... expectedErrorCodes) throws EtcdClientException { @@ -363,7 +365,7 @@ public ListenableFuture apply(Response httpResponse) throws Except JsonResponse json = extractJsonResponse(httpResponse, expectedHttpStatusCodes); return Futures.immediateFuture(json); } - }); + }, ForkJoinPool.commonPool()); } /** From 6f2d70273c6cdb6164f234ceae6ec4a2673a3374 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 6 May 2019 03:24:14 -0400 Subject: [PATCH 067/107] Prep for deployment to maven central --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a43f7a1..9bef330 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,10 @@ - https://github.com/timboudreau/jetcd + + Github + https://github.com/timboudreau/jetcd/issues + https://github.com/timboudreau/jetcd scm:git:https://github.com/timboudreau/jetcd.git From 4479bac500b4543f06d859418e1f2f4d4148401d Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 6 May 2019 03:56:00 -0400 Subject: [PATCH 068/107] Finishing prep for push to maven central --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 9bef330..f18be75 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,10 @@ scm:git:https://github.com/timboudreau/jetcd.git git@github.com/timboudreau/jetcd.git + + Mastfrog Technologies + https://mastfrog.com + MIT From deca95ddecd416477dda4a2f82b31247ca5e0b23 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 6 May 2019 04:55:25 -0400 Subject: [PATCH 069/107] More pom cleanup and metadata --- pom.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f18be75..6532d62 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ com.justinsb etcd-client + https://github.com/timboudreau/jetcd 0.3-tboudreau-fork-1 ${project.build.directory} @@ -99,10 +100,11 @@ https://github.com/timboudreau/jetcd/issues - https://github.com/timboudreau/jetcd + https://github.com/timboudreau/jetcd.git scm:git:https://github.com/timboudreau/jetcd.git git@github.com/timboudreau/jetcd.git + Mastfrog Technologies https://mastfrog.com @@ -110,7 +112,8 @@ MIT - http://opensource.org/licenses/MIT + https://opensource.org/licenses/MIT + repo From 7c88b5acd878fc4e9b1617b922f8b6d0a30a800b Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 6 May 2019 05:31:43 -0400 Subject: [PATCH 070/107] Release 2.5.0 ready --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6532d62..ff02573 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.5.0-dev + 2.5.0 mastfrog-parent From df2efff5352420a665d0cde45195361302844f59 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 7 May 2019 03:43:48 -0400 Subject: [PATCH 071/107] Bump version to 2.5.1-dev --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff02573..97c3e2b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.5.0 + 2.5.1-dev mastfrog-parent From 4ec10165bc5b0608658953505f41e0cdae4c1e57 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 16 Oct 2019 23:24:49 -0400 Subject: [PATCH 072/107] Add pom metadata where missing and update version to 2.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97c3e2b..1901e3c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.mastfrog - 2.5.1-dev + 2.6.0 mastfrog-parent From e330c5a7e0461f922702f21cd74bd5a62e9c6283 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 15 Nov 2019 15:35:54 -0500 Subject: [PATCH 073/107] Release 2.6.1 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1901e3c..1bc7275 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ - - + + 4.0.0 com.mastfrog - 2.6.0 + 2.6.1 mastfrog-parent @@ -104,7 +105,6 @@ scm:git:https://github.com/timboudreau/jetcd.git git@github.com/timboudreau/jetcd.git - Mastfrog Technologies https://mastfrog.com From eae532b9f6161459318f865e5b1985da43e93556 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 26 Nov 2019 01:38:00 -0500 Subject: [PATCH 074/107] v2.6.2 - update maven plugins, make various things more robust to parallel tests, misc fixes --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1bc7275..479768e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.1 + 2.6.2 mastfrog-parent From 271ceff948b4eff64d4496c23b66706caacc0e25 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 26 Nov 2019 06:13:15 -0500 Subject: [PATCH 075/107] Add dynamic graph; v2.6.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 479768e..bc3a017 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.2 + 2.6.3 mastfrog-parent From 9e4f577871056d9de62a65e811febfaf676e1280 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 27 Nov 2019 04:06:42 -0500 Subject: [PATCH 076/107] Buffer like fixes, misc --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc3a017..46e0a47 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.3 + 2.6.4 mastfrog-parent From 83b2cf392b61c88821bf5a8124a28acbccf42ecf Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 29 Nov 2019 15:09:09 -0500 Subject: [PATCH 077/107] v2.6.5 - ensure the recently introduced path matching cache plays nicely with having a basepath set, which alters external URLs --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46e0a47..2281c41 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.4 + 2.6.5 mastfrog-parent From d5287670d9a4dae5ef9103af52fa0061b5d250de Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 4 Dec 2019 14:31:26 -0500 Subject: [PATCH 078/107] Update simplevalidation version so all dependencies are ones in maven-central --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2281c41..a89da9c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.5 + 2.6.6 mastfrog-parent From 08acfc3e351500be05b89d89d3c8579356e6f47a Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 18 Dec 2019 22:20:10 -0500 Subject: [PATCH 079/107] Bump version to 2.6.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a89da9c..a3ef064 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.6 + 2.6.7 mastfrog-parent From 2f4f84c32afb2cad1381eebe4dc2be0998a30470 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 20 Dec 2019 20:31:11 -0500 Subject: [PATCH 080/107] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a3ef064..9e42f02 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.7 + 2.6.8 mastfrog-parent From eb9a8a473ec703c07b7632a7140e7ffe66614042 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 25 May 2020 03:19:07 -0400 Subject: [PATCH 081/107] Release 2.6.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e42f02..4a997ff 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.8 + 2.6.9 mastfrog-parent From efd3d9bc3070864129443635909e4ad0f28793bc Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 25 May 2020 07:35:03 -0400 Subject: [PATCH 082/107] Annotation tools delegate processor improvements; bump library versions; deal with backward incompatibilities in the vertx async postgres client (sigh). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a997ff..8af49b2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.9 + 2.6.10 mastfrog-parent From bbf7637b8fba4524ee0e080984b189976d72cbdc Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sat, 27 Jun 2020 17:33:14 -0400 Subject: [PATCH 083/107] Bump version (hotfix strings 2.6.11.1 precedes this) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8af49b2..56a8139 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.10 + 2.6.11 mastfrog-parent From a2a550e9ccba05e54cef8243ffe987c49858bc77 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 12 Jul 2020 11:33:54 -0400 Subject: [PATCH 084/107] v2.6.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56a8139..bb43d1f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.11 + 2.6.12 mastfrog-parent From 4c6c9f78bff9e127f0fbe46156a6fcea22a30647 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 4 Aug 2020 16:19:25 -0400 Subject: [PATCH 085/107] v2.6.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb43d1f..31835de 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.12 + 2.6.13 mastfrog-parent From 5e2ce46544490942f2e568cbf2bd4bf8216be578 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 10 Aug 2020 13:05:39 -0400 Subject: [PATCH 086/107] v2.7.0 - remove some obsolete projects, correct method names in functional interfaces for consistency, add util/subscriptions, remove original bunyan-java, bump library versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31835de..ab44ae9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.6.13 + 2.7.0 mastfrog-parent From 936b615c074351fbd714c330bb9c95845d90e615 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 16 Oct 2020 13:46:05 -0400 Subject: [PATCH 087/107] Version 2.7.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab44ae9..687d61b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.7.0 + 2.7.1 mastfrog-parent From 385a0036c736bbb9de24afe3111d0455c0a9ebd4 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 11 Mar 2021 05:14:06 -0500 Subject: [PATCH 088/107] v2.7.2 - annotation processor fixes for differences between jdk 8 and 15's javac; all tests pass on both --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 687d61b..714ea88 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.7.1 + 2.7.2 mastfrog-parent From 858456d8aad5f22529920829197c991873f6b3eb Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 10 Nov 2021 11:00:05 -0500 Subject: [PATCH 089/107] v2.7.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 714ea88..6c26325 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.7.2 + 2.7.3 mastfrog-parent From 9e7cd23d69b2187c397c85996cf8d75e99ba1473 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 20 Dec 2021 02:06:57 -0500 Subject: [PATCH 090/107] A number of optimizations; in particular a rewrite of ShutdownHookRegistry, which improves shutdown time and build-times --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c26325..c868c62 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.mastfrog - 2.7.3 + 2.8.0 mastfrog-parent From ea49e27db38a8f70065ec8afbf92f9b2d6df84f6 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 27 Apr 2022 15:53:19 -0400 Subject: [PATCH 091/107] Remove obsolete repository sections from poms; misc test fixes to ensure building on apple silicon; library version updates --- pom.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pom.xml b/pom.xml index c868c62..6ecddd0 100644 --- a/pom.xml +++ b/pom.xml @@ -81,21 +81,6 @@ - - - timboudreau-builds - timboudreau.com builds - https://timboudreau.com/maven/ - - true - never - - - true - never - - - Github https://github.com/timboudreau/jetcd/issues From 399493f36a87004a506767beb94dd2e17aebd010 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 5 May 2022 22:47:08 -0400 Subject: [PATCH 092/107] With some library updates, bump to v2.8.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6ecddd0..6133398 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,10 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.mastfrog - 2.8.0 + 2.8.1 mastfrog-parent From 1812dba6f91571bfa6aa3da0c33b765409bede13 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sat, 18 Jun 2022 06:10:37 -0400 Subject: [PATCH 093/107] v2.8.2 with automatic module names --- pom.xml | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6133398..f5e97de 100644 --- a/pom.xml +++ b/pom.xml @@ -1,21 +1,30 @@ - + + + 4.0.0 + com.mastfrog - 2.8.1 + 2.8.2 mastfrog-parent + com.justinsb etcd-client + https://github.com/timboudreau/jetcd 0.3-tboudreau-fork-1 + ${project.build.directory} true + com.google.code.gson @@ -31,9 +40,12 @@ netty-http-client + + + maven-assembly-plugin 3.1.1 @@ -45,15 +57,21 @@ make-assembly + + package + + single + + org.apache.maven.plugins maven-compiler-plugin @@ -66,6 +84,7 @@ + @@ -80,20 +99,24 @@ + Github https://github.com/timboudreau/jetcd/issues + https://github.com/timboudreau/jetcd.git scm:git:https://github.com/timboudreau/jetcd.git git@github.com/timboudreau/jetcd.git + Mastfrog Technologies https://mastfrog.com + MIT @@ -101,6 +124,7 @@ repo + Tim Boudreau @@ -108,4 +132,6 @@ https://timboudreau.com + + From 0a2dc5cafefc6d556b91b0f45c878b8ecda93fb2 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 23 Jun 2022 01:48:38 -0400 Subject: [PATCH 094/107] v2.8.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5e97de..982673d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.8.2 + 2.8.3 mastfrog-parent From 577cff211473e1f3e0f15b49e89f721577f46aa2 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sat, 10 Sep 2022 03:15:57 -0400 Subject: [PATCH 095/107] Updated versions in 140 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:annotation-tools: 2.8.3.4->2.8.4 * com.mastfrog:automodule-inject: 1.0->1.0.1 * com.mastfrog:colors: 2.8.3.4->2.8.4 * com.mastfrog:function: 2.8.3.1->2.8.4 * com.mastfrog:giulius-jdbc: 2.8.3->2.8.4 * com.mastfrog:java-vogon: 2.8.3.1->2.8.4 * com.mastfrog:mastfrog-parent: 2.8.3->2.8.4 * com.mastfrog:maven-merge-configuration: 2.8.3.4->2.8.4 * com.mastfrog:revision-info-plugin: 0.21->0.21.1 * com.mastfrog:revision-info-plugin: 2.8.3->2.8.4 * com.mastfrog:smart-jar-merge: 2.8.3.5->2.8.4 * com.mastfrog:swing-miscellaneous: 2.8.3.5->2.8.4 * com.mastfrog:util-strings: 2.8.3.1->2.8.4 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.8.3` ⟶ `2.8.4` * *jackson.version* - `2.13.4` ⟶ `2.8.4` * *trackerapi.version* - `1.0` ⟶ `2.8.4` * *selenium.version* - `3.141.59` ⟶ `2.8.4` * *mastfrog.version* - `2.8.3` ⟶ `2.8.4` ##### Provenance Generated by cactus: *cactus-git* version _1.5.30_. * Mojo: BumpVersionMojo * Generation-Time: 2022-09-10T07:15:57Z * Plugin-Build: yellow rabbit * Plugin-Date: 2022.09.10 * Plugin-Commit: 421cae558a013d1d97a7e968ec38d732672045f5 * Plugin-Repo-Clean: true --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 982673d..0a49805 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.8.3 + 2.8.4 mastfrog-parent @@ -134,4 +134,3 @@ - From 95a6cc8dabfb688c073d6529e45b08941f3b3940 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sat, 10 Sep 2022 04:10:09 -0400 Subject: [PATCH 096/107] Updated versions in 143 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.0.1->1.0.2 * com.mastfrog:giulius-jdbc: 2.8.4->2.8.5 * com.mastfrog:mastfrog-parent: 2.8.4->2.8.5 * com.mastfrog:revision-info-plugin: 0.21.1->0.21.2 * com.mastfrog:revision-info-plugin: 2.8.4->2.8.5 * com.mastfrog:testproject-a: 2.8.3->2.8.4 * com.mastfrog:testproject-b: 2.8.3->2.8.4 * com.mastfrog:testproject-c: 2.8.3->2.8.4 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *jackson.version* - `2.13.4` ⟶ `2.8.5` * *selenium.version* - `3.141.59` ⟶ `2.8.5` * *mastfrog.version* - `2.8.4` ⟶ `2.8.5` * *trackerapi.version* - `1.0` ⟶ `2.8.5` * *mastfrog.version* - `2.8.4` ⟶ `2.8.5` ##### Provenance Generated by cactus: *cactus-git* version _1.5.29_. * Mojo: BumpVersionMojo * Generation-Time: 2022-09-10T08:10:09Z * Plugin-Build: yellow rhino * Plugin-Date: 2022.09.09 * Plugin-Commit: b816224000b13e96c26499c7110b67895868f2cd * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a49805..1fa7be3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.8.4 + 2.8.5 mastfrog-parent From e0aca964cc5eef40c6b8a7ec773d933107a2481e Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 23 Sep 2022 01:13:04 -0400 Subject: [PATCH 097/107] Updated versions in 147 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.0.2->1.0.3 * com.mastfrog:giulius-jdbc: 2.8.5->2.8.6 * com.mastfrog:java-vogon: 2.8.5.2->2.8.6 * com.mastfrog:mastfrog-parent: 2.8.5->2.8.6 * com.mastfrog:revision-info-plugin: 0.21.2->0.21.3 * com.mastfrog:revision-info-plugin: 2.8.5->2.8.6 * com.mastfrog:testproject-a: 2.8.4->2.8.5 * com.mastfrog:testproject-b: 2.8.4->2.8.5 * com.mastfrog:testproject-c: 2.8.4->2.8.5 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.8.5` ⟶ `2.8.6` * *selenium.version* - `3.141.59` ⟶ `2.8.6` * *jackson.version* - `2.13.4` ⟶ `2.8.6` * *mastfrog.version* - `2.8.5` ⟶ `2.8.6` * *trackerapi.version* - `1.0` ⟶ `2.8.6` ##### Provenance Generated by cactus: *cactus-git* version _1.5.31_. * Mojo: BumpVersionMojo * Generation-Time: 2022-09-23T05:13:04Z * Plugin-Build: yellow rabbit * Plugin-Date: 2022.09.10 * Plugin-Commit: f32552996bf3511e8901928b6467df125bdebbd2 * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fa7be3..1a33933 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.8.5 + 2.8.6 mastfrog-parent From 40b9b572c7a5382467a1d33ffb5adb94b59adb09 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Wed, 12 Oct 2022 17:48:06 -0400 Subject: [PATCH 098/107] Updated versions in 149 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.0->1.0.1 * com.mastfrog:giulius-jdbc: 2.8.6->2.8.7 * com.mastfrog:mastfrog-parent: 2.8.6->2.8.7 * com.mastfrog:revision-info-plugin: 0.21->0.21.1 * com.mastfrog:revision-info-plugin: 2.8.6->2.8.7 * com.mastfrog:testproject-a: 2.8.5->2.8.6 * com.mastfrog:testproject-b: 2.8.5->2.8.6 * com.mastfrog:testproject-c: 2.8.5->2.8.6 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.8.6` ⟶ `2.8.7` * *selenium.version* - `3.141.59` ⟶ `2.8.7` * *trackerapi.version* - `1.0` ⟶ `2.8.7` * *mastfrog.version* - `2.8.6` ⟶ `2.8.7` * *jackson.version* - `2.13.4` ⟶ `2.8.7` ##### Provenance Generated by cactus: *cactus-git* version _1.5.31_. * Mojo: BumpVersionMojo * Generation-Time: 2022-10-12T21:48:06Z * Plugin-Build: yellow rabbit * Plugin-Date: 2022.09.10 * Plugin-Commit: f32552996bf3511e8901928b6467df125bdebbd2 * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a33933..567936a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.8.6 + 2.8.7 mastfrog-parent From a5f8c5d9454bd10442c9a40c945a76166bdc3549 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 18 Oct 2022 01:10:33 -0400 Subject: [PATCH 099/107] Updated versions in 150 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:acteur: 2.8.7.1->2.8.8 * com.mastfrog:acteur-headers: 2.8.7.1->2.8.8 * com.mastfrog:automodule-inject: 1.0->1.0.1 * com.mastfrog:giulius-jdbc: 2.8.7->2.9.0 * com.mastfrog:java-vogon: 2.8.7.1->2.8.8 * com.mastfrog:mastfrog-parent: 2.8.7->2.9.0 * com.mastfrog:revision-info-plugin: 0.21->0.21.1 * com.mastfrog:revision-info-plugin: 2.8.7->2.9.0 * com.mastfrog:testproject-a: 2.8.6->2.8.7 * com.mastfrog:testproject-b: 2.8.6->2.8.7 * com.mastfrog:testproject-c: 2.8.6->2.8.7 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.8.7` ⟶ `2.9.0` * *mastfrog.version* - `2.8.7` ⟶ `2.9.0` * *jackson.version* - `2.13.4` ⟶ `2.9.0` * *trackerapi.version* - `1.0` ⟶ `2.9.0` * *selenium.version* - `3.141.59` ⟶ `2.9.0` ##### Provenance Generated by cactus: *cactus-git* version _1.5.31_. * Mojo: BumpVersionMojo * Generation-Time: 2022-10-18T05:10:33Z * Plugin-Build: yellow rabbit * Plugin-Date: 2022.09.10 * Plugin-Commit: f32552996bf3511e8901928b6467df125bdebbd2 * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 567936a..dd8551b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.8.7 + 2.9.0 mastfrog-parent From 18a9aa99b7370dc21472b6d65417f9f8d1ab6c35 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 18 Oct 2022 23:41:38 -0400 Subject: [PATCH 100/107] 'Split header parsers and entities with no dependencies on Netty out of acteur-headers and acteur-util' Affected Checkouts ------------------ * acteur-modules/acteur-parent * giulius-modules/giulius-parent * giulius-selenium-tests-modules/giulius-selenium-tests-parent * giulius-web-modules/giulius-web-parent * acteur-auth * acteur-timetracker * acteur-tutorial * blather * blurt * bunyan-java-v2 * generic-web-api * giulius-settings-etcd * jetcd * netty-http-client * numble * (root) ##### Provenance Generated by cactus: *cactus-git* version _1.5.31_. * Mojo: CommitMojo * Generation-Time: 2022-10-19T03:41:38Z * Plugin-Build: yellow rabbit * Plugin-Date: 2022.09.10 * Plugin-Commit: f32552996bf3511e8901928b6467df125bdebbd2 * Plugin-Repo-Clean: true --- pom.xml | 1 + src/main/java/com/justinsb/etcd/EtcdClient.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dd8551b..edfda54 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ com.mastfrog netty-http-client + ${mastfrog.version} diff --git a/src/main/java/com/justinsb/etcd/EtcdClient.java b/src/main/java/com/justinsb/etcd/EtcdClient.java index 8f82582..0c90fb7 100644 --- a/src/main/java/com/justinsb/etcd/EtcdClient.java +++ b/src/main/java/com/justinsb/etcd/EtcdClient.java @@ -2,7 +2,6 @@ import com.google.common.base.Splitter; import com.google.common.collect.Lists; -import com.google.common.net.MediaType; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -13,6 +12,7 @@ import com.google.gson.JsonParseException; import com.google.gson.JsonParser; import com.mastfrog.acteur.headers.Method; +import com.mastfrog.mime.MimeType; import com.mastfrog.netty.http.client.HttpClient; import com.mastfrog.netty.http.client.HttpRequestBuilder; import com.mastfrog.netty.http.client.ResponseFuture; @@ -447,7 +447,7 @@ protected void receive(HttpResponseStatus status, HttpHeaders headers, String co if (request.body != null) { try { - bldr.setBody(request.body, MediaType.parse("application/x-www-form-urlencoded")); + bldr.setBody(request.body, MimeType.FORM_DATA); } catch (IOException ex) { Exceptions.chuck(ex); } From 3fee9e6e2bd9333fd5ceb036aeed2532bc33d21a Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Fri, 28 Oct 2022 01:08:48 -0400 Subject: [PATCH 101/107] Updated versions in 144 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.2->1.2.1 * com.mastfrog:mastfrog-parent: 2.9.0->2.9.1 * com.mastfrog:revision-info-plugin: 0.20->0.20.1 * com.mastfrog:revision-info-plugin: 2.8.2->2.8.3 * com.mastfrog:revision-info-plugin: 2.9.0->2.9.1 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.9.0` ⟶ `2.9.1` * *mastfrog.version* - `2.9.0` ⟶ `2.9.1` * *trackerapi.version* - `1.0` ⟶ `2.9.1` * *selenium.version* - `3.141.59` ⟶ `2.9.1` ##### Provenance Generated by cactus: *cactus-maven-plugin* version _1.5.36_. * Mojo: BumpVersionMojo * Generation-Time: 2022-10-28T05:08:48Z * Plugin-Build: yellow light-bulb * Plugin-Date: 2022.10.26 * Plugin-Commit: 45c71cee60ee9a335b03d4e55e4427c4fdabd09d * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index edfda54..9992f42 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.9.0 + 2.9.1 mastfrog-parent From 7368663a6f177cfa6a00cf9fa9eec81e3d6fcd13 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Thu, 10 Nov 2022 22:50:51 -0500 Subject: [PATCH 102/107] Updated versions in 146 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.2->1.2.1 * com.mastfrog:mastfrog-parent: 2.9.1->2.9.2 * com.mastfrog:revision-info-plugin: 0.22->0.22.1 * com.mastfrog:revision-info-plugin: 2.9.1->2.9.2 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.9.1` ⟶ `2.9.2` * *mastfrog.version* - `2.9.1` ⟶ `2.9.2` ##### Provenance Generated by cactus: *cactus-maven-plugin* version _1.5.35_. * Mojo: BumpVersionMojo * Generation-Time: 2022-11-11T03:50:51Z * Plugin-Build: yellow laptop * Plugin-Date: 2022.10.20 * Plugin-Commit: 7622e64b4f177618889d793eacbefc57173eabc6 * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9992f42..3d5fa4d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.9.1 + 2.9.2 mastfrog-parent From e2bf8cba3581bec129ec9e68dfb4bcc754edf8ba Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 20 Nov 2022 08:15:59 -0500 Subject: [PATCH 103/107] Updated versions in 146 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.2.1->1.2.2 * com.mastfrog:mastfrog-parent: 2.9.2->2.9.3 * com.mastfrog:revision-info-plugin: 0.22.1->0.22.2 * com.mastfrog:revision-info-plugin: 2.9.2->2.9.3 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.9.2` ⟶ `2.9.3` * *mastfrog.version* - `2.9.2` ⟶ `2.9.3` ##### Provenance Generated by cactus: *cactus-maven-plugin* version _1.5.35_. * Mojo: BumpVersionMojo * Generation-Time: 2022-11-20T13:15:59Z * Plugin-Build: yellow laptop * Plugin-Date: 2022.10.20 * Plugin-Commit: 7622e64b4f177618889d793eacbefc57173eabc6 * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d5fa4d..6085d8e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.9.2 + 2.9.3 mastfrog-parent From 071e7ec783fe8b0bd4eda723b86d49bc750d5e20 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Mon, 28 Nov 2022 01:19:23 -0500 Subject: [PATCH 104/107] Updated versions in 146 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.2->1.2.1 * com.mastfrog:mastfrog-parent: 2.9.3->2.9.4 * com.mastfrog:revision-info-plugin: 0.22->0.22.1 * com.mastfrog:revision-info-plugin: 2.9.3->2.9.4 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.9.3` ⟶ `2.9.4` * *mastfrog.version* - `2.9.3` ⟶ `2.9.4` ##### Provenance Generated by cactus: *cactus-maven-plugin* version _1.5.35_. * Mojo: BumpVersionMojo * Generation-Time: 2022-11-28T06:19:23Z * Plugin-Build: yellow laptop * Plugin-Date: 2022.10.20 * Plugin-Commit: 7622e64b4f177618889d793eacbefc57173eabc6 * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6085d8e..898d01d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.9.3 + 2.9.4 mastfrog-parent From dc0084eaeb29faad4bc9c2622306a6ff9d4c2e8a Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 12 Feb 2023 23:20:44 -0500 Subject: [PATCH 105/107] Updated versions in 146 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.2->1.2.1 * com.mastfrog:mastfrog-parent: 2.9.4->2.9.5 * com.mastfrog:revision-info-plugin: 0.23->0.23.1 * com.mastfrog:revision-info-plugin: 2.9.4->2.9.5 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.9.4` ⟶ `2.9.5` * *mastfrog.version* - `2.9.4` ⟶ `2.9.5` ##### Provenance Generated by cactus: *cactus-maven-plugin* version _1.5.35_. * Mojo: BumpVersionMojo * Generation-Time: 2023-02-13T04:20:44Z * Plugin-Build: yellow laptop * Plugin-Date: 2022.10.20 * Plugin-Commit: 7622e64b4f177618889d793eacbefc57173eabc6 * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 898d01d..c37fe19 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.9.4 + 2.9.5 mastfrog-parent From f9c7b9c669308544560395a67b73d9e969280407 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Sun, 19 Feb 2023 22:49:44 -0500 Subject: [PATCH 106/107] Updated versions in 146 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.2->1.2.1 * com.mastfrog:mastfrog-parent: 2.9.5->2.9.6 * com.mastfrog:revision-info-plugin: 0.23->0.23.1 * com.mastfrog:revision-info-plugin: 2.9.5->2.9.6 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.9.5` ⟶ `2.9.6` * *mastfrog.version* - `2.9.5` ⟶ `2.9.6` ##### Provenance Generated by cactus: *cactus-maven-plugin* version _1.5.35_. * Mojo: BumpVersionMojo * Generation-Time: 2023-02-20T03:49:44Z * Plugin-Build: yellow laptop * Plugin-Date: 2022.10.20 * Plugin-Commit: 7622e64b4f177618889d793eacbefc57173eabc6 * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c37fe19..dc6a985 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.9.5 + 2.9.6 mastfrog-parent From ce0d990827ef68b0ead372e8b8c34cc59ef1d885 Mon Sep 17 00:00:00 2001 From: Tim Boudreau Date: Tue, 21 Feb 2023 04:24:00 -0500 Subject: [PATCH 107/107] Updated versions in 148 projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version Changes --------------- * com.mastfrog:automodule-inject: 1.2->1.2.1 * com.mastfrog:mastfrog-parent: 2.9.6->2.9.7 * com.mastfrog:revision-info-plugin: 0.23->0.23.1 * com.mastfrog:revision-info-plugin: 2.9.4->2.9.5 * com.mastfrog:revision-info-plugin: 2.9.6->2.9.7 Property Changes ---------------- * com.mastfrog:mastfrog-parent * *mastfrog.version* - `2.9.6` ⟶ `2.9.7` * *mastfrog.version* - `2.9.6` ⟶ `2.9.7` ##### Provenance Generated by cactus: *cactus-maven-plugin* version _1.5.45_. * Mojo: BumpVersionMojo * Generation-Time: 2023-02-21T09:24:00Z * Plugin-Build: yellow dune-buggy * Plugin-Date: 2022.11.02 * Plugin-Commit: c66f67cfba0b6b556c8a9f3907e02f54ca8a7a70 * Plugin-Repo-Clean: true --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc6a985..6136d97 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.mastfrog - 2.9.6 + 2.9.7 mastfrog-parent