Add newline at existing service

aklivity · Dec 9, 2024 · 80c30e2 · 80c30e2
1 parent eb15324
commit 80c30e2
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 947 deletions.
diff --git a/manager/NOTICE b/manager/NOTICE
@@ -18,53 +18,40 @@ This project includes:
   Apache Commons Lang under Apache License, Version 2.0
   Apache HttpClient under Apache License, Version 2.0
   Apache HttpCore under Apache License, Version 2.0
-  Bouncy Castle ASN.1 Extension and Utility APIs under Bouncy Castle Licence
-  Bouncy Castle OpenPGP API under Bouncy Castle Licence or Apache Software License, Version 2.0
-  Bouncy Castle Provider under Bouncy Castle Licence
   error-prone annotations under Apache 2.0
   Gson under Apache-2.0
   Jakarta Dependency Injection under The Apache Software License, Version 2.0
   Jakarta JSON Processing API under Eclipse Public License 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception
   javax.annotation API under CDDL + GPLv2 with classpath exception
-  Jetty :: ALPN :: Client under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
-  Jetty :: ALPN :: JDK9 Client Implementation under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
-  Jetty :: Asynchronous HTTP Client under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
-  Jetty :: Http Utility under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
-  Jetty :: HTTP2 :: Client under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
-  Jetty :: HTTP2 :: Common under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
-  Jetty :: HTTP2 :: HPACK under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
-  Jetty :: HTTP2 :: HTTP Client Transport under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
-  Jetty :: IO Utility under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
-  Jetty :: Utilities under Eclipse Public License - Version 2.0 or Apache Software License - Version 2.0
+  javax.inject under The Apache Software License, Version 2.0
   JSON-B API under Eclipse Public License 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception
   JSON-P Default Provider under Eclipse Public License 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception
   Maven Artifact under Apache-2.0
   Maven Artifact Resolver API under Apache-2.0
   Maven Artifact Resolver Connector Basic under Apache-2.0
-  Maven Artifact Resolver GnuPG Signer Generator under Apache-2.0
   Maven Artifact Resolver Implementation under Apache-2.0
   Maven Artifact Resolver Instance Supplier Maven3 under Apache-2.0
   Maven Artifact Resolver Named Locks under Apache-2.0
   Maven Artifact Resolver Provider under Apache-2.0
   Maven Artifact Resolver SPI under Apache-2.0
   Maven Artifact Resolver Transport Apache under Apache-2.0
   Maven Artifact Resolver Transport File under Apache-2.0
-  Maven Artifact Resolver Transport JDK (mr) under Apache-2.0
-  Maven Artifact Resolver Transport Jetty under Apache-2.0
   Maven Artifact Resolver Utilities under Apache-2.0
   Maven Builder Support under Apache-2.0
   Maven Model under Apache-2.0
   Maven Model Builder under Apache-2.0
   Maven Repository Metadata Model under Apache-2.0
+  Maven Settings under Apache-2.0
+  Maven Settings Builder under Apache-2.0
   org.eclipse.sisu.inject under Eclipse Public License, Version 1.0
   org.eclipse.sisu.plexus under Eclipse Public License, Version 1.0
   org.eclipse.yasson under Eclipse Public License v. 2.0 or Eclipse Distribution License v. 1.0
   Plexus :: Component Annotations under Apache License, Version 2.0
-  Plexus Cipher: encryption/decryption Component under Apache Public License 2.0
+  Plexus Cipher: encryption/decryption Component under Apache License, Version 2.0
   Plexus Classworlds under Apache License, Version 2.0
   Plexus Common Utilities under Apache License, Version 2.0
   Plexus Interpolation API under Apache License, Version 2.0
-  Plexus Security Dispatcher Component under Apache Public License 2.0
+  Plexus Security Dispatcher Component under Apache License, Version 2.0
   Plexus XML Utilities under Apache License, Version 2.0
   Sisu-Inject-Plexus : legacy wrapper under Eclipse Public License, Version 1.0
   SLF4J API Module under MIT License

diff --git a/manager/pom.xml b/manager/pom.xml
@@ -18,6 +18,8 @@
   <properties>
     <jacoco.coverage.ratio>0.61</jacoco.coverage.ratio>
     <jacoco.missed.count>0</jacoco.missed.count>
+    <maven.version>3.9.6</maven.version>
+    <maven.resolver.version>2.0.3</maven.resolver.version>
   </properties>
 
   <dependencies>
@@ -31,65 +33,44 @@
       <artifactId>yasson</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <scope>provided</scope>
-      <optional>true</optional>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+      <version>${maven.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-api</artifactId>
-      <version>2.0.3</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings-builder</artifactId>
+      <version>${maven.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-connector-basic</artifactId>
-      <version>2.0.3</version>
+      <artifactId>maven-resolver-api</artifactId>
+      <version>${maven.resolver.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-transport-file</artifactId>
-      <version>2.0.3</version>
+      <artifactId>maven-resolver-connector-basic</artifactId>
+      <version>${maven.resolver.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-impl</artifactId>
-      <version>2.0.3</version>
+      <version>${maven.resolver.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-util</artifactId>
-      <version>2.0.3</version>
+      <version>${maven.resolver.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-spi</artifactId>
-      <version>2.0.3</version>
+      <version>${maven.resolver.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-supplier-mvn3</artifactId>
-      <version>2.0.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-generator-gnupg</artifactId>
-      <version>2.0.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-transport-jdk</artifactId>
-      <version>2.0.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-transport-jetty</artifactId>
-      <version>2.0.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sonatype.plexus</groupId>
-      <artifactId>plexus-sec-dispatcher</artifactId>
-      <version>1.4</version>
+      <version>${maven.resolver.version}</version>
     </dependency>
     <dependency>
       <groupId>org.sonatype.sisu</groupId>

diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/ZpmCli.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/ZpmCli.java
@@ -19,7 +19,6 @@
 import com.github.rvesse.airline.help.Help;
 
 import io.aklivity.zilla.manager.internal.commands.clean.ZpmClean;
-import io.aklivity.zilla.manager.internal.commands.encrypt.ZpmEncrypt;
 import io.aklivity.zilla.manager.internal.commands.install.ZpmInstall;
 import io.aklivity.zilla.manager.internal.commands.wrap.ZpmWrap;
 
@@ -31,8 +30,7 @@
         Help.class,
         ZpmWrap.class,
         ZpmInstall.class,
-        ZpmClean.class,
-        ZpmEncrypt.class
+        ZpmClean.class
     })
 public final class ZpmCli
 {

diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/ZpmCommand.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/ZpmCommand.java
@@ -36,12 +36,6 @@ public abstract class ZpmCommand implements Runnable
             hidden = true)
     public Boolean silent = false;
 
-    @Option(name = { "--settings-directory" },
-            description = "settings directory",
-            typeConverterProvider = ZpmPathConverterProvider.class,
-            hidden = true)
-    public Path settingsDir = Paths.get(System.getProperty("user.home"), ".zpm");
-
     @Option(name = { "--config-directory" },
             description = "config directory",
             typeConverterProvider = ZpmPathConverterProvider.class,

diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/encrypt/ZpmEncrypt.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/encrypt/ZpmEncrypt.java