Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Ivy APIs for embedded Maven during zpmw install #1334

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions manager/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
47 changes: 41 additions & 6 deletions manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -31,8 +30,7 @@
Help.class,
ZpmWrap.class,
ZpmInstall.class,
ZpmClean.class,
ZpmEncrypt.class
ZpmClean.class
})
public final class ZpmCli
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

This file was deleted.

Loading