From 5dd738ca5ed9b87f30ee8815345f477011b73743 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 17 Sep 2024 13:28:08 +0000 Subject: [PATCH 1/2] Snapshot version --- annot/pom.xml | 2 +- core/.factorypath | 2 +- core/pom.xml | 2 +- distribution/examples/embedding-java/pom.xml | 2 +- distribution/examples/stax-interceptor/pom.xml | 2 +- distribution/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- membrane.spec | 2 +- pom.xml | 2 +- starter/pom.xml | 2 +- test/pom.xml | 2 +- war/.factorypath | 2 +- war/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/annot/pom.xml b/annot/pom.xml index b9555e3aa..561fd0266 100644 --- a/annot/pom.xml +++ b/annot/pom.xml @@ -23,7 +23,7 @@ org.membrane-soa service-proxy-parent ../pom.xml - 5.7.3 + 5.7.4-SNAPSHOT diff --git a/core/.factorypath b/core/.factorypath index 6d6bcd2c5..325ca1728 100644 --- a/core/.factorypath +++ b/core/.factorypath @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index 18ce23826..672012c94 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,7 +23,7 @@ org.membrane-soa service-proxy-parent ../pom.xml - 5.7.3 + 5.7.4-SNAPSHOT diff --git a/distribution/examples/embedding-java/pom.xml b/distribution/examples/embedding-java/pom.xml index 9b6de1879..e3b0c1340 100644 --- a/distribution/examples/embedding-java/pom.xml +++ b/distribution/examples/embedding-java/pom.xml @@ -29,7 +29,7 @@ org.membrane-soa service-proxy-core - 5.7.3 + 5.7.4-SNAPSHOT org.projectlombok diff --git a/distribution/examples/stax-interceptor/pom.xml b/distribution/examples/stax-interceptor/pom.xml index a8114faee..63b91ba52 100644 --- a/distribution/examples/stax-interceptor/pom.xml +++ b/distribution/examples/stax-interceptor/pom.xml @@ -19,7 +19,7 @@ org.membrane-soa service-proxy-core - 5.7.3 + 5.7.4-SNAPSHOT diff --git a/distribution/pom.xml b/distribution/pom.xml index b51a9943e..5eb197b13 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -27,7 +27,7 @@ org.membrane-soa service-proxy-parent ../pom.xml - 5.7.3 + 5.7.4-SNAPSHOT diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 739825778..472d5f4ba 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -25,7 +25,7 @@ org.membrane-soa service-proxy-parent ../pom.xml - 5.7.3 + 5.7.4-SNAPSHOT diff --git a/membrane.spec b/membrane.spec index c061e2acf..bc950407f 100644 --- a/membrane.spec +++ b/membrane.spec @@ -4,7 +4,7 @@ %global logdir %{_var}/log/%{name} Name: membrane -Version: 5.7.3 +Version: 5.7.4-SNAPSHOT Release: 1%{?dist} URL: https://github.com/membrane/api-gateway Summary: Membrane - Open Source API Gateway written in Java for REST APIs, WebSockets, STOMP and legacy Web Services diff --git a/pom.xml b/pom.xml index 4f666c51d..1e1d3751c 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 4.0.0 org.membrane-soa service-proxy-parent - 5.7.3 + 5.7.4-SNAPSHOT ${project.artifactId} Membrane is an open source API Gateway written in Java that features: - OpenAPI support with validation diff --git a/starter/pom.xml b/starter/pom.xml index d3aab40f0..77e128dd1 100644 --- a/starter/pom.xml +++ b/starter/pom.xml @@ -2,7 +2,7 @@ service-proxy-parent org.membrane-soa - 5.7.3 + 5.7.4-SNAPSHOT 4.0.0 diff --git a/test/pom.xml b/test/pom.xml index 0e8893bb0..6b57fdfe7 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -23,7 +23,7 @@ org.membrane-soa service-proxy-parent ../pom.xml - 5.7.3 + 5.7.4-SNAPSHOT diff --git a/war/.factorypath b/war/.factorypath index 6d6bcd2c5..325ca1728 100644 --- a/war/.factorypath +++ b/war/.factorypath @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/war/pom.xml b/war/pom.xml index e6e196d68..6c0ad8bd1 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -23,7 +23,7 @@ org.membrane-soa service-proxy-parent ../pom.xml - 5.7.3 + 5.7.4-SNAPSHOT From 48b59dd78a14bb34d8395a8b7e5683385ee7f41a Mon Sep 17 00:00:00 2001 From: Tobias Polley Date: Fri, 20 Sep 2024 10:16:29 +0200 Subject: [PATCH 2/2] adjust retry interval to something above 5/hour (see https://letsencrypt.org/docs/failed-validation-limit/) (#1279) Co-authored-by: Thomas Bayer --- .../predic8/membrane/core/transport/ssl/acme/AcmeRenewal.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/predic8/membrane/core/transport/ssl/acme/AcmeRenewal.java b/core/src/main/java/com/predic8/membrane/core/transport/ssl/acme/AcmeRenewal.java index 201ce31de..00a56b3c9 100644 --- a/core/src/main/java/com/predic8/membrane/core/transport/ssl/acme/AcmeRenewal.java +++ b/core/src/main/java/com/predic8/membrane/core/transport/ssl/acme/AcmeRenewal.java @@ -39,7 +39,7 @@ public class AcmeRenewal { private static final Logger LOG = LoggerFactory.getLogger(AcmeRenewal.class); - private static final long ERROR_WAIT_MILLISECONDS = 5 * 60 * 1000; + private static final long ERROR_WAIT_MILLISECONDS = 15 * 60 * 1000; private static final long LEASE_DURATION_MILLISECONDS = 5 * 60 * 1000; private static final long LEASE_RENEW_MILLISECONDS = 4 * 60 * 1000; @@ -66,7 +66,7 @@ public void doWork() { } catch (Exception e) { e.printStackTrace(); try { - Thread.sleep(60 * 1000); + Thread.sleep(ERROR_WAIT_MILLISECONDS); } catch (InterruptedException ex) { Thread.currentThread().interrupt(); }