Merge pull request #11 from zendern/random-cleanup

Random cleanup

.github/workflows/gradle.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11']
+        java: ['8', '11', '14']
     steps:
     - uses: actions/checkout@v2
     - uses: actions/cache@v1

README.md

@@ -12,12 +12,12 @@ the front runner for integration with Acme and is completely free.
 
 See the [stable](https://micronaut-projects.github.io/micronaut-acme/latest/guide) or [snapshot](https://micronaut-projects.github.io/micronaut-acme/snapshot/guide) documentation for more information.
 
-## Acme Utils ##
-Since ACME servers do require some pre setup there is a acme-utils subproject that can be found [here](https://github.com/zendern/micronaut-acme/blob/master/examples/acme-utils). Which can help you create keys, create/deactivate accounts, etc.
+## Acme Cli ##
+Since ACME servers do require some pre setup there is a acme-cli subproject that can be found [here](https://github.com/micronaut-projects/micronaut-acme/tree/master/acme-cli). Which can help you create keys, create/deactivate accounts, etc.
 
 ## Example Application ##
 
-See the [Examples](https://github.com/zendern/micronaut-acme/tree/master/examples/hello-world-acme) for more information.
+See the [Examples](https://github.com/micronaut-projects/micronaut-acme/tree/master/examples/hello-world-acme) for more information.
 
 ## Snapshots and Releases
 

acme/src/main/java/io/micronaut/configuration/acme/AcmeConfiguration.java → acme/src/main/java/io/micronaut/acme/AcmeConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme;
+package io.micronaut.acme;
 
 import io.micronaut.context.annotation.ConfigurationProperties;
 import io.micronaut.core.util.Toggleable;

acme/src/main/java/io/micronaut/configuration/acme/background/AcmeCertRefresherTask.java → acme/src/main/java/io/micronaut/acme/background/AcmeCertRefresherTask.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme.background;
+package io.micronaut.acme.background;
 
-import io.micronaut.configuration.acme.AcmeConfiguration;
-import io.micronaut.configuration.acme.services.AcmeService;
+import io.micronaut.acme.AcmeConfiguration;
+import io.micronaut.acme.services.AcmeService;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.runtime.event.ApplicationStartupEvent;
 import io.micronaut.runtime.event.annotation.EventListener;

acme/src/main/java/io/micronaut/configuration/acme/background/package-info.java → acme/src/main/java/io/micronaut/acme/background/package-info.java

@@ -19,4 +19,4 @@
  * @author Nathan Zender
  * @since 1.0
  */
-package io.micronaut.configuration.acme.background;
+package io.micronaut.acme.background;

acme/src/main/java/io/micronaut/configuration/acme/challenge/dns/TxtRenderer.java → acme/src/main/java/io/micronaut/acme/challenge/dns/TxtRenderer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme.challenge.dns;
+package io.micronaut.acme.challenge.dns;
 
 /**
  * TXT renderer needed for DNS Acme challenge server validation to be possible.

acme/src/main/java/io/micronaut/configuration/acme/challenge/http/endpoint/HttpChallengeDetails.java → acme/src/main/java/io/micronaut/acme/challenge/http/endpoint/HttpChallengeDetails.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme.challenge.http.endpoint;
+package io.micronaut.acme.challenge.http.endpoint;
 
 /**
  * Contains the details needed to satisfy a passing http-01 challenge from the acme challenge server.

acme/src/main/java/io/micronaut/configuration/acme/challenge/http/endpoint/WellKnownTokenController.java → acme/src/main/java/io/micronaut/acme/challenge/http/endpoint/WellKnownTokenController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme.challenge.http.endpoint;
+package io.micronaut.acme.challenge.http.endpoint;
 
 import io.micronaut.http.HttpStatus;
 import io.micronaut.http.annotation.Controller;

acme/src/main/java/io/micronaut/configuration/acme/challenge/http/package-info.java → acme/src/main/java/io/micronaut/acme/challenge/http/package-info.java

@@ -21,7 +21,7 @@
  */
 @Configuration
 @Requires(property = "acme.challenge-type", value = "http")
-package io.micronaut.configuration.acme.challenge.http;
+package io.micronaut.acme.challenge.http;
 
 import io.micronaut.context.annotation.Configuration;
 import io.micronaut.context.annotation.Requires;

acme/src/main/java/io/micronaut/configuration/acme/events/CertificateEvent.java → acme/src/main/java/io/micronaut/acme/events/CertificateEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme.events;
+package io.micronaut.acme.events;
 
 import java.security.KeyPair;
 import java.security.cert.X509Certificate;

acme/src/main/java/io/micronaut/configuration/acme/events/package-info.java → acme/src/main/java/io/micronaut/acme/events/package-info.java

@@ -19,4 +19,4 @@
  * @author Nathan Zender
  * @since 1.0
  */
-package io.micronaut.configuration.acme.events;
+package io.micronaut.acme.events;

acme/src/main/java/io/micronaut/configuration/acme/package-info.java → acme/src/main/java/io/micronaut/acme/package-info.java

@@ -23,7 +23,7 @@
 @Configuration
 @Requires(property = "acme.enabled", value = TRUE)
 @Requires(property = ServerSslConfiguration.PREFIX + ".enabled", value = TRUE, defaultValue = FALSE)
-package io.micronaut.configuration.acme;
+package io.micronaut.acme;
 
 import io.micronaut.context.annotation.Configuration;
 import io.micronaut.context.annotation.Requires;

acme/src/main/java/io/micronaut/configuration/acme/services/AcmeRuntimeException.java → acme/src/main/java/io/micronaut/acme/services/AcmeRuntimeException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme.services;
+package io.micronaut.acme.services;
 
 /**
  * Acme scoped runtime exception to be used for anything Acme related.

acme/src/main/java/io/micronaut/configuration/acme/services/AcmeService.java → acme/src/main/java/io/micronaut/acme/services/AcmeService.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme.services;
+package io.micronaut.acme.services;
 
-import io.micronaut.configuration.acme.AcmeConfiguration;
-import io.micronaut.configuration.acme.challenge.dns.TxtRenderer;
-import io.micronaut.configuration.acme.challenge.http.endpoint.HttpChallengeDetails;
-import io.micronaut.configuration.acme.events.CertificateEvent;
+import io.micronaut.acme.AcmeConfiguration;
+import io.micronaut.acme.challenge.dns.TxtRenderer;
+import io.micronaut.acme.challenge.http.endpoint.HttpChallengeDetails;
+import io.micronaut.acme.events.CertificateEvent;
 import io.micronaut.context.event.ApplicationEventPublisher;
 import io.micronaut.core.io.IOUtils;
 import io.micronaut.core.io.ResourceResolver;
@@ -54,7 +54,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static io.micronaut.configuration.acme.AcmeConfiguration.ChallengeType;
+import static io.micronaut.acme.AcmeConfiguration.ChallengeType;
 import static java.nio.file.StandardOpenOption.*;
 
 /**

acme/src/main/java/io/micronaut/configuration/acme/services/package-info.java → acme/src/main/java/io/micronaut/acme/services/package-info.java

@@ -19,4 +19,4 @@
  * @author Nathan Zender
  * @since 1.0
  */
-package io.micronaut.configuration.acme.services;
+package io.micronaut.acme.services;

acme/src/main/java/io/micronaut/configuration/acme/ssl/AcmeSSLContextBuilder.java → acme/src/main/java/io/micronaut/acme/ssl/AcmeSSLContextBuilder.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme.ssl;
+package io.micronaut.acme.ssl;
 
-import io.micronaut.configuration.acme.events.CertificateEvent;
+import io.micronaut.acme.events.CertificateEvent;
 import io.micronaut.context.annotation.Replaces;
 import io.micronaut.http.server.netty.ssl.CertificateProvidedSslBuilder;
 import io.micronaut.http.server.netty.ssl.ServerSslBuilder;

acme/src/main/java/io/micronaut/configuration/acme/ssl/DelegatedSslContext.java → acme/src/main/java/io/micronaut/acme/ssl/DelegatedSslContext.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.micronaut.configuration.acme.ssl;
+package io.micronaut.acme.ssl;
 
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.handler.ssl.ApplicationProtocolNegotiator;

acme/src/main/java/io/micronaut/configuration/acme/ssl/package-info.java → acme/src/main/java/io/micronaut/acme/ssl/package-info.java

@@ -19,4 +19,4 @@
  * @author Nathan Zender
  * @since 1.0
  */
-package io.micronaut.configuration.acme.ssl;
+package io.micronaut.acme.ssl;

acme/src/test/groovy/io/micronaut/configuration/acme/AcmeBaseSpec.groovy → acme/src/test/groovy/io/micronaut/acme/AcmeBaseSpec.groovy

@@ -1,4 +1,4 @@
-package io.micronaut.configuration.acme
+package io.micronaut.acme
 
 import io.micronaut.context.ApplicationContext
 import io.micronaut.core.io.socket.SocketUtils

acme/src/test/groovy/io/micronaut/configuration/acme/AcmeCertRefresherTaskSpec.groovy → acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskSpec.groovy

@@ -1,4 +1,4 @@
-package io.micronaut.configuration.acme
+package io.micronaut.acme
 
 
 import io.micronaut.http.HttpRequest

acme/src/test/groovy/io/micronaut/configuration/acme/AcmeCertRefresherTaskUnitSpec.groovy → acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskUnitSpec.groovy

@@ -1,7 +1,7 @@
-package io.micronaut.configuration.acme
+package io.micronaut.acme
 
-import io.micronaut.configuration.acme.background.AcmeCertRefresherTask
-import io.micronaut.configuration.acme.services.AcmeService
+import io.micronaut.acme.background.AcmeCertRefresherTask
+import io.micronaut.acme.services.AcmeService
 import io.netty.handler.ssl.util.SelfSignedCertificate
 import spock.lang.Specification
 import spock.lang.Stepwise

acme/src/test/groovy/io/micronaut/configuration/acme/AcmeCertRefresherTaskWithClasspathKeysSpec.groovy → acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskWithClasspathKeysSpec.groovy

@@ -1,4 +1,4 @@
-package io.micronaut.configuration.acme
+package io.micronaut.acme
 
 
 import io.micronaut.http.HttpRequest

acme/src/test/groovy/io/micronaut/configuration/acme/AcmeCertRefresherTaskWithFileKeysSpec.groovy → acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskWithFileKeysSpec.groovy

@@ -1,4 +1,4 @@
-package io.micronaut.configuration.acme
+package io.micronaut.acme
 
 
 import io.micronaut.http.HttpRequest
@@ -7,13 +7,11 @@ import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory
 import io.reactivex.Flowable
-import org.shredzone.acme4j.util.KeyPairUtils
 import spock.lang.Stepwise
 import spock.util.concurrent.PollingConditions
 
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
-import java.security.KeyPair
 import java.security.SecureRandom
 import java.security.cert.Certificate
 import java.security.cert.X509Certificate

acme/src/test/groovy/io/micronaut/configuration/acme/AcmeCertWildcardRefresherTaskSpec.groovy → acme/src/test/groovy/io/micronaut/acme/AcmeCertWildcardRefresherTaskSpec.groovy

@@ -1,4 +1,4 @@
-package io.micronaut.configuration.acme
+package io.micronaut.acme
 
 
 import io.micronaut.http.HttpRequest

acme/src/test/groovy/io/micronaut/configuration/acme/challenge/http/endpoint/WellKnownTokenControllerSpec.groovy → acme/src/test/groovy/io/micronaut/acme/challenge/http/endpoint/WellKnownTokenControllerSpec.groovy

@@ -1,7 +1,7 @@
-package io.micronaut.configuration.acme.challenge.http.endpoint
+package io.micronaut.acme.challenge.http.endpoint
 
 import groovy.json.JsonSlurper
-import io.micronaut.configuration.acme.AcmeBaseSpec
+import io.micronaut.acme.AcmeBaseSpec
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.HttpStatus

acme/src/test/groovy/io/micronaut/configuration/acme/challenges/AcmeCertRefresherTaskHttp01ChallengeSpec.groovy → acme/src/test/groovy/io/micronaut/acme/challenges/AcmeCertRefresherTaskHttp01ChallengeSpec.groovy

@@ -1,6 +1,6 @@
-package io.micronaut.configuration.acme.challenges
+package io.micronaut.acme.challenges
 
-import io.micronaut.configuration.acme.AcmeBaseSpec
+import io.micronaut.acme.AcmeBaseSpec
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller

acme/src/test/groovy/io/micronaut/configuration/acme/challenges/AcmeCertRefresherTaskTlsApln01ChallengeSpec.groovy → acme/src/test/groovy/io/micronaut/acme/challenges/AcmeCertRefresherTaskTlsApln01ChallengeSpec.groovy

@@ -1,6 +1,6 @@
-package io.micronaut.configuration.acme.challenges
+package io.micronaut.acme.challenges
 
-import io.micronaut.configuration.acme.AcmeBaseSpec
+import io.micronaut.acme.AcmeBaseSpec
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller

acme/src/test/resources/logback.xml

@@ -15,7 +15,7 @@
 
 
     <logger name="org.shredzone" level="DEBUG" />
-    <logger name="io.micronaut.configuration.acme" level="DEBUG" />
+    <logger name="io.micronaut.acme" level="DEBUG" />
     <logger name="org.testcontainers" level="INFO"/>
     <logger name="com.github.dockerjava" level="WARN"/>
 </configuration>

build.gradle

@@ -61,7 +61,7 @@ subprojects { Project subproject ->
     }
 
     version project.projectVersion
-    group "io.micronaut"
+    group "io.micronaut.acme"
 
     ext {
         isBuildSnapshot = version.toString().endsWith("-SNAPSHOT")

examples/hello-world-acme/README.md

@@ -7,8 +7,8 @@ It contains a single endpoint found at `/helloWorld` but the important bits can
 ### Pre-reqs
 1. You have created an account with Let's Encrypt
 1. You have generated a domain key
-   1. acme-utils project can help with steps 1 and 2
-   1. See [here](../acme-utils/README.md)
+   1. acme-cli project can help with steps 1 and 2
+   1. See [here](../acme-cli/README.md)
 1. You have purchased a domain name and have a way to configure DNS. In the AWS example below we will use Route53.
 
 ### Build and Deploy : 

examples/hello-world-acme/src/main/resources/logback.xml

@@ -15,5 +15,5 @@
 
 
     <logger name="org.shredzone" level="DEBUG" />
-    <logger name="io.micronaut.configuration.acme" level="DEBUG" />
+    <logger name="io.micronaut.acme" level="DEBUG" />
 </configuration>

gradle.properties

@@ -5,7 +5,7 @@ developers=Nathan Zender
 githubBranch=master
 githubSlug=micronaut-projects/micronaut-acme
 grailsVersion=3.2.9
-groovyVersion=2.5.3
+groovyVersion=2.5.11
 logbackClassicVersion=1.2.3
 micronautVersion=1.3.3
 micronautTestVersion=1.1.0
@@ -14,7 +14,7 @@ micronautBuildVersion=1.0.0
 objenesisVersion=1.4
 htmlSanityCheckVersion=0.9.7
 acmeVersion=2.6
-spockVersion=1.2-groovy-2.5
+spockVersion=1.3-groovy-2.5
 projectDesc=Extensions to integrate Micronaut and Acme
 projectUrl=http://micronaut.io
 title=Micronaut Acme

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"