Merge branch 'release/0.9.111'

aklivity · Dec 13, 2024 · b08d63a · b08d63a
2 parents 2916401 + 31e9ffb
commit b08d63a
Show file tree

Hide file tree

Showing 136 changed files with 664 additions and 1,367 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,19 @@
 
 ## [Unreleased](https://github.com/aklivity/zilla/tree/HEAD)
 
-[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.109...HEAD)
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.110...HEAD)
+
+**Implemented enhancements:**
+
+- Replace Ivy APIs for embedded Maven during `zpmw` install [\#1173](https://github.com/aklivity/zilla/issues/1173)
+
+**Merged pull requests:**
+
+- Replace Ivy APIs with embedded Maven during zpmw install [\#1334](https://github.com/aklivity/zilla/pull/1334) ([bmaidics](https://github.com/bmaidics))
+
+## [0.9.110](https://github.com/aklivity/zilla/tree/0.9.110) (2024-12-13)
+
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.109...0.9.110)
 
 **Merged pull requests:**
 

diff --git a/build/flyweight-maven-plugin/pom.xml b/build/flyweight-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>build</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/build/pom.xml b/build/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/docker-image/pom.xml b/cloud/docker-image/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/helm-chart/pom.xml b/cloud/helm-chart/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/pom.xml b/cloud/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/conf/pom.xml b/conf/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-amqp.spec/pom.xml b/incubator/binding-amqp.spec/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-amqp/pom.xml b/incubator/binding-amqp/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-pgsql-kafka.spec/pom.xml b/incubator/binding-pgsql-kafka.spec/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-pgsql-kafka/pom.xml b/incubator/binding-pgsql-kafka/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-pgsql.spec/pom.xml b/incubator/binding-pgsql.spec/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-pgsql/pom.xml b/incubator/binding-pgsql/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-risingwave.spec/pom.xml b/incubator/binding-risingwave.spec/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-risingwave/pom.xml b/incubator/binding-risingwave/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/command-dump/pom.xml b/incubator/command-dump/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/command-log/pom.xml b/incubator/command-log/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/command-tune/pom.xml b/incubator/command-tune/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/pom.xml b/incubator/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/manager/NOTICE b/manager/NOTICE
@@ -16,21 +16,45 @@ This project includes:
   Airline - Library under The Apache License, Version 2.0
   Apache Commons Collections under Apache License, Version 2.0
   Apache Commons Lang under Apache License, Version 2.0
-  Apache Ivy under The Apache Software License, Version 2.0
+  Apache HttpClient under Apache License, Version 2.0
+  Apache HttpCore under Apache License, Version 2.0
+  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
+  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 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 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 Security Dispatcher Component under Apache Public License 2.0
+  Plexus Interpolation API under Apache License, Version 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
 
 
 This project also includes code under copyright of the following entities:

diff --git a/manager/pom.xml b/manager/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.110</version>
+    <version>0.9.111</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -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,14 +33,44 @@
       <artifactId>yasson</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.ivy</groupId>
-      <artifactId>ivy</artifactId>
-      <version>2.5.2</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+      <version>${maven.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.plexus</groupId>
-      <artifactId>plexus-sec-dispatcher</artifactId>
-      <version>1.4</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-api</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <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>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-spi</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-supplier-mvn3</artifactId>
+      <version>${maven.resolver.version}</version>
     </dependency>
     <dependency>
       <groupId>org.sonatype.sisu</groupId>
@@ -160,6 +192,9 @@
                 <exclude>META-INF/NOTICE.md</exclude>
                 <exclude>META-INF/NOTICE.txt</exclude>
                 <exclude>META-INF/MANIFEST.MF</exclude>
+                <exclude>META-INF/*.SF</exclude>
+                <exclude>META-INF/*.DSA</exclude>
+                <exclude>META-INF/*.RSA</exclude>
               </excludes>
             </filter>
             <filter>

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,