From 489e841db8245199d5386e705c4cc110c2ff3705 Mon Sep 17 00:00:00 2001 From: bmaidics Date: Fri, 13 Dec 2024 04:19:52 +0100 Subject: [PATCH 1/3] Replace Ivy APIs with embedded Maven during zpmw install (#1334) --- manager/NOTICE | 30 +- manager/pom.xml | 47 +- .../zilla/manager/internal/ZpmCli.java | 4 +- .../zilla/manager/internal/ZpmCommand.java | 6 - .../internal/commands/encrypt/ZpmEncrypt.java | 136 ----- .../internal/commands/install/ZpmInstall.java | 280 +++++----- .../commands/install/cache/ZpmArtifactId.java | 7 + .../commands/install/cache/ZpmCache.java | 478 ++++++++++++------ .../internal/settings/ZpmCredentials.java | 84 --- .../manager/internal/settings/ZpmSecrets.java | 42 -- .../internal/settings/ZpmSecurity.java | 46 -- .../internal/settings/ZpmSettings.java | 47 -- .../apache/ivy/util/url/IvyAuthenticator.java | 180 ------- .../commands/encrypt/ZpmEncryptTest.java | 72 --- .../commands/install/ZpmInstallTest.java | 11 +- .../internal/settings/ZpmSecurityTest.java | 91 ---- .../internal/settings/ZpmSettingsTest.java | 218 -------- ...time.engine.event.EventFormatterFactorySpi | 2 +- ...time.engine.event.EventFormatterFactorySpi | 2 +- ...time.engine.event.EventFormatterFactorySpi | 2 +- ...time.engine.event.EventFormatterFactorySpi | 2 +- ...time.engine.config.OptionsConfigAdapterSpi | 2 +- ...runtime.engine.exporter.ExporterFactorySpi | 2 +- ...time.engine.config.OptionsConfigAdapterSpi | 2 +- ...runtime.engine.exporter.ExporterFactorySpi | 2 +- ...ntime.engine.metrics.MetricGroupFactorySpi | 2 +- ...ntime.engine.metrics.MetricGroupFactorySpi | 2 +- 27 files changed, 542 insertions(+), 1257 deletions(-) delete mode 100644 manager/src/main/java/io/aklivity/zilla/manager/internal/commands/encrypt/ZpmEncrypt.java delete mode 100644 manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmCredentials.java delete mode 100644 manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSecrets.java delete mode 100644 manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSecurity.java delete mode 100644 manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSettings.java delete mode 100644 manager/src/main/java/org/apache/ivy/util/url/IvyAuthenticator.java delete mode 100644 manager/src/test/java/io/aklivity/zilla/manager/internal/commands/encrypt/ZpmEncryptTest.java delete mode 100644 manager/src/test/java/io/aklivity/zilla/manager/internal/settings/ZpmSecurityTest.java delete mode 100644 manager/src/test/java/io/aklivity/zilla/manager/internal/settings/ZpmSettingsTest.java diff --git a/manager/NOTICE b/manager/NOTICE index 55298baee0..e3d374bd2c 100644 --- 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 index 7a93f6136b..9ef7b43299 100644 --- a/manager/pom.xml +++ b/manager/pom.xml @@ -18,6 +18,8 @@ 0.61 0 + 3.9.6 + 2.0.3 @@ -31,14 +33,44 @@ yasson - org.apache.ivy - ivy - 2.5.2 + org.apache.maven + maven-settings + ${maven.version} - org.sonatype.plexus - plexus-sec-dispatcher - 1.4 + org.apache.maven + maven-settings-builder + ${maven.version} + + + org.apache.maven.resolver + maven-resolver-api + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-connector-basic + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-impl + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-util + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-spi + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-supplier-mvn3 + ${maven.resolver.version} org.sonatype.sisu @@ -160,6 +192,9 @@ META-INF/NOTICE.md META-INF/NOTICE.txt META-INF/MANIFEST.MF + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA 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 index 053d2f48a6..0f88f43e92 100644 --- 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 index 65fbd20496..5860336923 100644 --- 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 deleted file mode 100644 index 7cd10f8b81..0000000000 --- a/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/encrypt/ZpmEncrypt.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright 2021-2024 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.aklivity.zilla.manager.internal.commands.encrypt; - -import static io.aklivity.zilla.manager.internal.settings.ZpmSecrets.decryptSecret; -import static io.aklivity.zilla.manager.internal.settings.ZpmSecrets.encryptSecret; -import static java.nio.file.Files.createDirectories; -import static java.nio.file.Files.newInputStream; -import static java.nio.file.Files.newOutputStream; -import static org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.security.SecureRandom; -import java.util.Random; -import java.util.Scanner; - -import jakarta.json.bind.Jsonb; -import jakarta.json.bind.JsonbBuilder; -import jakarta.json.bind.JsonbConfig; - -import org.sonatype.plexus.components.cipher.PlexusCipherException; - -import com.github.rvesse.airline.annotations.Command; - -import io.aklivity.zilla.manager.internal.ZpmCommand; -import io.aklivity.zilla.manager.internal.settings.ZpmSecurity; - -@Command( - name = "encrypt", - description = "Encrypt passwords") -public class ZpmEncrypt extends ZpmCommand -{ - private static final String SECRET_CHARS = - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/"; - - @Override - public void invoke() - { - try - { - ZpmSecurity security = readSecurity(settingsDir); - - if (security.secret == null) - { - final String secret = generateSecret(32); - security.secret = encryptSecret(secret, SYSTEM_PROPERTY_SEC_LOCATION); - writeSecurity(security); - } - - assert security.secret != null; - - final String secret = decryptSecret(security.secret, SYSTEM_PROPERTY_SEC_LOCATION); - try (Scanner scanner = new Scanner(System.in)) - { - String password = scanner.nextLine().trim(); - String encrypted = encryptSecret(password, secret); - - System.out.println(encrypted); - } - } - catch (Exception ex) - { - throw new RuntimeException(ex); - } - } - - private ZpmSecurity readSecurity( - Path settingsDir) throws IOException, PlexusCipherException - { - Path securityFile = settingsDir.resolve("security.json"); - - ZpmSecurity security = new ZpmSecurity(); - - Jsonb builder = JsonbBuilder.newBuilder() - .withConfig(new JsonbConfig().withFormatting(true)) - .build(); - - if (Files.exists(securityFile)) - { - try (InputStream in = newInputStream(securityFile)) - { - security = builder.fromJson(in, ZpmSecurity.class); - } - } - - return security; - } - - private void writeSecurity( - ZpmSecurity security) throws IOException - { - Path securityFile = settingsDir.resolve("security.json"); - - Jsonb builder = JsonbBuilder.newBuilder() - .withConfig(new JsonbConfig().withFormatting(true)) - .build(); - - createDirectories(settingsDir); - try (OutputStream out = newOutputStream(securityFile)) - { - builder.toJson(security, out); - } - } - - private String generateSecret( - int length) throws PlexusCipherException - { - Random random = new SecureRandom(); - char[] secret = new char[length]; - - for (int i = 0; i < secret.length; i++) - { - int charIndex = random.nextInt(SECRET_CHARS.length()); - secret[i] = SECRET_CHARS.charAt(charIndex); - } - - return new String(secret); - } -} diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/ZpmInstall.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/ZpmInstall.java index 8967e0ca8c..84379d1c2a 100644 --- a/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/ZpmInstall.java +++ b/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/ZpmInstall.java @@ -15,7 +15,6 @@ */ package io.aklivity.zilla.manager.internal.commands.install; -import static io.aklivity.zilla.manager.internal.settings.ZpmSecrets.decryptSecret; import static java.io.OutputStream.nullOutputStream; import static java.lang.Integer.parseInt; import static java.nio.charset.StandardCharsets.UTF_8; @@ -30,7 +29,6 @@ import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; -import static org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION; import java.io.File; import java.io.IOException; @@ -43,6 +41,7 @@ import java.lang.module.ModuleFinder; import java.lang.module.ModuleReference; import java.net.URI; +import java.net.URISyntaxException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -75,11 +74,20 @@ import jakarta.json.bind.JsonbBuilder; import jakarta.json.bind.JsonbConfig; -import org.apache.ivy.util.DefaultMessageLogger; -import org.apache.ivy.util.Message; -import org.apache.ivy.util.MessageLogger; -import org.apache.ivy.util.url.CredentialsStore; -import org.sonatype.plexus.components.cipher.PlexusCipherException; +import org.apache.maven.settings.Server; +import org.apache.maven.settings.Settings; +import org.apache.maven.settings.building.DefaultSettingsBuilder; +import org.apache.maven.settings.building.DefaultSettingsBuildingRequest; +import org.apache.maven.settings.building.SettingsBuildingResult; +import org.apache.maven.settings.io.DefaultSettingsReader; +import org.apache.maven.settings.io.DefaultSettingsWriter; +import org.apache.maven.settings.io.SettingsReader; +import org.apache.maven.settings.io.SettingsWriter; +import org.apache.maven.settings.validation.DefaultSettingsValidator; +import org.apache.maven.settings.validation.SettingsValidator; +import org.codehaus.plexus.logging.console.ConsoleLogger; +import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.util.repository.AuthenticationBuilder; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; @@ -89,10 +97,6 @@ import io.aklivity.zilla.manager.internal.commands.install.cache.ZpmArtifactId; import io.aklivity.zilla.manager.internal.commands.install.cache.ZpmCache; import io.aklivity.zilla.manager.internal.commands.install.cache.ZpmModule; -import io.aklivity.zilla.manager.internal.settings.ZpmCredentials; -import io.aklivity.zilla.manager.internal.settings.ZpmSecrets; -import io.aklivity.zilla.manager.internal.settings.ZpmSecurity; -import io.aklivity.zilla.manager.internal.settings.ZpmSettings; @Command( name = "install", @@ -106,33 +110,36 @@ public final class ZpmInstall extends ZpmCommand private static final Map DEFAULT_REALMS = initDefaultRealms(); - @Option(name = { "--debug" }, - description = "Link jdk.jdwp.agent module") + @Option(name = { "--verbose" }, + description = "Enable verbose logging") + public Boolean verbose = false; + + @Option(name = {"--debug"}, + description = "Link jdk.jdwp.agent module") public Boolean debug = false; - @Option(name = { "--instrument" }, - description = "Link java.instrument module", - hidden = true) + @Option(name = {"--instrument"}, + description = "Link java.instrument module", + hidden = true) public Boolean instrument = false; - @Option(name = { "--exclude-local-repository" }, - description = "Exclude the local Maven repository") + @Option(name = {"--exclude-local-repository"}, + description = "Exclude the local Maven repository") public boolean excludeLocalRepo; - @Option(name = { "--exclude-remote-repositories" }, - description = "Exclude remote Maven repositories") + @Option(name = {"--exclude-remote-repositories"}, + description = "Exclude remote Maven repositories") public boolean excludeRemoteRepos; - @Option(name = { "--ignore-missing-dependencies" }, - hidden = true) + @Option(name = {"--ignore-missing-dependencies"}, + hidden = true) public boolean ignoreMissingDependencies; @Override public void invoke() { - int level = silent ? Message.MSG_WARN : Message.MSG_INFO; - MessageLogger logger = new DefaultMessageLogger(level); - Message.setDefaultLogger(logger); + int level = silent ? ConsoleLogger.LEVEL_WARN : verbose ? ConsoleLogger.LEVEL_DEBUG : ConsoleLogger.LEVEL_INFO; + ConsoleLogger logger = new ConsoleLogger(level, "ZpmInstall"); try { @@ -148,12 +155,13 @@ public void invoke() config = overrideConfigIfLocked(config, zpmFile, lockFile); logger.info("resolving dependencies"); - readSettings(settingsDir); createDirectories(cacheDir); List repositories = new ArrayList<>(config.repositories); + + final String home = System.getProperty("user.home"); if (!excludeLocalRepo) { - String localRepo = String.format("file://%s/.m2/repository", System.getProperty("user.home")); + String localRepo = String.format("file://%s/.m2/repository", home); repositories.add(0, new ZpmRepository(localRepo)); } @@ -162,21 +170,39 @@ public void invoke() repositories.removeIf(r -> !r.location.startsWith("file:")); } - ZpmCache cache = new ZpmCache(repositories, cacheDir); + File settingsFile = new File(String.format("/%s/.m2/settings.xml", home)); + + SettingsReader settingsReader = new DefaultSettingsReader(); + SettingsWriter settingsWriter = new DefaultSettingsWriter(); + SettingsValidator settingsValidator = new DefaultSettingsValidator(); + + DefaultSettingsBuilder settingsBuilder = new DefaultSettingsBuilder( + settingsReader, settingsWriter, settingsValidator); + DefaultSettingsBuildingRequest request = new DefaultSettingsBuildingRequest(); + request.setGlobalSettingsFile(settingsFile); + request.setUserSettingsFile(settingsFile); + + SettingsBuildingResult result = settingsBuilder.build(request); + Settings settings = result.getEffectiveSettings(); + + List remoteRepositories = asRemoteRepositories(settings, repositories); + + ZpmCache cache = new ZpmCache(remoteRepositories, cacheDir, logger); Collection artifacts = cache.resolve(config.imports, config.dependencies); + Map resolvables = artifacts.stream() - .map(a -> a.id) - .collect( - toMap( - id -> ZpmDependency.of(id.group, id.artifact, null), - id -> ZpmDependency.of(id.group, id.artifact, id.version))); + .map(a -> a.id) + .collect(toMap( + id -> ZpmDependency.of(id.group, id.artifact, null), + id -> ZpmDependency.of(id.group, id.artifact, id.version), + (first, second) -> second)); ZpmConfiguration resolved = new ZpmConfiguration(); resolved.repositories = config.repositories; resolved.imports = null; resolved.dependencies = config.dependencies.stream() - .map(d -> ofNullable(resolvables.get(d)).orElse(d)) - .collect(toList()); + .map(d -> ofNullable(resolvables.get(d)).orElse(d)) + .collect(toList()); if (!resolved.equals(config)) { @@ -212,65 +238,33 @@ public void invoke() logger.error(String.format("Error: %s", ex.getMessage())); throw new RuntimeException(ex); } - finally - { - if (!silent) - { - logger.sumupProblems(); - } - } } - private void readSettings( - Path settingsDir) throws IOException, PlexusCipherException + private List asRemoteRepositories( + Settings settings, + List repositories) throws URISyntaxException { - Path settingsFile = settingsDir.resolve("settings.json"); + final List remoteRepositories = new ArrayList<>(); - ZpmSettings settings = new ZpmSettings(); - settings.credentials = emptyList(); - - Jsonb builder = JsonbBuilder.newBuilder() - .withConfig(new JsonbConfig().withFormatting(true)) - .build(); - - if (Files.exists(settingsFile)) - { - try (InputStream in = newInputStream(settingsFile)) - { - settings = builder.fromJson(in, ZpmSettings.class); - } - } - - if (settings.credentials.size() > 0) + for (ZpmRepository repository : repositories) { - Path securityFile = settingsDir.resolve("security.json"); - - ZpmSecurity security = new ZpmSecurity(); - - if (Files.exists(securityFile)) + final String host = new URI(repository.location).getHost(); + final RemoteRepository.Builder repoBuilder = + new RemoteRepository.Builder(host, "default", repository.location) + .setRepositoryManager(true) + .setId(host); + + final Server server = settings.getServer(host); + if (server != null) { - try (InputStream in = newInputStream(securityFile)) - { - security = builder.fromJson(in, ZpmSecurity.class); - } - } - - security.secret = decryptSecret(security.secret, SYSTEM_PROPERTY_SEC_LOCATION); - - for (ZpmCredentials credentials : settings.credentials) - { - String realm = defaultRealmIfNecessary(credentials); - String host = credentials.host; - String username = credentials.username; - String password = ZpmSecrets.decryptSecret(credentials.password, security.secret); - - CredentialsStore.INSTANCE.addCredentials( - realm, - host, - username, - password); + AuthenticationBuilder authenticationBuilder = new AuthenticationBuilder() + .addUsername(server.getUsername()) + .addPassword(server.getPassword()); + repoBuilder.setAuthentication(authenticationBuilder.build()); } + remoteRepositories.add(repoBuilder.build()); } + return remoteRepositories; } private ZpmConfiguration readOrDefaultConfig( @@ -282,8 +276,8 @@ private ZpmConfiguration readOrDefaultConfig( config.dependencies = emptyList(); Jsonb builder = JsonbBuilder.newBuilder() - .withConfig(new JsonbConfig().withFormatting(true)) - .build(); + .withConfig(new JsonbConfig().withFormatting(true)) + .build(); if (Files.exists(zpmFile)) { @@ -305,8 +299,8 @@ private ZpmConfiguration overrideConfigIfLocked( getLastModifiedTime(lockFile).compareTo(getLastModifiedTime(zpmFile)) >= 0) { Jsonb builder = JsonbBuilder.newBuilder() - .withConfig(new JsonbConfig().withFormatting(true)) - .build(); + .withConfig(new JsonbConfig().withFormatting(true)) + .build(); try (InputStream in = newInputStream(lockFile)) { @@ -321,8 +315,8 @@ private void writeLockFile( Path lockFile) throws IOException { Jsonb builder = JsonbBuilder.newBuilder() - .withConfig(new JsonbConfig().withFormatting(true)) - .build(); + .withConfig(new JsonbConfig().withFormatting(true)) + .build(); createDirectories(lockDir); try (OutputStream out = newOutputStream(lockFile)) @@ -335,11 +329,18 @@ private Collection discoverModules( Collection artifacts) { Path[] artifactPaths = artifacts.stream().map(a -> a.path).toArray(Path[]::new); - Set references = ModuleFinder.of(artifactPaths).findAll(); + Set references = new HashSet<>(); + + for (Path path : artifactPaths) + { + ModuleFinder finder = ModuleFinder.of(path); + references.addAll(finder.findAll()); + } + Map descriptors = references - .stream() - .filter(r -> r.location().isPresent()) - .collect(Collectors.toMap(r -> r.location().get(), r -> r.descriptor())); + .stream() + .filter(r -> r.location().isPresent()) + .collect(Collectors.toMap(r -> r.location().get(), r -> r.descriptor())); Collection modules = new LinkedHashSet<>(); for (ZpmArtifact artifact : artifacts) @@ -354,10 +355,10 @@ private Collection discoverModules( } private void migrateUnnamed( - Collection modules, + Collection modules, ZpmModule delegate) { - for (Iterator iterator = modules.iterator(); iterator.hasNext();) + for (Iterator iterator = modules.iterator(); iterator.hasNext(); ) { ZpmModule module = iterator.next(); if (module.name == null) @@ -371,7 +372,7 @@ private void migrateUnnamed( } private void delegateAutomatic( - Collection modules, + Collection modules, ZpmModule delegate) { Map modulesMap = new LinkedHashMap<>(); @@ -408,7 +409,7 @@ private void delegateModule( } private void generateSystemOnlyAutomatic( - MessageLogger logger, + ConsoleLogger logger, Collection modules) throws IOException { Map promotions = new IdentityHashMap<>(); @@ -456,9 +457,9 @@ private void generateSystemOnlyAutomatic( args.add(generatedModuleInfo.toString()); javac.run( - nullOutput, - nullOutput, - args.toArray(String[]::new)); + nullOutput, + nullOutput, + args.toArray(String[]::new)); Path compiledModuleInfo = generatedModuleDir.resolve(MODULE_INFO_CLASS_FILENAME); assert Files.exists(compiledModuleInfo); @@ -505,7 +506,7 @@ private void copyNonDelegating( } private void generateDelegate( - MessageLogger logger, + ConsoleLogger logger, ZpmModule delegate) throws IOException { Path generatedModulesDir = generatedDir.resolve("modules"); @@ -522,7 +523,7 @@ private void generateDelegate( Path excludedPackage = Paths.get("org", "eclipse", "yasson", "internal", "components"); String excludedClass = "BeanManagerInstanceCreator"; Set entryNames = new HashSet<>(); - Map services = new HashMap<>(); + Map> services = new HashMap<>(); for (Path path : delegate.paths) { try (JarFile artifactJar = new JarFile(path.toFile())) @@ -535,7 +536,7 @@ private void generateDelegate( entryPath.equals(manifestPath) || entryPath.endsWith(packageInfoName) || (entryPath.startsWith(excludedPackage)) && - entryPath.getFileName().toString().startsWith(excludedClass)) + entryPath.getFileName().toString().startsWith(excludedClass)) { continue; } @@ -549,8 +550,8 @@ private void generateDelegate( assert servicePath.getNameCount() == 1; String serviceName = servicePath.toString(); String serviceImpl = new String(input.readAllBytes(), UTF_8); - String existing = services.getOrDefault(serviceName, ""); - services.put(serviceName, existing.concat(serviceImpl)); + services.computeIfAbsent(serviceName, s -> new ArrayList<>()) + .addAll(Arrays.asList(serviceImpl.split("\\R"))); } else if (entryNames.add(entryName)) { @@ -563,11 +564,11 @@ else if (entryNames.add(entryName)) } } - for (Map.Entry service : services.entrySet()) + for (Map.Entry> service : services.entrySet()) { String serviceName = service.getKey(); Path servicePath = servicesPath.resolve(serviceName); - String serviceImpl = service.getValue(); + String serviceImpl = String.join("\n", service.getValue()); JarEntry newEntry = new JarEntry(servicePath.toString()); newEntry.setTime(318240000000L); @@ -613,9 +614,9 @@ else if (entryNames.add(entryName)) if (!uses.isEmpty()) { Files.writeString(generatedModuleInfo, - moduleInfoContents.replace( - "}", - String.join("\n", uses) + "\n}")); + moduleInfoContents.replace( + "}", + String.join("\n", uses) + "\n}")); } expandJar(generatedDelegateDir, generatedDelegatePath); @@ -634,9 +635,9 @@ else if (entryNames.add(entryName)) args.add(generatedModuleInfo.toString()); javac.run( - System.out, - System.err, - args.toArray(String[]::new)); + System.out, + System.err, + args.toArray(String[]::new)); Path compiledModuleInfo = generatedDelegateDir.resolve(MODULE_INFO_CLASS_FILENAME); assert Files.exists(compiledModuleInfo); @@ -660,9 +661,9 @@ private void generateDelegating( Path generatedModuleInfo = generatedModuleDir.resolve(MODULE_INFO_JAVA_FILENAME); Files.write(generatedModuleInfo, Arrays.asList( - String.format("open module %s {", module.name), - String.format(" requires transitive %s;", ZpmModule.DELEGATE_NAME), - "}")); + String.format("open module %s {", module.name), + String.format(" requires transitive %s;", ZpmModule.DELEGATE_NAME), + "}")); ToolProvider javac = ToolProvider.findFirst("javac").get(); @@ -681,9 +682,9 @@ private void generateDelegating( args.add(generatedModuleInfo.toString()); javac.run( - System.out, - System.err, - args.toArray(String[]::new)); + System.out, + System.err, + args.toArray(String[]::new)); Path modulePath = modulePath(module); try (JarOutputStream jar = new JarOutputStream(Files.newOutputStream(modulePath))) @@ -747,17 +748,17 @@ private void generateLauncher() throws IOException { Path zillaPath = launcherDir.resolve("zilla"); Files.write(zillaPath, Arrays.asList( - "#!/bin/sh", - "if [ -n \"$ZILLA_INCUBATOR_ENABLED\" ]; then", - "JAVA_OPTIONS=\"$JAVA_OPTIONS -Dzilla.incubator.enabled=$ZILLA_INCUBATOR_ENABLED\"", - "fi", - "ZILLA_DIRECTORY=\"${0%/*}\"", - "JAVA_OPTIONS=\"$JAVA_OPTIONS -Dzilla.directory=$ZILLA_DIRECTORY\"", - String.format(String.join(" ", Arrays.asList( + "#!/bin/sh", + "if [ -n \"$ZILLA_INCUBATOR_ENABLED\" ]; then", + "JAVA_OPTIONS=\"$JAVA_OPTIONS -Dzilla.incubator.enabled=$ZILLA_INCUBATOR_ENABLED\"", + "fi", + "ZILLA_DIRECTORY=\"${0%/*}\"", + "JAVA_OPTIONS=\"$JAVA_OPTIONS -Dzilla.directory=$ZILLA_DIRECTORY\"", + String.format(String.join(" ", Arrays.asList( "exec $ZILLA_DIRECTORY/%s/bin/java", "$JAVA_OPTIONS", "-m io.aklivity.zilla.runtime.command/io.aklivity.zilla.runtime.command.internal.ZillaMain \"$@\"")), - imageDir))); + imageDir))); zillaPath.toFile().setExecutable(true); } @@ -847,19 +848,12 @@ private void deleteDirectories( if (Files.exists(dir)) { Files.walk(dir) - .sorted(reverseOrder()) - .map(Path::toFile) - .forEach(File::delete); + .sorted(reverseOrder()) + .map(Path::toFile) + .forEach(File::delete); } } - private String defaultRealmIfNecessary( - ZpmCredentials credentials) - { - return ofNullable(credentials.realm) - .orElse(DEFAULT_REALMS.get(credentials.host)); - } - private static boolean atLeastVersion( ToolProvider tool, int major) @@ -867,9 +861,9 @@ private static boolean atLeastVersion( StringWriter out = new StringWriter(); StringWriter err = new StringWriter(); tool.run( - new PrintWriter(out), - new PrintWriter(err), - "--version"); + new PrintWriter(out), + new PrintWriter(err), + "--version"); Matcher matcher = PATTERN_MAJOR_VERSION.matcher(out.toString()); return matcher.find() && parseInt(matcher.group("major")) >= major; diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/cache/ZpmArtifactId.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/cache/ZpmArtifactId.java index c2cd4ba176..b580957daa 100644 --- a/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/cache/ZpmArtifactId.java +++ b/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/cache/ZpmArtifactId.java @@ -39,6 +39,13 @@ public int hashCode() return Objects.hash(group, artifact, version); } + public boolean equalsGroupAndArtifact( + ZpmArtifactId that) + { + return Objects.equals(this.group, that.group) && + Objects.equals(this.artifact, that.artifact); + } + @Override public boolean equals( Object obj) diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/cache/ZpmCache.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/cache/ZpmCache.java index c84b8f3eca..f9ededc5a2 100644 --- a/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/cache/ZpmCache.java +++ b/manager/src/main/java/io/aklivity/zilla/manager/internal/commands/install/cache/ZpmCache.java @@ -15,238 +15,388 @@ */ package io.aklivity.zilla.manager.internal.commands.install.cache; -import static java.util.Collections.emptyMap; +import static java.util.Objects.requireNonNull; import static java.util.Optional.ofNullable; -import static org.apache.ivy.util.filter.FilterHelper.getArtifactTypeFilter; +import static org.eclipse.aether.util.graph.transformer.ConflictResolver.CONFIG_PROP_VERBOSE; import java.nio.file.Path; -import java.util.LinkedHashMap; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.ArrayList; +import java.util.HashMap; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; - -import org.apache.ivy.Ivy; -import org.apache.ivy.core.module.descriptor.Configuration; -import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; -import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; -import org.apache.ivy.core.module.descriptor.DependencyDescriptor; -import org.apache.ivy.core.module.descriptor.ModuleDescriptor; -import org.apache.ivy.core.module.id.ModuleId; -import org.apache.ivy.core.module.id.ModuleRevisionId; -import org.apache.ivy.core.report.ArtifactDownloadReport; -import org.apache.ivy.core.report.ResolveReport; -import org.apache.ivy.core.resolve.IvyNode; -import org.apache.ivy.core.resolve.ResolveOptions; -import org.apache.ivy.core.settings.IvySettings; -import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorBuilder; -import org.apache.ivy.plugins.resolver.ChainResolver; -import org.apache.ivy.plugins.resolver.IBiblioResolver; -import org.apache.ivy.plugins.resolver.RepositoryResolver; +import java.util.concurrent.ConcurrentHashMap; + +import org.codehaus.plexus.logging.console.ConsoleLogger; +import org.eclipse.aether.AbstractRepositoryListener; +import org.eclipse.aether.RepositoryEvent; +import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.collection.CollectRequest; +import org.eclipse.aether.graph.Dependency; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.ArtifactDescriptorException; +import org.eclipse.aether.resolution.ArtifactDescriptorRequest; +import org.eclipse.aether.resolution.ArtifactDescriptorResult; +import org.eclipse.aether.resolution.DependencyRequest; +import org.eclipse.aether.resolution.DependencyResult; +import org.eclipse.aether.spi.connector.transport.TransporterFactory; +import org.eclipse.aether.supplier.RepositorySystemSupplier; +import org.eclipse.aether.supplier.SessionBuilderSupplier; +import org.eclipse.aether.transfer.AbstractTransferListener; +import org.eclipse.aether.transfer.TransferEvent; +import org.eclipse.aether.transfer.TransferResource; +import org.eclipse.aether.transport.apache.ApacheTransporterFactory; +import org.eclipse.aether.util.graph.visitor.NodeListGenerator; +import org.eclipse.aether.util.graph.visitor.PreorderDependencyNodeConsumerVisitor; import io.aklivity.zilla.manager.internal.commands.install.ZpmDependency; -import io.aklivity.zilla.manager.internal.commands.install.ZpmRepository; public final class ZpmCache { - private final Ivy ivy; - private final ResolveOptions options; + private final RepositorySystem repositorySystem; + + private final RepositorySystemSession session; + + private final List repositories; + private final ConsoleLogger logger; public ZpmCache( - List repositories, - Path directory) + List repositories, + Path directory, + ConsoleLogger logger) { - ResolveOptions options = new ResolveOptions(); - options.setLog(ResolveOptions.LOG_DOWNLOAD_ONLY); - options.setArtifactFilter(getArtifactTypeFilter(new String[]{"jar", "bundle"})); - options.setConfs("master,runtime".split(",")); - options.setRefresh(true); - options.setOutputReport(false); - this.options = options; - - ChainResolver chain = new ChainResolver(); - chain.setName("default"); - repositories.stream().map(this::newResolver).forEach(chain::add); - - IvySettings ivySettings = new IvySettings(); - ivySettings.setDefaultCache(directory.toFile()); - ivySettings.addConfigured(chain); - ivySettings.setDefaultResolver(chain.getName()); - - this.ivy = Ivy.newInstance(ivySettings); + this.logger = logger; + this.repositorySystem = ZpmSupplierRepositorySystemFactory.newRepositorySystem(); + this.session = newRepositorySystemSession(repositorySystem, directory); + + this.repositories = repositories; } public List resolve( List imports, List dependencies) { - Map imported = resolveImports(imports); - ModuleDescriptor resolvable = createResolvableDescriptor(imported, dependencies); + final List artifacts = new ArrayList<>(); + Map imported = new HashMap<>(); + if (imports != null) + { + for (ZpmDependency imp : imports) + { + Artifact artifact = new DefaultArtifact(imp.groupId, imp.artifactId, "pom", imp.version); + ArtifactDescriptorRequest descriptorRequest = new ArtifactDescriptorRequest(); + repositories.forEach(descriptorRequest::addRepository); + descriptorRequest.setArtifact(artifact); + try + { + ArtifactDescriptorResult descriptorResult = + repositorySystem.readArtifactDescriptor(session, descriptorRequest); + final List managedDependencies = descriptorResult.getManagedDependencies(); + managedDependencies.forEach(dep -> + { + final Artifact managedArtifact = dep.getArtifact(); + imported.put(ZpmDependency.of(managedArtifact.getGroupId(), managedArtifact.getArtifactId(), null), + managedArtifact.getVersion()); + + }); + } + catch (ArtifactDescriptorException e) + { + throw new RuntimeException(e); + } + } + } + CollectRequest collectRequest = new CollectRequest(); + for (ZpmDependency dep : dependencies) + { + String version = ofNullable(dep.version).orElse(imported.get(dep)); + Artifact artifact = new DefaultArtifact(dep.groupId, dep.artifactId, "jar", version); + collectRequest.addDependency(new Dependency(artifact, null)); + } + repositories.forEach(collectRequest::addRepository); + + DependencyResult result; + try + { + DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, null); + result = repositorySystem.resolveDependencies(session, dependencyRequest); + } + catch (Exception e) + { + throw new RuntimeException("Failed to resolve dependencies", e); + } + DependencyNode root = result.getRoot(); + + NodeListGenerator nlg = new NodeListGenerator(); + + root.accept(new PreorderDependencyNodeConsumerVisitor(nlg)); + List nodesWithDependencies = nlg.getNodesWithDependencies(); + + nodesWithDependencies.forEach(node -> + { + Dependency dep = node.getDependency(); + if (dep != null) + { + final Artifact artifact = dep.getArtifact(); + List children = node.getChildren(); + final ZpmArtifactId id = + new ZpmArtifactId(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion()); + final Set depends = new LinkedHashSet<>(); + children.forEach(c -> + { + final Artifact cArtifact = c.getArtifact(); + final ZpmArtifactId cid = + new ZpmArtifactId(cArtifact.getGroupId(), cArtifact.getArtifactId(), cArtifact.getVersion()); + depends.add(cid); + }); + artifacts.add(new ZpmArtifact(id, artifact.getFile().toPath(), depends)); + } + }); - return resolveDependencyArtifacts(resolvable); + return artifacts; } - private Map resolveImports( - List imports) + private RepositorySystemSession newRepositorySystemSession( + RepositorySystem system, + Path dir) { - Map imported = new LinkedHashMap<>(); + return new SessionBuilderSupplier(system) + .get() + .withLocalRepositoryBaseDirectories(dir) + .setRepositoryListener(new ZpmConsoleRepositoryListener()) + .setTransferListener(new ZpmConsoleTransferListener()) + .setConfigProperty(CONFIG_PROP_VERBOSE, "true") + .build(); + } - if (imports != null) + + final class ZpmSupplierRepositorySystemFactory + { + private ZpmSupplierRepositorySystemFactory() { - ModuleDescriptor resolvable = createResolvableDescriptor(emptyMap(), imports); - List importedIds = resolveDependencyDescriptors(resolvable); - importedIds.stream() - .map(PomModuleDescriptorBuilder::getDependencyManagementMap) - .flatMap(m -> m.entrySet().stream()) - .forEach(e -> imported.put(asDependency(e.getKey()), e.getValue())); } - return imported; + public static RepositorySystem newRepositorySystem() + { + return new RepositorySystemSupplier() + { + @Override + protected Map createTransporterFactories() + { + Map result = super.createTransporterFactories(); + result.put( + ApacheTransporterFactory.NAME, + new ApacheTransporterFactory(getChecksumExtractor(), getPathProcessor())); + return result; + } + }.get(); + } } - private ZpmDependency asDependency( - ModuleId moduleId) + class ZpmConsoleTransferListener extends AbstractTransferListener { - return ZpmDependency.of(moduleId.getOrganisation(), moduleId.getName(), null); - } + private final Map downloads = new ConcurrentHashMap<>(); - private DefaultModuleDescriptor createResolvableDescriptor( - Map imported, - List dependencies) - { - List revisionIds = dependencies.stream() - .map(d -> ModuleRevisionId.newInstance(d.groupId, d.artifactId, ofNullable(d.version).orElse(imported.get(d)))) - .collect(Collectors.toList()); + private int lastLength; - ModuleRevisionId[] resolveIds = revisionIds.toArray(new ModuleRevisionId[0]); - boolean changing = false; - DefaultModuleDescriptor moduleDescriptor = new DefaultModuleDescriptor( - ModuleRevisionId.newInstance("caller", "all-caller", "working"), "integration", null, true); - for (String conf : options.getConfs()) + @Override + public void transferInitiated( + TransferEvent event) { - moduleDescriptor.addConfiguration(new Configuration(conf)); + requireNonNull(event, "event cannot be null"); + + logger.debug(String.format("Downloading: %s%s", + event.getResource().getRepositoryUrl(), event.getResource().getResourceName())); } - moduleDescriptor.setLastModified(System.currentTimeMillis()); - for (ModuleRevisionId mrid : resolveIds) + + @Override + public void transferProgressed( + TransferEvent event) { - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(moduleDescriptor, mrid, - true, changing, options.isTransitive()); - for (String conf : options.getConfs()) + requireNonNull(event, "event cannot be null"); + TransferResource resource = event.getResource(); + downloads.put(resource, event.getTransferredBytes()); + + StringBuilder buffer = new StringBuilder(64); + + for (Map.Entry entry : downloads.entrySet()) { - dd.addDependencyConfiguration(conf, conf); + long total = entry.getKey().getContentLength(); + long complete = entry.getValue(); + + buffer.append(getStatus(complete, total)).append(" "); } - moduleDescriptor.addDependency(dd); + + int pad = lastLength - buffer.length(); + lastLength = buffer.length(); + pad(buffer, pad); + buffer.append('\r'); + + logger.debug(buffer.toString()); } - return moduleDescriptor; - } - private List resolveDependencyDescriptors( - ModuleDescriptor moduleDescriptor) - { - List descriptors = new LinkedList<>(); - try + private String getStatus( + long complete, + long total) { - ResolveReport report = ivy.resolve(moduleDescriptor, options); - if (report.hasError()) + if (total >= 1024) { - throw new Exception("Unable to resolve: " + report); + return String.format("%d/%d KB", toKB(complete), toKB(total)); } - - for (IvyNode node : report.getDependencies()) + else if (total >= 0) { - ModuleDescriptor descriptor = node.getDescriptor(); - if (descriptor == null) - { - continue; - } - descriptors.add(descriptor); + return String.format("%d/%d B", complete, total); + } + else if (complete >= 1024) + { + return String.format("%d KB", toKB(complete)); + } + else + { + return String.format("%d B", complete); } - } - catch (Exception ex) - { - throw new RuntimeException(ex); } - return descriptors; - } - - private List resolveDependencyArtifacts( - ModuleDescriptor moduleDescriptor) - { - List artifacts = new LinkedList<>(); - try + private void pad( + StringBuilder buffer, + int spaces) { - ResolveReport report = ivy.resolve(moduleDescriptor, options); - if (report.hasError()) + String block = " "; + while (spaces > 0) { - throw new Exception("Unable to resolve: " + report); + int n = Math.min(spaces, block.length()); + buffer.append(block, 0, n); + spaces -= n; } + } - for (IvyNode node : report.getDependencies()) - { - ModuleDescriptor descriptor = node.getDescriptor(); - if (descriptor == null) - { - continue; - } + @Override + public void transferSucceeded( + TransferEvent event) + { + requireNonNull(event, "event cannot be null"); + transferCompleted(event); - ModuleRevisionId resolveId = descriptor.getModuleRevisionId(); - ArtifactDownloadReport[] downloads = report.getArtifactsReports(resolveId); - if (downloads.length == 0) - { - continue; - } + TransferResource resource = event.getResource(); + long contentLength = event.getTransferredBytes(); + if (contentLength >= 0) + { + String len = contentLength >= 1024 ? + String.format("%d KB", toKB(contentLength)) : String.format("%d B", contentLength); - Set depends = new LinkedHashSet<>(); - for (DependencyDescriptor dd : descriptor.getDependencies()) + String throughput = ""; + long duration = System.currentTimeMillis() - resource.getTransferStartTime(); + if (duration > 0) { - ModuleRevisionId dependId = dd.getDependencyRevisionId(); - ArtifactDownloadReport[] dependDownloads = report.getArtifactsReports(dependId); - if (dependDownloads.length != 0) - { - ZpmArtifactId depend = newArtifactId(dependId); - depends.add(depend); - } + long bytes = contentLength - resource.getResumeOffset(); + DecimalFormat format = new DecimalFormat("0.0", new DecimalFormatSymbols(Locale.ENGLISH)); + double kbPerSec = (bytes / 1024.0) / (duration / 1000.0); + throughput = String.format(" at %s KB/sec", format.format(kbPerSec)); } - - ZpmArtifactId id = newArtifactId(resolveId); - Path local = downloads[0].getLocalFile().toPath(); - ZpmArtifact artifact = new ZpmArtifact(id, local, depends); - artifacts.add(artifact); + logger.debug(String.format("Downloaded: %s%s (%s%s)", + resource.getRepositoryUrl(), resource.getResourceName(), len, throughput)); } } - catch (Exception ex) + + @Override + public void transferFailed( + TransferEvent event) { - throw new RuntimeException(ex); + requireNonNull(event, "event cannot be null"); + transferCompleted(event); } - return artifacts; - } + private void transferCompleted( + TransferEvent event) + { + requireNonNull(event, "event cannot be null"); + downloads.remove(event.getResource()); - private ZpmArtifactId newArtifactId( - ModuleRevisionId resolveId) - { - String groupId = resolveId.getOrganisation(); - String artifactId = resolveId.getName(); - String version = resolveId.getRevision(); + StringBuilder buffer = new StringBuilder(64); + pad(buffer, lastLength); + buffer.append('\r'); + logger.debug(buffer.toString()); + } - return new ZpmArtifactId(groupId, artifactId, version); + protected long toKB( + long bytes) + { + return (bytes + 1023) / 1024; + } } - private RepositoryResolver newResolver( - ZpmRepository repository) + class ZpmConsoleRepositoryListener extends AbstractRepositoryListener { - String name = "maven"; // TODO - String root = repository.location; + public void artifactDescriptorInvalid( + RepositoryEvent event) + { + requireNonNull(event, "event cannot be null"); + logger.debug(String.format("Invalid artifact descriptor for %s: %s", + event.getArtifact(), event.getException().getMessage())); + } + + public void artifactDescriptorMissing( + RepositoryEvent event) + { + requireNonNull(event, "event cannot be null"); + logger.debug(String.format("Missing artifact descriptor for %s", event.getArtifact())); + } + + public void artifactResolved( + RepositoryEvent event) + { + requireNonNull(event, "event cannot be null"); + logger.debug(String.format("Resolved artifact %s from %s", event.getArtifact(), event.getRepository())); + } + + public void artifactDownloading( + RepositoryEvent event) + { + requireNonNull(event, "event cannot be null"); + logger.debug(String.format("Downloading artifact %s from %s", event.getArtifact(), event.getRepository())); + } - IBiblioResolver resolver = new IBiblioResolver(); - resolver.setName(name); - resolver.setRoot(root); - resolver.setM2compatible(true); + public void artifactDownloaded( + RepositoryEvent event) + { + requireNonNull(event, "event cannot be null"); + logger.debug(String.format("Downloaded artifact %s from %s", event.getArtifact(), event.getRepository())); + } - return resolver; + public void artifactResolving( + RepositoryEvent event) + { + requireNonNull(event, "event cannot be null"); + logger.debug(String.format("Resolving artifact %s", event.getArtifact())); + } + + public void metadataInvalid( + RepositoryEvent event) + { + requireNonNull(event, "event cannot be null"); + logger.debug(String.format("Invalid metadata %s", event.getMetadata())); + } + + public void metadataResolved( + RepositoryEvent event) + { + requireNonNull(event, "event cannot be null"); + logger.debug(String.format("Resolved metadata %s from %s", event.getMetadata(), event.getRepository())); + } + + public void metadataResolving( + RepositoryEvent event) + { + requireNonNull(event, "event cannot be null"); + logger.debug(String.format("Resolving metadata %s from %s", event.getMetadata(), event.getRepository())); + } } } diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmCredentials.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmCredentials.java deleted file mode 100644 index 178a672e81..0000000000 --- a/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmCredentials.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2021-2024 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.aklivity.zilla.manager.internal.settings; - -import java.util.Objects; - -public final class ZpmCredentials -{ - public String realm; - public String host; - public String username; - public String password; - - public ZpmCredentials() - { - } - - @Override - public int hashCode() - { - return Objects.hash(realm, host, username, password); - } - - @Override - public boolean equals( - Object obj) - { - if (obj == this) - { - return true; - } - - if (!(obj instanceof ZpmCredentials)) - { - return false; - } - - ZpmCredentials that = (ZpmCredentials) obj; - return Objects.equals(this.realm, that.realm) && - Objects.equals(this.host, that.host) && - Objects.equals(this.username, that.username) && - Objects.equals(this.password, that.password); - } - - @Override - public String toString() - { - return String.format("%s:%s:%s:%s", realm, host, username, password != null ? "****" : null); - } - - public static ZpmCredentials of( - String realm, - String host, - String username, - String password) - { - return new ZpmCredentials(realm, host, username, password); - } - - ZpmCredentials( - String realm, - String host, - String username, - String password) - { - this.realm = realm; - this.host = host; - this.username = username; - this.password = password; - } -} diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSecrets.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSecrets.java deleted file mode 100644 index 982eb59ed7..0000000000 --- a/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSecrets.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2021-2024 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.aklivity.zilla.manager.internal.settings; - -import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; -import org.sonatype.plexus.components.cipher.PlexusCipherException; - -public final class ZpmSecrets -{ - public static String decryptSecret( - String secret, - String passphrase) throws PlexusCipherException - { - DefaultPlexusCipher cipher = new DefaultPlexusCipher(); - return cipher.isEncryptedString(secret) ? cipher.decryptDecorated(secret, passphrase) : secret; - } - - public static String encryptSecret( - String secret, - String passphrase) throws PlexusCipherException - { - DefaultPlexusCipher cipher = new DefaultPlexusCipher(); - return cipher.encryptAndDecorate(secret, passphrase); - } - - private ZpmSecrets() - { - } -} diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSecurity.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSecurity.java deleted file mode 100644 index 4680cd94d4..0000000000 --- a/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSecurity.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2021-2024 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.aklivity.zilla.manager.internal.settings; - -import java.util.Objects; - -public final class ZpmSecurity -{ - public String secret; - - @Override - public int hashCode() - { - return Objects.hash(secret); - } - - @Override - public boolean equals(Object obj) - { - if (obj == this) - { - return true; - } - - if (!(obj instanceof ZpmSecurity)) - { - return false; - } - - ZpmSecurity that = (ZpmSecurity) obj; - return Objects.equals(this.secret, that.secret); - } -} diff --git a/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSettings.java b/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSettings.java deleted file mode 100644 index 8365a27019..0000000000 --- a/manager/src/main/java/io/aklivity/zilla/manager/internal/settings/ZpmSettings.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2021-2024 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.aklivity.zilla.manager.internal.settings; - -import java.util.List; -import java.util.Objects; - -public final class ZpmSettings -{ - public List credentials; - - @Override - public int hashCode() - { - return Objects.hash(credentials); - } - - @Override - public boolean equals(Object obj) - { - if (obj == this) - { - return true; - } - - if (!(obj instanceof ZpmSettings)) - { - return false; - } - - ZpmSettings that = (ZpmSettings) obj; - return Objects.deepEquals(this.credentials, that.credentials); - } -} diff --git a/manager/src/main/java/org/apache/ivy/util/url/IvyAuthenticator.java b/manager/src/main/java/org/apache/ivy/util/url/IvyAuthenticator.java deleted file mode 100644 index 57e3b943d0..0000000000 --- a/manager/src/main/java/org/apache/ivy/util/url/IvyAuthenticator.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.ivy.util.url; - -import static org.apache.ivy.util.StringUtils.isNullOrEmpty; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.Authenticator; -import java.net.PasswordAuthentication; - -import org.apache.ivy.util.Credentials; -import org.apache.ivy.util.Message; - -/** - * - */ -public final class IvyAuthenticator extends Authenticator { - - private Authenticator original; - - private static boolean securityWarningLogged = false; - - /** - * Private c'tor to prevent instantiation. - */ - private IvyAuthenticator(Authenticator original) { - this.original = original; - } - - /** - * Installs an IvyAuthenticator as default Authenticator. Call this method - * before opening HTTP(S) connections to enable Ivy authentication. - */ - public static void install() { - // We will try to use the original authenticator as backup authenticator. - // Since there is no getter available, so try to use some reflection to - // obtain it. If that doesn't work, assume there is no original authenticator - Authenticator original = getCurrentAuthenticator(); - - if (original instanceof IvyAuthenticator) { - return; - } - - try { - Authenticator.setDefault(new IvyAuthenticator(original)); - } catch (SecurityException e) { - if (!securityWarningLogged) { - securityWarningLogged = true; - Message.warn("Not enough permissions to set the IvyAuthenticator. " - + "HTTP(S) authentication will be disabled!"); - } - } - } - - // API ****************************************************************** - - // Overriding Authenticator ********************************************* - - protected PasswordAuthentication getPasswordAuthentication() { - PasswordAuthentication result = null; - - if (isProxyAuthentication()) { - String proxyUser = System.getProperty("http.proxyUser"); - if (!isNullOrEmpty(proxyUser)) { - String proxyPass = System.getProperty("http.proxyPassword", ""); - Message.debug("authenticating to proxy server with username [" + proxyUser + "]"); - result = new PasswordAuthentication(proxyUser, proxyPass.toCharArray()); - } - } else { - Credentials c = CredentialsStore.INSTANCE.getCredentials(getRequestingPrompt(), - getRequestingHost()); - Message.debug("authentication: k='" - + Credentials.buildKey(getRequestingPrompt(), getRequestingHost()) + "' c='" - + c + "'"); - if (c != null) { - final String password = c.getPasswd() == null ? "" : c.getPasswd(); - result = new PasswordAuthentication(c.getUserName(), password.toCharArray()); - } - } - - if (result == null) { - String userInfo = getRequestingURL().getUserInfo(); - if (userInfo != null) { - String username = userInfo; - String password = null; - - int colonAt = userInfo.indexOf(':'); - if (colonAt != -1) { - username = userInfo.substring(0, colonAt); - password = userInfo.substring(colonAt + 1); - result = new PasswordAuthentication(username, password.toCharArray()); - } - } - } - - if (result == null && original != null) { - Authenticator.setDefault(original); - try { - result = Authenticator.requestPasswordAuthentication(getRequestingHost(), - getRequestingSite(), getRequestingPort(), getRequestingProtocol(), - getRequestingPrompt(), getRequestingScheme(), getRequestingURL(), getRequestorType()); - } finally { - Authenticator.setDefault(this); - } - } - - return result; - } - - /** - * The {@link Authenticator} doesn't have API before Java 9 to get hold of the current system - * level {@link Authenticator}. This method does a best-effort attempt to try and get hold of - * the current {@link Authenticator} in a way that's specific to the implementation of this - * method. There's no guarantee that this method will return the current authenticator. - * Note: this method is intended to be used exclusively by tests. - * - * @return Returns the currently setup system level {@link Authenticator}. In cases where this - * method isn't able to get the current authenticator, this method returns null - */ - static Authenticator getCurrentAuthenticator() { - return (getJavaVersion() < 9) ? getTheAuthenticator() : getDefaultAuthenticator(); - } - - /** - * Checks if the current authentication request is for the proxy server. - */ - private boolean isProxyAuthentication() { - return RequestorType.PROXY.equals(getRequestorType()); - } - - private static Authenticator getDefaultAuthenticator() { - try { - final Method m = Authenticator.class.getDeclaredMethod("getDefault"); - return (Authenticator) m.invoke(null); - } catch (final Throwable t) { - handleReflectionException(t); - } - return null; - } - - private static Authenticator getTheAuthenticator() { - try { - Field f = Authenticator.class.getDeclaredField("theAuthenticator"); - f.setAccessible(true); - return (Authenticator) f.get(null); - } catch (final Throwable t) { - handleReflectionException(t); - } - return null; - } - - private static void handleReflectionException(final Throwable t) { - Message.debug("Error occurred while getting the original authenticator: " - + t.getMessage()); - } - - private static int getJavaVersion() { - // See https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90002 - final String[] version = System.getProperty("java.specification.version").split("\\."); - final int major = Integer.parseInt(version[0]); - return major == 1 ? Integer.parseInt(version[1]) : major; - } -} - diff --git a/manager/src/test/java/io/aklivity/zilla/manager/internal/commands/encrypt/ZpmEncryptTest.java b/manager/src/test/java/io/aklivity/zilla/manager/internal/commands/encrypt/ZpmEncryptTest.java deleted file mode 100644 index b9cb6fb087..0000000000 --- a/manager/src/test/java/io/aklivity/zilla/manager/internal/commands/encrypt/ZpmEncryptTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2021-2024 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.aklivity.zilla.manager.internal.commands.encrypt; - -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.endsWith; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.PrintStream; - -import org.junit.Test; - -import com.github.rvesse.airline.Cli; - -import io.aklivity.zilla.manager.internal.ZpmCli; - -public class ZpmEncryptTest -{ - @Test - public void shouldEncrypt() - { - String[] args = - { - "encrypt", - "--settings-directory", "target/zpm-settings", - }; - - Cli parser = new Cli<>(ZpmCli.class); - Runnable encrypt = parser.parse(args); - - final InputStream in = System.in; - final PrintStream out = System.out; - - final ByteArrayInputStream input = new ByteArrayInputStream("input".getBytes(UTF_8)); - final ByteArrayOutputStream output = new ByteArrayOutputStream(); - - try - { - System.setIn(input); - System.setOut(new PrintStream(output)); - - encrypt.run(); - } - finally - { - System.setIn(in); - System.setOut(out); - } - - assertThat(encrypt, instanceOf(ZpmEncrypt.class)); - assertThat(output.toString(UTF_8).trim(), allOf(startsWith("{"), endsWith("}"))); - } -} diff --git a/manager/src/test/java/io/aklivity/zilla/manager/internal/commands/install/ZpmInstallTest.java b/manager/src/test/java/io/aklivity/zilla/manager/internal/commands/install/ZpmInstallTest.java index e90b60e587..b24465621c 100644 --- a/manager/src/test/java/io/aklivity/zilla/manager/internal/commands/install/ZpmInstallTest.java +++ b/manager/src/test/java/io/aklivity/zilla/manager/internal/commands/install/ZpmInstallTest.java @@ -20,7 +20,6 @@ import static org.hamcrest.io.FileMatchers.anExistingFile; import java.io.File; -import java.io.IOException; import org.junit.Test; @@ -31,7 +30,7 @@ public class ZpmInstallTest { @Test - public void shouldInstallEngine() throws IOException + public void shouldInstallEngine() { String[] args = { @@ -51,9 +50,9 @@ public void shouldInstallEngine() throws IOException assertThat(install, instanceOf(ZpmInstall.class)); assertThat(new File("src/conf/install/zpm.json"), anExistingFile()); assertThat(new File("target/test-locks/install/zpm-lock.json"), anExistingFile()); - assertThat(new File("target/zpm/cache/io.aklivity.zilla/engine/jars/engine-0.9.5.jar"), anExistingFile()); - assertThat(new File("target/zpm/cache/io.aklivity.zilla/binding-tcp/jars/binding-tcp-0.9.5.jar"), anExistingFile()); - assertThat(new File("target/zpm/cache/io.aklivity.zilla/binding-tls/jars/binding-tls-0.9.5.jar"), anExistingFile()); - assertThat(new File("target/zpm/cache/org.agrona/agrona/jars/agrona-1.6.0.jar"), anExistingFile()); + assertThat(new File("target/zpm/cache/io/aklivity/zilla/engine/0.9.5/engine-0.9.5.jar"), anExistingFile()); + assertThat(new File("target/zpm/cache/io/aklivity/zilla/binding-tcp/0.9.5/binding-tcp-0.9.5.jar"), anExistingFile()); + assertThat(new File("target/zpm/cache/io/aklivity/zilla/binding-tls/0.9.5/binding-tls-0.9.5.jar"), anExistingFile()); + assertThat(new File("target/zpm/cache/org/agrona/agrona/1.6.0/agrona-1.6.0.jar"), anExistingFile()); } } diff --git a/manager/src/test/java/io/aklivity/zilla/manager/internal/settings/ZpmSecurityTest.java b/manager/src/test/java/io/aklivity/zilla/manager/internal/settings/ZpmSecurityTest.java deleted file mode 100644 index 430ba9c725..0000000000 --- a/manager/src/test/java/io/aklivity/zilla/manager/internal/settings/ZpmSecurityTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2021-2024 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.aklivity.zilla.manager.internal.settings; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; - -import jakarta.json.bind.Jsonb; -import jakarta.json.bind.JsonbBuilder; - -import org.junit.Test; - -public class ZpmSecurityTest -{ - @Test - public void shouldReadEmptySecurity() - { - String text = - "{" + - "}"; - - Jsonb builder = JsonbBuilder.create(); - ZpmSecurity security = builder.fromJson(text, ZpmSecurity.class); - - assertThat(security, not(nullValue())); - assertThat(security.secret, nullValue()); - } - - @Test - public void shouldWriteEmptySecurity() - { - String expected = - "{" + - "}"; - - ZpmSecurity security = new ZpmSecurity(); - - Jsonb builder = JsonbBuilder.create(); - String actual = builder.toJson(security); - - assertEquals(expected, actual); - } - - @Test - public void shouldReadSecurity() - { - String text = - "{" + - "\"secret\":\"whisper\"" + - "}"; - - Jsonb builder = JsonbBuilder.create(); - ZpmSecurity security = builder.fromJson(text, ZpmSecurity.class); - - assertThat(security, not(nullValue())); - assertThat(security.secret, equalTo("whisper")); - } - - @Test - public void shouldWriteSecurity() - { - String expected = - "{" + - "\"secret\":\"whisper\"" + - "}"; - - ZpmSecurity security = new ZpmSecurity(); - security.secret = "whisper"; - - Jsonb builder = JsonbBuilder.create(); - String actual = builder.toJson(security); - - assertEquals(expected, actual); - } -} diff --git a/manager/src/test/java/io/aklivity/zilla/manager/internal/settings/ZpmSettingsTest.java b/manager/src/test/java/io/aklivity/zilla/manager/internal/settings/ZpmSettingsTest.java deleted file mode 100644 index e8b3f5a9ad..0000000000 --- a/manager/src/test/java/io/aklivity/zilla/manager/internal/settings/ZpmSettingsTest.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright 2021-2024 Aklivity Inc. - * - * Aklivity licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.aklivity.zilla.manager.internal.settings; - -import static java.util.Arrays.asList; -import static java.util.Collections.singletonList; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.emptyCollectionOf; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import java.util.Collections; - -import jakarta.json.bind.Jsonb; -import jakarta.json.bind.JsonbBuilder; - -import org.junit.Test; - -public class ZpmSettingsTest -{ - @Test - public void shouldReadEmptySettings() - { - String text = - "{" + - "}"; - - Jsonb builder = JsonbBuilder.create(); - ZpmSettings settings = builder.fromJson(text, ZpmSettings.class); - - assertThat(settings, not(nullValue())); - assertThat(settings.credentials, nullValue()); - } - - @Test - public void shouldWriteEmptySettings() - { - String expected = - "{" + - "}"; - - ZpmSettings settings = new ZpmSettings(); - - Jsonb builder = JsonbBuilder.create(); - String actual = builder.toJson(settings); - - assertEquals(expected, actual); - } - - @Test - public void shouldReadEmptyCredentials() - { - String text = - "{" + - "\"credentials\":" + - "[" + - "]" + - "}"; - - Jsonb builder = JsonbBuilder.create(); - ZpmSettings settings = builder.fromJson(text, ZpmSettings.class); - - assertThat(settings, not(nullValue())); - assertThat(settings.credentials, not(nullValue())); - assertThat(settings.credentials, emptyCollectionOf(ZpmCredentials.class)); - } - - @Test - public void shouldWriteEmptyCredentials() - { - String expected = - "{" + - "\"credentials\":" + - "[" + - "]" + - "}"; - - ZpmSettings settings = new ZpmSettings(); - settings.credentials = Collections.emptyList(); - - Jsonb builder = JsonbBuilder.create(); - String actual = builder.toJson(settings); - - assertEquals(expected, actual); - } - - @Test - public void shouldReadCredential() - { - String text = - "{" + - "\"credentials\":" + - "[" + - "{" + - "\"realm\": \"HTTP Realm\"," + - "\"host\": \"repo1.maven.org\"," + - "\"username\": \"user\"," + - "\"password\": \"pass\"" + - "}" + - "]" + - "}"; - - Jsonb builder = JsonbBuilder.create(); - ZpmSettings settings = builder.fromJson(text, ZpmSettings.class); - - assertThat(settings, not(nullValue())); - assertThat(settings.credentials, not(nullValue())); - assertThat(settings.credentials, equalTo(singletonList( - new ZpmCredentials("HTTP Realm", "repo1.maven.org", "user", "pass")))); - } - - @Test - public void shouldWriteCredential() - { - String expected = - "{" + - "\"credentials\":" + - "[" + - "{" + - "\"host\":\"repo1.maven.org\"," + - "\"password\":\"pass\"," + - "\"realm\":\"HTTP Realm\"," + - "\"username\":\"user\"" + - "}" + - "]" + - "}"; - - ZpmSettings settings = new ZpmSettings(); - settings.credentials = Collections.singletonList( - new ZpmCredentials("HTTP Realm", "repo1.maven.org", "user", "pass")); - - Jsonb builder = JsonbBuilder.create(); - String actual = builder.toJson(settings); - - assertEquals(expected, actual); - } - - @Test - public void shouldReadCredentials() - { - String text = - "{" + - "\"credentials\":" + - "[" + - "{" + - "\"realm\": \"HTTP Realm\"," + - "\"host\": \"repo1.maven.org\"," + - "\"username\": \"user\"," + - "\"password\": \"pass\"" + - "}," + - "{" + - "\"realm\": \"HTTP Realm 2\"," + - "\"host\": \"repo2.maven.org\"," + - "\"username\": \"user2\"," + - "\"password\": \"pass2\"" + - "}" + - "]" + - "}"; - - Jsonb builder = JsonbBuilder.create(); - ZpmSettings settings = builder.fromJson(text, ZpmSettings.class); - - assertThat(settings, not(nullValue())); - assertThat(settings.credentials, not(nullValue())); - assertThat(settings.credentials, equalTo(asList( - new ZpmCredentials("HTTP Realm", "repo1.maven.org", "user", "pass"), - new ZpmCredentials("HTTP Realm 2", "repo2.maven.org", "user2", "pass2")))); - } - - @Test - public void shouldWriteCredentials() - { - String expected = - "{" + - "\"credentials\":" + - "[" + - "{" + - "\"host\":\"repo1.maven.org\"," + - "\"password\":\"pass\"," + - "\"realm\":\"HTTP Realm\"," + - "\"username\":\"user\"" + - "}," + - "{" + - "\"host\":\"repo2.maven.org\"," + - "\"password\":\"pass2\"," + - "\"realm\":\"HTTP Realm 2\"," + - "\"username\":\"user2\"" + - "}" + - "]" + - "}"; - - ZpmSettings settings = new ZpmSettings(); - settings.credentials = Arrays.asList( - new ZpmCredentials("HTTP Realm", "repo1.maven.org", "user", "pass"), - new ZpmCredentials("HTTP Realm 2", "repo2.maven.org", "user2", "pass2")); - - Jsonb builder = JsonbBuilder.create(); - String actual = builder.toJson(settings); - - assertEquals(expected, actual); - } -} diff --git a/runtime/catalog-apicurio/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi b/runtime/catalog-apicurio/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi index 4265cc7395..6a515dfe0b 100644 --- a/runtime/catalog-apicurio/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi +++ b/runtime/catalog-apicurio/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.catalog.apicurio.internal.ApicurioEventFormatterFactory \ No newline at end of file +io.aklivity.zilla.runtime.catalog.apicurio.internal.ApicurioEventFormatterFactory diff --git a/runtime/catalog-filesystem/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi b/runtime/catalog-filesystem/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi index e1c1c2536c..7c54215157 100644 --- a/runtime/catalog-filesystem/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi +++ b/runtime/catalog-filesystem/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.catalog.filesystem.internal.FilesystemEventFormatterFactory \ No newline at end of file +io.aklivity.zilla.runtime.catalog.filesystem.internal.FilesystemEventFormatterFactory diff --git a/runtime/catalog-karapace/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi b/runtime/catalog-karapace/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi index 3435d29bed..a002822eed 100644 --- a/runtime/catalog-karapace/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi +++ b/runtime/catalog-karapace/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.catalog.karapace.internal.events.KarapaceEventFormatterFactory \ No newline at end of file +io.aklivity.zilla.runtime.catalog.karapace.internal.events.KarapaceEventFormatterFactory diff --git a/runtime/catalog-schema-registry/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi b/runtime/catalog-schema-registry/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi index 8b157436f2..f525a623f7 100644 --- a/runtime/catalog-schema-registry/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi +++ b/runtime/catalog-schema-registry/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.event.EventFormatterFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.catalog.schema.registry.internal.events.SchemaRegistryEventFormatterFactory \ No newline at end of file +io.aklivity.zilla.runtime.catalog.schema.registry.internal.events.SchemaRegistryEventFormatterFactory diff --git a/runtime/exporter-prometheus/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi b/runtime/exporter-prometheus/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi index 893fe74ddf..3d9f2fdaeb 100644 --- a/runtime/exporter-prometheus/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi +++ b/runtime/exporter-prometheus/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.exporter.prometheus.internal.config.PrometheusOptionsConfigAdapter \ No newline at end of file +io.aklivity.zilla.runtime.exporter.prometheus.internal.config.PrometheusOptionsConfigAdapter diff --git a/runtime/exporter-prometheus/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi b/runtime/exporter-prometheus/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi index fa67c2bbaf..51d1e2c093 100644 --- a/runtime/exporter-prometheus/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi +++ b/runtime/exporter-prometheus/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.exporter.prometheus.internal.PrometheusExporterFactorySpi \ No newline at end of file +io.aklivity.zilla.runtime.exporter.prometheus.internal.PrometheusExporterFactorySpi diff --git a/runtime/exporter-stdout/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi b/runtime/exporter-stdout/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi index c0bfc37413..9aa673f4d8 100644 --- a/runtime/exporter-stdout/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi +++ b/runtime/exporter-stdout/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.exporter.stdout.internal.config.StdoutOptionsConfigAdapter \ No newline at end of file +io.aklivity.zilla.runtime.exporter.stdout.internal.config.StdoutOptionsConfigAdapter diff --git a/runtime/exporter-stdout/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi b/runtime/exporter-stdout/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi index 8f575d444b..795f5c7bb5 100644 --- a/runtime/exporter-stdout/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi +++ b/runtime/exporter-stdout/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.exporter.stdout.internal.StdoutExporterFactorySpi \ No newline at end of file +io.aklivity.zilla.runtime.exporter.stdout.internal.StdoutExporterFactorySpi diff --git a/runtime/metrics-http/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactorySpi b/runtime/metrics-http/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactorySpi index 5595e5c1a0..c71a8b3848 100644 --- a/runtime/metrics-http/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactorySpi +++ b/runtime/metrics-http/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.metrics.http.internal.HttpMetricGroupFactorySpi \ No newline at end of file +io.aklivity.zilla.runtime.metrics.http.internal.HttpMetricGroupFactorySpi diff --git a/runtime/metrics-stream/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactorySpi b/runtime/metrics-stream/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactorySpi index 757a0d12fc..3920d77c0c 100644 --- a/runtime/metrics-stream/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactorySpi +++ b/runtime/metrics-stream/src/main/resources/META-INF/services/io.aklivity.zilla.runtime.engine.metrics.MetricGroupFactorySpi @@ -1 +1 @@ -io.aklivity.zilla.runtime.metrics.stream.internal.StreamMetricGroupFactorySpi \ No newline at end of file +io.aklivity.zilla.runtime.metrics.stream.internal.StreamMetricGroupFactorySpi From 73336db3c36ec2357ed594322e9d7308acda0120 Mon Sep 17 00:00:00 2001 From: John Fallows Date: Thu, 12 Dec 2024 19:21:49 -0800 Subject: [PATCH 2/3] Update pom versions --- build/flyweight-maven-plugin/pom.xml | 2 +- build/pom.xml | 2 +- cloud/docker-image/pom.xml | 2 +- cloud/helm-chart/pom.xml | 2 +- cloud/pom.xml | 2 +- conf/pom.xml | 2 +- incubator/binding-amqp.spec/pom.xml | 2 +- incubator/binding-amqp/pom.xml | 2 +- incubator/binding-pgsql-kafka.spec/pom.xml | 2 +- incubator/binding-pgsql-kafka/pom.xml | 2 +- incubator/binding-pgsql.spec/pom.xml | 2 +- incubator/binding-pgsql/pom.xml | 2 +- incubator/binding-risingwave.spec/pom.xml | 2 +- incubator/binding-risingwave/pom.xml | 2 +- incubator/command-dump/pom.xml | 2 +- incubator/command-log/pom.xml | 2 +- incubator/command-tune/pom.xml | 2 +- incubator/pom.xml | 2 +- manager/pom.xml | 2 +- pom.xml | 2 +- runtime/binding-asyncapi/pom.xml | 2 +- runtime/binding-echo/pom.xml | 2 +- runtime/binding-fan/pom.xml | 2 +- runtime/binding-filesystem/pom.xml | 2 +- runtime/binding-grpc-kafka/pom.xml | 2 +- runtime/binding-grpc/pom.xml | 2 +- runtime/binding-http-filesystem/pom.xml | 2 +- runtime/binding-http-kafka/pom.xml | 2 +- runtime/binding-http/pom.xml | 2 +- runtime/binding-kafka-grpc/pom.xml | 2 +- runtime/binding-kafka/pom.xml | 2 +- runtime/binding-mqtt-kafka/pom.xml | 2 +- runtime/binding-mqtt/pom.xml | 2 +- runtime/binding-openapi-asyncapi/pom.xml | 2 +- runtime/binding-openapi/pom.xml | 2 +- runtime/binding-proxy/pom.xml | 2 +- runtime/binding-sse-kafka/pom.xml | 2 +- runtime/binding-sse/pom.xml | 2 +- runtime/binding-tcp/pom.xml | 2 +- runtime/binding-tls/pom.xml | 2 +- runtime/binding-ws/pom.xml | 2 +- runtime/catalog-apicurio/pom.xml | 2 +- runtime/catalog-filesystem/pom.xml | 2 +- runtime/catalog-inline/pom.xml | 2 +- runtime/catalog-karapace/pom.xml | 2 +- runtime/catalog-schema-registry/pom.xml | 2 +- runtime/command-metrics/pom.xml | 2 +- runtime/command-start/pom.xml | 2 +- runtime/command-stop/pom.xml | 2 +- runtime/command-version/pom.xml | 2 +- runtime/command/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/engine/pom.xml | 2 +- runtime/exporter-otlp/pom.xml | 2 +- runtime/exporter-prometheus/pom.xml | 2 +- runtime/exporter-stdout/pom.xml | 2 +- runtime/filesystem-http/pom.xml | 2 +- runtime/guard-jwt/pom.xml | 2 +- runtime/metrics-grpc/pom.xml | 2 +- runtime/metrics-http/pom.xml | 2 +- runtime/metrics-stream/pom.xml | 2 +- runtime/model-avro/pom.xml | 2 +- runtime/model-core/pom.xml | 2 +- runtime/model-json/pom.xml | 2 +- runtime/model-protobuf/pom.xml | 2 +- runtime/pom.xml | 2 +- runtime/resolver-env/pom.xml | 2 +- runtime/vault-filesystem/pom.xml | 2 +- specs/binding-asyncapi.spec/pom.xml | 2 +- specs/binding-echo.spec/pom.xml | 2 +- specs/binding-fan.spec/pom.xml | 2 +- specs/binding-filesystem.spec/pom.xml | 2 +- specs/binding-grpc-kafka.spec/pom.xml | 2 +- specs/binding-grpc.spec/pom.xml | 2 +- specs/binding-http-filesystem.spec/pom.xml | 2 +- specs/binding-http-kafka.spec/pom.xml | 2 +- specs/binding-http.spec/pom.xml | 2 +- specs/binding-kafka-grpc.spec/pom.xml | 2 +- specs/binding-kafka.spec/pom.xml | 2 +- specs/binding-mqtt-kafka.spec/pom.xml | 2 +- specs/binding-mqtt.spec/pom.xml | 2 +- specs/binding-openapi-asyncapi.spec/pom.xml | 2 +- specs/binding-openapi.spec/pom.xml | 2 +- specs/binding-proxy.spec/pom.xml | 2 +- specs/binding-sse-kafka.spec/pom.xml | 2 +- specs/binding-sse.spec/pom.xml | 2 +- specs/binding-tcp.spec/pom.xml | 2 +- specs/binding-tls.spec/pom.xml | 2 +- specs/binding-ws.spec/pom.xml | 2 +- specs/catalog-apicurio.spec/pom.xml | 2 +- specs/catalog-filesystem.spec/pom.xml | 2 +- specs/catalog-inline.spec/pom.xml | 2 +- specs/catalog-karapace.spec/pom.xml | 2 +- specs/catalog-schema-registry.spec/pom.xml | 2 +- specs/engine.spec/pom.xml | 2 +- specs/exporter-otlp.spec/pom.xml | 2 +- specs/exporter-prometheus.spec/pom.xml | 2 +- specs/exporter-stdout.spec/pom.xml | 2 +- specs/filesystem-http.spec/pom.xml | 2 +- specs/guard-jwt.spec/pom.xml | 2 +- specs/metrics-grpc.spec/pom.xml | 2 +- specs/metrics-http.spec/pom.xml | 2 +- specs/metrics-stream.spec/pom.xml | 2 +- specs/model-avro.spec/pom.xml | 2 +- specs/model-core.spec/pom.xml | 2 +- specs/model-json.spec/pom.xml | 2 +- specs/model-protobuf.spec/pom.xml | 2 +- specs/pom.xml | 2 +- specs/vault-filesystem.spec/pom.xml | 2 +- 109 files changed, 109 insertions(+), 109 deletions(-) diff --git a/build/flyweight-maven-plugin/pom.xml b/build/flyweight-maven-plugin/pom.xml index b49bb4b808..53d3d0dafe 100644 --- a/build/flyweight-maven-plugin/pom.xml +++ b/build/flyweight-maven-plugin/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla build - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/build/pom.xml b/build/pom.xml index dabbd398ef..99a8e7a8fa 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/cloud/docker-image/pom.xml b/cloud/docker-image/pom.xml index b02e9922a3..589308e460 100644 --- a/cloud/docker-image/pom.xml +++ b/cloud/docker-image/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla cloud - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/cloud/helm-chart/pom.xml b/cloud/helm-chart/pom.xml index 4e00b8a00b..261a9ba6e1 100644 --- a/cloud/helm-chart/pom.xml +++ b/cloud/helm-chart/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla cloud - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/cloud/pom.xml b/cloud/pom.xml index 66ca42fbb8..eba77430c6 100644 --- a/cloud/pom.xml +++ b/cloud/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/conf/pom.xml b/conf/pom.xml index 81792fbf41..e7588439ef 100644 --- a/conf/pom.xml +++ b/conf/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/binding-amqp.spec/pom.xml b/incubator/binding-amqp.spec/pom.xml index f17ba6de91..1dbfab0cca 100644 --- a/incubator/binding-amqp.spec/pom.xml +++ b/incubator/binding-amqp.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/binding-amqp/pom.xml b/incubator/binding-amqp/pom.xml index 8089f70222..6e2783924c 100644 --- a/incubator/binding-amqp/pom.xml +++ b/incubator/binding-amqp/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/binding-pgsql-kafka.spec/pom.xml b/incubator/binding-pgsql-kafka.spec/pom.xml index 882eecd7b1..5c1b672147 100644 --- a/incubator/binding-pgsql-kafka.spec/pom.xml +++ b/incubator/binding-pgsql-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/binding-pgsql-kafka/pom.xml b/incubator/binding-pgsql-kafka/pom.xml index fad51e2b98..95b25beb5f 100644 --- a/incubator/binding-pgsql-kafka/pom.xml +++ b/incubator/binding-pgsql-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/binding-pgsql.spec/pom.xml b/incubator/binding-pgsql.spec/pom.xml index 764776ee12..61a77e1923 100644 --- a/incubator/binding-pgsql.spec/pom.xml +++ b/incubator/binding-pgsql.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/binding-pgsql/pom.xml b/incubator/binding-pgsql/pom.xml index ea979efb3b..4c0cd40a3d 100644 --- a/incubator/binding-pgsql/pom.xml +++ b/incubator/binding-pgsql/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/binding-risingwave.spec/pom.xml b/incubator/binding-risingwave.spec/pom.xml index 3584451b0c..ca30939968 100644 --- a/incubator/binding-risingwave.spec/pom.xml +++ b/incubator/binding-risingwave.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/binding-risingwave/pom.xml b/incubator/binding-risingwave/pom.xml index a3409f31eb..a087cd9681 100644 --- a/incubator/binding-risingwave/pom.xml +++ b/incubator/binding-risingwave/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/command-dump/pom.xml b/incubator/command-dump/pom.xml index ef05fa98d5..55f058f16a 100644 --- a/incubator/command-dump/pom.xml +++ b/incubator/command-dump/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/command-log/pom.xml b/incubator/command-log/pom.xml index d9696d0b7c..e437bd5ec6 100644 --- a/incubator/command-log/pom.xml +++ b/incubator/command-log/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/command-tune/pom.xml b/incubator/command-tune/pom.xml index 69ff8ee425..141259687c 100644 --- a/incubator/command-tune/pom.xml +++ b/incubator/command-tune/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/incubator/pom.xml b/incubator/pom.xml index 94cd15cdc8..f45529d387 100644 --- a/incubator/pom.xml +++ b/incubator/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/manager/pom.xml b/manager/pom.xml index 9ef7b43299..c7fd5ef4f3 100644 --- a/manager/pom.xml +++ b/manager/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index e8b05c0b80..7ee3852801 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.0.0 io.aklivity.zilla zilla - 0.9.109 + develop-SNAPSHOT pom zilla https://github.com/aklivity/zilla diff --git a/runtime/binding-asyncapi/pom.xml b/runtime/binding-asyncapi/pom.xml index e7f883e1c9..365555fd39 100644 --- a/runtime/binding-asyncapi/pom.xml +++ b/runtime/binding-asyncapi/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-echo/pom.xml b/runtime/binding-echo/pom.xml index d3e8d7ec7c..3a47423d5a 100644 --- a/runtime/binding-echo/pom.xml +++ b/runtime/binding-echo/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-fan/pom.xml b/runtime/binding-fan/pom.xml index 021de98651..e88d3d6de4 100644 --- a/runtime/binding-fan/pom.xml +++ b/runtime/binding-fan/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-filesystem/pom.xml b/runtime/binding-filesystem/pom.xml index eb36bd8d4c..25d4ae97f8 100644 --- a/runtime/binding-filesystem/pom.xml +++ b/runtime/binding-filesystem/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-grpc-kafka/pom.xml b/runtime/binding-grpc-kafka/pom.xml index d807f18609..cebcf678e4 100644 --- a/runtime/binding-grpc-kafka/pom.xml +++ b/runtime/binding-grpc-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-grpc/pom.xml b/runtime/binding-grpc/pom.xml index e0d048ac4c..a73bf0271e 100644 --- a/runtime/binding-grpc/pom.xml +++ b/runtime/binding-grpc/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-http-filesystem/pom.xml b/runtime/binding-http-filesystem/pom.xml index 104f5a6fed..7398a08012 100644 --- a/runtime/binding-http-filesystem/pom.xml +++ b/runtime/binding-http-filesystem/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-http-kafka/pom.xml b/runtime/binding-http-kafka/pom.xml index 0a570f0444..904a2a027f 100644 --- a/runtime/binding-http-kafka/pom.xml +++ b/runtime/binding-http-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-http/pom.xml b/runtime/binding-http/pom.xml index b375a7149c..238faec7a1 100644 --- a/runtime/binding-http/pom.xml +++ b/runtime/binding-http/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-kafka-grpc/pom.xml b/runtime/binding-kafka-grpc/pom.xml index 4e90a93f68..6d2190e68f 100644 --- a/runtime/binding-kafka-grpc/pom.xml +++ b/runtime/binding-kafka-grpc/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-kafka/pom.xml b/runtime/binding-kafka/pom.xml index e1fef4ed74..bee50a51c7 100644 --- a/runtime/binding-kafka/pom.xml +++ b/runtime/binding-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-mqtt-kafka/pom.xml b/runtime/binding-mqtt-kafka/pom.xml index dab00b9261..5c461f327e 100644 --- a/runtime/binding-mqtt-kafka/pom.xml +++ b/runtime/binding-mqtt-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-mqtt/pom.xml b/runtime/binding-mqtt/pom.xml index 62a49542fc..1ce005dd67 100644 --- a/runtime/binding-mqtt/pom.xml +++ b/runtime/binding-mqtt/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-openapi-asyncapi/pom.xml b/runtime/binding-openapi-asyncapi/pom.xml index 760bd15136..ab4e193680 100644 --- a/runtime/binding-openapi-asyncapi/pom.xml +++ b/runtime/binding-openapi-asyncapi/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-openapi/pom.xml b/runtime/binding-openapi/pom.xml index e817fde402..9b891fb878 100644 --- a/runtime/binding-openapi/pom.xml +++ b/runtime/binding-openapi/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-proxy/pom.xml b/runtime/binding-proxy/pom.xml index fa81892708..e55a09fb6a 100644 --- a/runtime/binding-proxy/pom.xml +++ b/runtime/binding-proxy/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-sse-kafka/pom.xml b/runtime/binding-sse-kafka/pom.xml index 2e5b5e75e9..dca069639d 100644 --- a/runtime/binding-sse-kafka/pom.xml +++ b/runtime/binding-sse-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-sse/pom.xml b/runtime/binding-sse/pom.xml index 3e96acfe4a..f66588e0a8 100644 --- a/runtime/binding-sse/pom.xml +++ b/runtime/binding-sse/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-tcp/pom.xml b/runtime/binding-tcp/pom.xml index 9305a80f11..f26574a201 100644 --- a/runtime/binding-tcp/pom.xml +++ b/runtime/binding-tcp/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-tls/pom.xml b/runtime/binding-tls/pom.xml index 2aa36e4a5c..602b6ed554 100644 --- a/runtime/binding-tls/pom.xml +++ b/runtime/binding-tls/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/binding-ws/pom.xml b/runtime/binding-ws/pom.xml index e41101fea6..0018b956cc 100644 --- a/runtime/binding-ws/pom.xml +++ b/runtime/binding-ws/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/catalog-apicurio/pom.xml b/runtime/catalog-apicurio/pom.xml index 3157a79c6e..55d5212fd0 100644 --- a/runtime/catalog-apicurio/pom.xml +++ b/runtime/catalog-apicurio/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/catalog-filesystem/pom.xml b/runtime/catalog-filesystem/pom.xml index 5948d1a45a..fbe0587393 100644 --- a/runtime/catalog-filesystem/pom.xml +++ b/runtime/catalog-filesystem/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/catalog-inline/pom.xml b/runtime/catalog-inline/pom.xml index cc7c997a59..71f8d0daf9 100644 --- a/runtime/catalog-inline/pom.xml +++ b/runtime/catalog-inline/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/catalog-karapace/pom.xml b/runtime/catalog-karapace/pom.xml index a38969c9b3..f144b9249b 100644 --- a/runtime/catalog-karapace/pom.xml +++ b/runtime/catalog-karapace/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/catalog-schema-registry/pom.xml b/runtime/catalog-schema-registry/pom.xml index 0355b974f6..454beeb2c1 100644 --- a/runtime/catalog-schema-registry/pom.xml +++ b/runtime/catalog-schema-registry/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/command-metrics/pom.xml b/runtime/command-metrics/pom.xml index d99538f920..db5bc81d49 100644 --- a/runtime/command-metrics/pom.xml +++ b/runtime/command-metrics/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/command-start/pom.xml b/runtime/command-start/pom.xml index 42b1ce0752..8ed869e0d7 100644 --- a/runtime/command-start/pom.xml +++ b/runtime/command-start/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/command-stop/pom.xml b/runtime/command-stop/pom.xml index cf8457bf89..76ba8f778f 100644 --- a/runtime/command-stop/pom.xml +++ b/runtime/command-stop/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/command-version/pom.xml b/runtime/command-version/pom.xml index b54ff8aea5..36c49192af 100644 --- a/runtime/command-version/pom.xml +++ b/runtime/command-version/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/command/pom.xml b/runtime/command/pom.xml index b4056486e0..8163d6fa6c 100644 --- a/runtime/command/pom.xml +++ b/runtime/command/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index 9c5d7b92bc..7bcda309e4 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/engine/pom.xml b/runtime/engine/pom.xml index 5f31df8ec3..bf412f219e 100644 --- a/runtime/engine/pom.xml +++ b/runtime/engine/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/exporter-otlp/pom.xml b/runtime/exporter-otlp/pom.xml index 8e2ecc0854..5bfaac5e8c 100644 --- a/runtime/exporter-otlp/pom.xml +++ b/runtime/exporter-otlp/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/exporter-prometheus/pom.xml b/runtime/exporter-prometheus/pom.xml index 04061932e4..b3af26bd40 100644 --- a/runtime/exporter-prometheus/pom.xml +++ b/runtime/exporter-prometheus/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/exporter-stdout/pom.xml b/runtime/exporter-stdout/pom.xml index 2d068e9220..6263e5350c 100644 --- a/runtime/exporter-stdout/pom.xml +++ b/runtime/exporter-stdout/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/filesystem-http/pom.xml b/runtime/filesystem-http/pom.xml index 944aba0910..f944c54a49 100644 --- a/runtime/filesystem-http/pom.xml +++ b/runtime/filesystem-http/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/guard-jwt/pom.xml b/runtime/guard-jwt/pom.xml index d1c65dd489..ebba56e5b5 100644 --- a/runtime/guard-jwt/pom.xml +++ b/runtime/guard-jwt/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/metrics-grpc/pom.xml b/runtime/metrics-grpc/pom.xml index 7426e8b166..310b473e19 100644 --- a/runtime/metrics-grpc/pom.xml +++ b/runtime/metrics-grpc/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/metrics-http/pom.xml b/runtime/metrics-http/pom.xml index f261da1c60..4a27ee2483 100644 --- a/runtime/metrics-http/pom.xml +++ b/runtime/metrics-http/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/metrics-stream/pom.xml b/runtime/metrics-stream/pom.xml index b0f0cb7095..6021c37669 100644 --- a/runtime/metrics-stream/pom.xml +++ b/runtime/metrics-stream/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/model-avro/pom.xml b/runtime/model-avro/pom.xml index e0c345cdaf..ec7b097e7e 100644 --- a/runtime/model-avro/pom.xml +++ b/runtime/model-avro/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/model-core/pom.xml b/runtime/model-core/pom.xml index 411a81b33b..406a2f987e 100644 --- a/runtime/model-core/pom.xml +++ b/runtime/model-core/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/model-json/pom.xml b/runtime/model-json/pom.xml index c022a46315..8dd5e143b4 100644 --- a/runtime/model-json/pom.xml +++ b/runtime/model-json/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/model-protobuf/pom.xml b/runtime/model-protobuf/pom.xml index bcf34a768d..ec84b5cfd7 100644 --- a/runtime/model-protobuf/pom.xml +++ b/runtime/model-protobuf/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/pom.xml b/runtime/pom.xml index 11abdbb816..d42e0cc398 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/resolver-env/pom.xml b/runtime/resolver-env/pom.xml index 8d6a84600d..a5c86d1070 100644 --- a/runtime/resolver-env/pom.xml +++ b/runtime/resolver-env/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/runtime/vault-filesystem/pom.xml b/runtime/vault-filesystem/pom.xml index c38ab68ea7..a856149b05 100644 --- a/runtime/vault-filesystem/pom.xml +++ b/runtime/vault-filesystem/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-asyncapi.spec/pom.xml b/specs/binding-asyncapi.spec/pom.xml index 06fe51d693..55fe296472 100644 --- a/specs/binding-asyncapi.spec/pom.xml +++ b/specs/binding-asyncapi.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-echo.spec/pom.xml b/specs/binding-echo.spec/pom.xml index dd740758af..02660f2ad2 100644 --- a/specs/binding-echo.spec/pom.xml +++ b/specs/binding-echo.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-fan.spec/pom.xml b/specs/binding-fan.spec/pom.xml index fa9a005593..0256388967 100644 --- a/specs/binding-fan.spec/pom.xml +++ b/specs/binding-fan.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-filesystem.spec/pom.xml b/specs/binding-filesystem.spec/pom.xml index 15fa251e63..d95e29fbcc 100644 --- a/specs/binding-filesystem.spec/pom.xml +++ b/specs/binding-filesystem.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-grpc-kafka.spec/pom.xml b/specs/binding-grpc-kafka.spec/pom.xml index 7b6e70a073..3721a7cfad 100644 --- a/specs/binding-grpc-kafka.spec/pom.xml +++ b/specs/binding-grpc-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-grpc.spec/pom.xml b/specs/binding-grpc.spec/pom.xml index 697c38409d..eaf6d7b1a6 100644 --- a/specs/binding-grpc.spec/pom.xml +++ b/specs/binding-grpc.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-http-filesystem.spec/pom.xml b/specs/binding-http-filesystem.spec/pom.xml index c4eff06852..e8164f7ab4 100644 --- a/specs/binding-http-filesystem.spec/pom.xml +++ b/specs/binding-http-filesystem.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-http-kafka.spec/pom.xml b/specs/binding-http-kafka.spec/pom.xml index ad6802c7be..be894338f9 100644 --- a/specs/binding-http-kafka.spec/pom.xml +++ b/specs/binding-http-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-http.spec/pom.xml b/specs/binding-http.spec/pom.xml index 0d9b122f33..61282d8951 100644 --- a/specs/binding-http.spec/pom.xml +++ b/specs/binding-http.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-kafka-grpc.spec/pom.xml b/specs/binding-kafka-grpc.spec/pom.xml index 2363f27efc..c9ec172761 100644 --- a/specs/binding-kafka-grpc.spec/pom.xml +++ b/specs/binding-kafka-grpc.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-kafka.spec/pom.xml b/specs/binding-kafka.spec/pom.xml index 79a532b1c1..129341bd51 100644 --- a/specs/binding-kafka.spec/pom.xml +++ b/specs/binding-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-mqtt-kafka.spec/pom.xml b/specs/binding-mqtt-kafka.spec/pom.xml index ef0ec22368..2941bcfc83 100644 --- a/specs/binding-mqtt-kafka.spec/pom.xml +++ b/specs/binding-mqtt-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-mqtt.spec/pom.xml b/specs/binding-mqtt.spec/pom.xml index 93d5413c53..9f16169b5a 100644 --- a/specs/binding-mqtt.spec/pom.xml +++ b/specs/binding-mqtt.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-openapi-asyncapi.spec/pom.xml b/specs/binding-openapi-asyncapi.spec/pom.xml index 31a0b20ad2..b1913e3065 100644 --- a/specs/binding-openapi-asyncapi.spec/pom.xml +++ b/specs/binding-openapi-asyncapi.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-openapi.spec/pom.xml b/specs/binding-openapi.spec/pom.xml index aa1c8c76fc..7a1c356c94 100644 --- a/specs/binding-openapi.spec/pom.xml +++ b/specs/binding-openapi.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-proxy.spec/pom.xml b/specs/binding-proxy.spec/pom.xml index 380dc2523e..4408d55147 100644 --- a/specs/binding-proxy.spec/pom.xml +++ b/specs/binding-proxy.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-sse-kafka.spec/pom.xml b/specs/binding-sse-kafka.spec/pom.xml index 906b92399e..b72428eb1b 100644 --- a/specs/binding-sse-kafka.spec/pom.xml +++ b/specs/binding-sse-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-sse.spec/pom.xml b/specs/binding-sse.spec/pom.xml index f50335b787..7079f2e1ae 100644 --- a/specs/binding-sse.spec/pom.xml +++ b/specs/binding-sse.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-tcp.spec/pom.xml b/specs/binding-tcp.spec/pom.xml index 31a4dfe087..0c30ded08e 100644 --- a/specs/binding-tcp.spec/pom.xml +++ b/specs/binding-tcp.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-tls.spec/pom.xml b/specs/binding-tls.spec/pom.xml index 9691759ab3..fdc955ef96 100644 --- a/specs/binding-tls.spec/pom.xml +++ b/specs/binding-tls.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/binding-ws.spec/pom.xml b/specs/binding-ws.spec/pom.xml index d360529660..5dc9b1a9b6 100644 --- a/specs/binding-ws.spec/pom.xml +++ b/specs/binding-ws.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/catalog-apicurio.spec/pom.xml b/specs/catalog-apicurio.spec/pom.xml index 69879bd966..444c97efb8 100644 --- a/specs/catalog-apicurio.spec/pom.xml +++ b/specs/catalog-apicurio.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/catalog-filesystem.spec/pom.xml b/specs/catalog-filesystem.spec/pom.xml index 6f9218d533..3c39bb0d06 100644 --- a/specs/catalog-filesystem.spec/pom.xml +++ b/specs/catalog-filesystem.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/catalog-inline.spec/pom.xml b/specs/catalog-inline.spec/pom.xml index 74c81890e6..8a90f4e4cb 100644 --- a/specs/catalog-inline.spec/pom.xml +++ b/specs/catalog-inline.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/catalog-karapace.spec/pom.xml b/specs/catalog-karapace.spec/pom.xml index c976dfb89c..3e150cf9b4 100644 --- a/specs/catalog-karapace.spec/pom.xml +++ b/specs/catalog-karapace.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/catalog-schema-registry.spec/pom.xml b/specs/catalog-schema-registry.spec/pom.xml index 00335bc6bd..e822b9989c 100644 --- a/specs/catalog-schema-registry.spec/pom.xml +++ b/specs/catalog-schema-registry.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/engine.spec/pom.xml b/specs/engine.spec/pom.xml index 53ae5513b1..b3b73bb237 100644 --- a/specs/engine.spec/pom.xml +++ b/specs/engine.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/exporter-otlp.spec/pom.xml b/specs/exporter-otlp.spec/pom.xml index dcc7d4aab1..9f5df63979 100644 --- a/specs/exporter-otlp.spec/pom.xml +++ b/specs/exporter-otlp.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/exporter-prometheus.spec/pom.xml b/specs/exporter-prometheus.spec/pom.xml index d458130b54..935f76f3e0 100644 --- a/specs/exporter-prometheus.spec/pom.xml +++ b/specs/exporter-prometheus.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/exporter-stdout.spec/pom.xml b/specs/exporter-stdout.spec/pom.xml index 074ca7fc85..359074548d 100644 --- a/specs/exporter-stdout.spec/pom.xml +++ b/specs/exporter-stdout.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/filesystem-http.spec/pom.xml b/specs/filesystem-http.spec/pom.xml index c1c6ac7d1b..98bf6f77aa 100644 --- a/specs/filesystem-http.spec/pom.xml +++ b/specs/filesystem-http.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/guard-jwt.spec/pom.xml b/specs/guard-jwt.spec/pom.xml index e0773b2295..1c9ee70d5a 100644 --- a/specs/guard-jwt.spec/pom.xml +++ b/specs/guard-jwt.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/metrics-grpc.spec/pom.xml b/specs/metrics-grpc.spec/pom.xml index 19940c63ad..72a14cd179 100644 --- a/specs/metrics-grpc.spec/pom.xml +++ b/specs/metrics-grpc.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/metrics-http.spec/pom.xml b/specs/metrics-http.spec/pom.xml index 6529fbecd4..292e82a329 100644 --- a/specs/metrics-http.spec/pom.xml +++ b/specs/metrics-http.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/metrics-stream.spec/pom.xml b/specs/metrics-stream.spec/pom.xml index d2acd50aee..bc5ef9c6a0 100644 --- a/specs/metrics-stream.spec/pom.xml +++ b/specs/metrics-stream.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/model-avro.spec/pom.xml b/specs/model-avro.spec/pom.xml index 7e600a3434..3599ba1aa3 100644 --- a/specs/model-avro.spec/pom.xml +++ b/specs/model-avro.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/model-core.spec/pom.xml b/specs/model-core.spec/pom.xml index 693cc368d6..9b5b0b41ec 100644 --- a/specs/model-core.spec/pom.xml +++ b/specs/model-core.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/model-json.spec/pom.xml b/specs/model-json.spec/pom.xml index 3f8954afe6..c7e0a3ab97 100644 --- a/specs/model-json.spec/pom.xml +++ b/specs/model-json.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/model-protobuf.spec/pom.xml b/specs/model-protobuf.spec/pom.xml index 295df588b4..f040110f1d 100644 --- a/specs/model-protobuf.spec/pom.xml +++ b/specs/model-protobuf.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/pom.xml b/specs/pom.xml index e5d6e37a11..a04ebc5efe 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - 0.9.109 + develop-SNAPSHOT ../pom.xml diff --git a/specs/vault-filesystem.spec/pom.xml b/specs/vault-filesystem.spec/pom.xml index cc68b76639..fbf4dbaad6 100644 --- a/specs/vault-filesystem.spec/pom.xml +++ b/specs/vault-filesystem.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - 0.9.109 + develop-SNAPSHOT ../pom.xml From 31e9ffbe31db883f2eae96425f1e9ea4cc2d3d27 Mon Sep 17 00:00:00 2001 From: John Fallows Date: Thu, 12 Dec 2024 19:41:38 -0800 Subject: [PATCH 3/3] Prepare release 0.9.111 --- CHANGELOG.md | 24 +++++++++++++++++++++ build/flyweight-maven-plugin/pom.xml | 2 +- build/pom.xml | 2 +- cloud/docker-image/pom.xml | 2 +- cloud/helm-chart/pom.xml | 2 +- cloud/pom.xml | 2 +- conf/pom.xml | 2 +- incubator/binding-amqp.spec/pom.xml | 2 +- incubator/binding-amqp/pom.xml | 2 +- incubator/binding-pgsql-kafka.spec/pom.xml | 2 +- incubator/binding-pgsql-kafka/pom.xml | 2 +- incubator/binding-pgsql.spec/pom.xml | 2 +- incubator/binding-pgsql/pom.xml | 2 +- incubator/binding-risingwave.spec/pom.xml | 2 +- incubator/binding-risingwave/pom.xml | 2 +- incubator/command-dump/pom.xml | 2 +- incubator/command-log/pom.xml | 2 +- incubator/command-tune/pom.xml | 2 +- incubator/pom.xml | 2 +- manager/pom.xml | 2 +- pom.xml | 2 +- runtime/binding-asyncapi/pom.xml | 2 +- runtime/binding-echo/pom.xml | 2 +- runtime/binding-fan/pom.xml | 2 +- runtime/binding-filesystem/pom.xml | 2 +- runtime/binding-grpc-kafka/pom.xml | 2 +- runtime/binding-grpc/pom.xml | 2 +- runtime/binding-http-filesystem/pom.xml | 2 +- runtime/binding-http-kafka/pom.xml | 2 +- runtime/binding-http/pom.xml | 2 +- runtime/binding-kafka-grpc/pom.xml | 2 +- runtime/binding-kafka/pom.xml | 2 +- runtime/binding-mqtt-kafka/pom.xml | 2 +- runtime/binding-mqtt/pom.xml | 2 +- runtime/binding-openapi-asyncapi/pom.xml | 2 +- runtime/binding-openapi/pom.xml | 2 +- runtime/binding-proxy/pom.xml | 2 +- runtime/binding-sse-kafka/pom.xml | 2 +- runtime/binding-sse/pom.xml | 2 +- runtime/binding-tcp/pom.xml | 2 +- runtime/binding-tls/pom.xml | 2 +- runtime/binding-ws/pom.xml | 2 +- runtime/catalog-apicurio/pom.xml | 2 +- runtime/catalog-filesystem/pom.xml | 2 +- runtime/catalog-inline/pom.xml | 2 +- runtime/catalog-karapace/pom.xml | 2 +- runtime/catalog-schema-registry/pom.xml | 2 +- runtime/command-metrics/pom.xml | 2 +- runtime/command-start/pom.xml | 2 +- runtime/command-stop/pom.xml | 2 +- runtime/command-version/pom.xml | 2 +- runtime/command/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/engine/pom.xml | 2 +- runtime/exporter-otlp/pom.xml | 2 +- runtime/exporter-prometheus/pom.xml | 2 +- runtime/exporter-stdout/pom.xml | 2 +- runtime/filesystem-http/pom.xml | 2 +- runtime/guard-jwt/pom.xml | 2 +- runtime/metrics-grpc/pom.xml | 2 +- runtime/metrics-http/pom.xml | 2 +- runtime/metrics-stream/pom.xml | 2 +- runtime/model-avro/pom.xml | 2 +- runtime/model-core/pom.xml | 2 +- runtime/model-json/pom.xml | 2 +- runtime/model-protobuf/pom.xml | 2 +- runtime/pom.xml | 2 +- runtime/resolver-env/pom.xml | 2 +- runtime/vault-filesystem/pom.xml | 2 +- specs/binding-asyncapi.spec/pom.xml | 2 +- specs/binding-echo.spec/pom.xml | 2 +- specs/binding-fan.spec/pom.xml | 2 +- specs/binding-filesystem.spec/pom.xml | 2 +- specs/binding-grpc-kafka.spec/pom.xml | 2 +- specs/binding-grpc.spec/pom.xml | 2 +- specs/binding-http-filesystem.spec/pom.xml | 2 +- specs/binding-http-kafka.spec/pom.xml | 2 +- specs/binding-http.spec/pom.xml | 2 +- specs/binding-kafka-grpc.spec/pom.xml | 2 +- specs/binding-kafka.spec/pom.xml | 2 +- specs/binding-mqtt-kafka.spec/pom.xml | 2 +- specs/binding-mqtt.spec/pom.xml | 2 +- specs/binding-openapi-asyncapi.spec/pom.xml | 2 +- specs/binding-openapi.spec/pom.xml | 2 +- specs/binding-proxy.spec/pom.xml | 2 +- specs/binding-sse-kafka.spec/pom.xml | 2 +- specs/binding-sse.spec/pom.xml | 2 +- specs/binding-tcp.spec/pom.xml | 2 +- specs/binding-tls.spec/pom.xml | 2 +- specs/binding-ws.spec/pom.xml | 2 +- specs/catalog-apicurio.spec/pom.xml | 2 +- specs/catalog-filesystem.spec/pom.xml | 2 +- specs/catalog-inline.spec/pom.xml | 2 +- specs/catalog-karapace.spec/pom.xml | 2 +- specs/catalog-schema-registry.spec/pom.xml | 2 +- specs/engine.spec/pom.xml | 2 +- specs/exporter-otlp.spec/pom.xml | 2 +- specs/exporter-prometheus.spec/pom.xml | 2 +- specs/exporter-stdout.spec/pom.xml | 2 +- specs/filesystem-http.spec/pom.xml | 2 +- specs/guard-jwt.spec/pom.xml | 2 +- specs/metrics-grpc.spec/pom.xml | 2 +- specs/metrics-http.spec/pom.xml | 2 +- specs/metrics-stream.spec/pom.xml | 2 +- specs/model-avro.spec/pom.xml | 2 +- specs/model-core.spec/pom.xml | 2 +- specs/model-json.spec/pom.xml | 2 +- specs/model-protobuf.spec/pom.xml | 2 +- specs/pom.xml | 2 +- specs/vault-filesystem.spec/pom.xml | 2 +- 110 files changed, 133 insertions(+), 109 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a896b07bfc..71ba2586e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## [Unreleased](https://github.com/aklivity/zilla/tree/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:** + +- Support ZVIEW command [\#1329](https://github.com/aklivity/zilla/pull/1329) ([akrambek](https://github.com/akrambek)) + +## [0.9.109](https://github.com/aklivity/zilla/tree/0.9.109) (2024-12-13) + +[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.108...0.9.109) + ## [0.9.108](https://github.com/aklivity/zilla/tree/0.9.108) (2024-12-12) [Full Changelog](https://github.com/aklivity/zilla/compare/0.9.107...0.9.108) diff --git a/build/flyweight-maven-plugin/pom.xml b/build/flyweight-maven-plugin/pom.xml index 53d3d0dafe..98bd8c85cc 100644 --- a/build/flyweight-maven-plugin/pom.xml +++ b/build/flyweight-maven-plugin/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla build - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/build/pom.xml b/build/pom.xml index 99a8e7a8fa..d2e99d31b8 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/cloud/docker-image/pom.xml b/cloud/docker-image/pom.xml index 589308e460..4b0f7e7e25 100644 --- a/cloud/docker-image/pom.xml +++ b/cloud/docker-image/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla cloud - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/cloud/helm-chart/pom.xml b/cloud/helm-chart/pom.xml index 261a9ba6e1..bfbd4f3d1b 100644 --- a/cloud/helm-chart/pom.xml +++ b/cloud/helm-chart/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla cloud - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/cloud/pom.xml b/cloud/pom.xml index eba77430c6..1184594c8f 100644 --- a/cloud/pom.xml +++ b/cloud/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/conf/pom.xml b/conf/pom.xml index e7588439ef..203afc0955 100644 --- a/conf/pom.xml +++ b/conf/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/binding-amqp.spec/pom.xml b/incubator/binding-amqp.spec/pom.xml index 1dbfab0cca..91c096e587 100644 --- a/incubator/binding-amqp.spec/pom.xml +++ b/incubator/binding-amqp.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/binding-amqp/pom.xml b/incubator/binding-amqp/pom.xml index 6e2783924c..6e52687ac1 100644 --- a/incubator/binding-amqp/pom.xml +++ b/incubator/binding-amqp/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/binding-pgsql-kafka.spec/pom.xml b/incubator/binding-pgsql-kafka.spec/pom.xml index 5c1b672147..90f179963c 100644 --- a/incubator/binding-pgsql-kafka.spec/pom.xml +++ b/incubator/binding-pgsql-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/binding-pgsql-kafka/pom.xml b/incubator/binding-pgsql-kafka/pom.xml index 95b25beb5f..a85a3a5b10 100644 --- a/incubator/binding-pgsql-kafka/pom.xml +++ b/incubator/binding-pgsql-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/binding-pgsql.spec/pom.xml b/incubator/binding-pgsql.spec/pom.xml index 61a77e1923..60ec973a32 100644 --- a/incubator/binding-pgsql.spec/pom.xml +++ b/incubator/binding-pgsql.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/binding-pgsql/pom.xml b/incubator/binding-pgsql/pom.xml index 4c0cd40a3d..76d2430c6f 100644 --- a/incubator/binding-pgsql/pom.xml +++ b/incubator/binding-pgsql/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/binding-risingwave.spec/pom.xml b/incubator/binding-risingwave.spec/pom.xml index ca30939968..46f2acfd0c 100644 --- a/incubator/binding-risingwave.spec/pom.xml +++ b/incubator/binding-risingwave.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/binding-risingwave/pom.xml b/incubator/binding-risingwave/pom.xml index a087cd9681..9676ea31ce 100644 --- a/incubator/binding-risingwave/pom.xml +++ b/incubator/binding-risingwave/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/command-dump/pom.xml b/incubator/command-dump/pom.xml index 55f058f16a..d0550d8e7a 100644 --- a/incubator/command-dump/pom.xml +++ b/incubator/command-dump/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/command-log/pom.xml b/incubator/command-log/pom.xml index e437bd5ec6..3a022edda6 100644 --- a/incubator/command-log/pom.xml +++ b/incubator/command-log/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/command-tune/pom.xml b/incubator/command-tune/pom.xml index 141259687c..71168ed6ae 100644 --- a/incubator/command-tune/pom.xml +++ b/incubator/command-tune/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla incubator - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/incubator/pom.xml b/incubator/pom.xml index f45529d387..a9e9d62485 100644 --- a/incubator/pom.xml +++ b/incubator/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/manager/pom.xml b/manager/pom.xml index c7fd5ef4f3..8c77cedd74 100644 --- a/manager/pom.xml +++ b/manager/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/pom.xml b/pom.xml index 7ee3852801..b46013af28 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.0.0 io.aklivity.zilla zilla - develop-SNAPSHOT + 0.9.111 pom zilla https://github.com/aklivity/zilla diff --git a/runtime/binding-asyncapi/pom.xml b/runtime/binding-asyncapi/pom.xml index 365555fd39..a48552e367 100644 --- a/runtime/binding-asyncapi/pom.xml +++ b/runtime/binding-asyncapi/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-echo/pom.xml b/runtime/binding-echo/pom.xml index 3a47423d5a..4cb2ffc0bd 100644 --- a/runtime/binding-echo/pom.xml +++ b/runtime/binding-echo/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-fan/pom.xml b/runtime/binding-fan/pom.xml index e88d3d6de4..cc21a93f29 100644 --- a/runtime/binding-fan/pom.xml +++ b/runtime/binding-fan/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-filesystem/pom.xml b/runtime/binding-filesystem/pom.xml index 25d4ae97f8..c2b12821ad 100644 --- a/runtime/binding-filesystem/pom.xml +++ b/runtime/binding-filesystem/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-grpc-kafka/pom.xml b/runtime/binding-grpc-kafka/pom.xml index cebcf678e4..6fad59ae73 100644 --- a/runtime/binding-grpc-kafka/pom.xml +++ b/runtime/binding-grpc-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-grpc/pom.xml b/runtime/binding-grpc/pom.xml index a73bf0271e..3621d447e5 100644 --- a/runtime/binding-grpc/pom.xml +++ b/runtime/binding-grpc/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-http-filesystem/pom.xml b/runtime/binding-http-filesystem/pom.xml index 7398a08012..3e2161779f 100644 --- a/runtime/binding-http-filesystem/pom.xml +++ b/runtime/binding-http-filesystem/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-http-kafka/pom.xml b/runtime/binding-http-kafka/pom.xml index 904a2a027f..d7a882b546 100644 --- a/runtime/binding-http-kafka/pom.xml +++ b/runtime/binding-http-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-http/pom.xml b/runtime/binding-http/pom.xml index 238faec7a1..69f8b054ca 100644 --- a/runtime/binding-http/pom.xml +++ b/runtime/binding-http/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-kafka-grpc/pom.xml b/runtime/binding-kafka-grpc/pom.xml index 6d2190e68f..90ed1dba3a 100644 --- a/runtime/binding-kafka-grpc/pom.xml +++ b/runtime/binding-kafka-grpc/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-kafka/pom.xml b/runtime/binding-kafka/pom.xml index bee50a51c7..3555eede11 100644 --- a/runtime/binding-kafka/pom.xml +++ b/runtime/binding-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-mqtt-kafka/pom.xml b/runtime/binding-mqtt-kafka/pom.xml index 5c461f327e..2ea62acc55 100644 --- a/runtime/binding-mqtt-kafka/pom.xml +++ b/runtime/binding-mqtt-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-mqtt/pom.xml b/runtime/binding-mqtt/pom.xml index 1ce005dd67..8db2eadfb9 100644 --- a/runtime/binding-mqtt/pom.xml +++ b/runtime/binding-mqtt/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-openapi-asyncapi/pom.xml b/runtime/binding-openapi-asyncapi/pom.xml index ab4e193680..ff16866d88 100644 --- a/runtime/binding-openapi-asyncapi/pom.xml +++ b/runtime/binding-openapi-asyncapi/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-openapi/pom.xml b/runtime/binding-openapi/pom.xml index 9b891fb878..c5f741257d 100644 --- a/runtime/binding-openapi/pom.xml +++ b/runtime/binding-openapi/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-proxy/pom.xml b/runtime/binding-proxy/pom.xml index e55a09fb6a..10590f8002 100644 --- a/runtime/binding-proxy/pom.xml +++ b/runtime/binding-proxy/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-sse-kafka/pom.xml b/runtime/binding-sse-kafka/pom.xml index dca069639d..af9cd5c2b5 100644 --- a/runtime/binding-sse-kafka/pom.xml +++ b/runtime/binding-sse-kafka/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-sse/pom.xml b/runtime/binding-sse/pom.xml index f66588e0a8..e9524bc75c 100644 --- a/runtime/binding-sse/pom.xml +++ b/runtime/binding-sse/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-tcp/pom.xml b/runtime/binding-tcp/pom.xml index f26574a201..07f0ce57ba 100644 --- a/runtime/binding-tcp/pom.xml +++ b/runtime/binding-tcp/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-tls/pom.xml b/runtime/binding-tls/pom.xml index 602b6ed554..398089dc32 100644 --- a/runtime/binding-tls/pom.xml +++ b/runtime/binding-tls/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/binding-ws/pom.xml b/runtime/binding-ws/pom.xml index 0018b956cc..59b0973e2f 100644 --- a/runtime/binding-ws/pom.xml +++ b/runtime/binding-ws/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/catalog-apicurio/pom.xml b/runtime/catalog-apicurio/pom.xml index 55d5212fd0..255e714d37 100644 --- a/runtime/catalog-apicurio/pom.xml +++ b/runtime/catalog-apicurio/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/catalog-filesystem/pom.xml b/runtime/catalog-filesystem/pom.xml index fbe0587393..902c12da2f 100644 --- a/runtime/catalog-filesystem/pom.xml +++ b/runtime/catalog-filesystem/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/catalog-inline/pom.xml b/runtime/catalog-inline/pom.xml index 71f8d0daf9..b7ca85f984 100644 --- a/runtime/catalog-inline/pom.xml +++ b/runtime/catalog-inline/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/catalog-karapace/pom.xml b/runtime/catalog-karapace/pom.xml index f144b9249b..7d78e50db7 100644 --- a/runtime/catalog-karapace/pom.xml +++ b/runtime/catalog-karapace/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/catalog-schema-registry/pom.xml b/runtime/catalog-schema-registry/pom.xml index 454beeb2c1..b790f53913 100644 --- a/runtime/catalog-schema-registry/pom.xml +++ b/runtime/catalog-schema-registry/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/command-metrics/pom.xml b/runtime/command-metrics/pom.xml index db5bc81d49..70703411e2 100644 --- a/runtime/command-metrics/pom.xml +++ b/runtime/command-metrics/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/command-start/pom.xml b/runtime/command-start/pom.xml index 8ed869e0d7..04fe879c36 100644 --- a/runtime/command-start/pom.xml +++ b/runtime/command-start/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/command-stop/pom.xml b/runtime/command-stop/pom.xml index 76ba8f778f..d3f6ecfe41 100644 --- a/runtime/command-stop/pom.xml +++ b/runtime/command-stop/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/command-version/pom.xml b/runtime/command-version/pom.xml index 36c49192af..ba4c6d641e 100644 --- a/runtime/command-version/pom.xml +++ b/runtime/command-version/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/command/pom.xml b/runtime/command/pom.xml index 8163d6fa6c..f8672ca544 100644 --- a/runtime/command/pom.xml +++ b/runtime/command/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index 7bcda309e4..9fc5cc20f7 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/engine/pom.xml b/runtime/engine/pom.xml index bf412f219e..49176876e0 100644 --- a/runtime/engine/pom.xml +++ b/runtime/engine/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/exporter-otlp/pom.xml b/runtime/exporter-otlp/pom.xml index 5bfaac5e8c..d2072548ac 100644 --- a/runtime/exporter-otlp/pom.xml +++ b/runtime/exporter-otlp/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/exporter-prometheus/pom.xml b/runtime/exporter-prometheus/pom.xml index b3af26bd40..32632224c4 100644 --- a/runtime/exporter-prometheus/pom.xml +++ b/runtime/exporter-prometheus/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/exporter-stdout/pom.xml b/runtime/exporter-stdout/pom.xml index 6263e5350c..7db96080fe 100644 --- a/runtime/exporter-stdout/pom.xml +++ b/runtime/exporter-stdout/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/filesystem-http/pom.xml b/runtime/filesystem-http/pom.xml index f944c54a49..2cb7f26e9c 100644 --- a/runtime/filesystem-http/pom.xml +++ b/runtime/filesystem-http/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/guard-jwt/pom.xml b/runtime/guard-jwt/pom.xml index ebba56e5b5..ce9d6b0894 100644 --- a/runtime/guard-jwt/pom.xml +++ b/runtime/guard-jwt/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/metrics-grpc/pom.xml b/runtime/metrics-grpc/pom.xml index 310b473e19..463e38e947 100644 --- a/runtime/metrics-grpc/pom.xml +++ b/runtime/metrics-grpc/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/metrics-http/pom.xml b/runtime/metrics-http/pom.xml index 4a27ee2483..e885f68bd7 100644 --- a/runtime/metrics-http/pom.xml +++ b/runtime/metrics-http/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/metrics-stream/pom.xml b/runtime/metrics-stream/pom.xml index 6021c37669..7e386ab116 100644 --- a/runtime/metrics-stream/pom.xml +++ b/runtime/metrics-stream/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/model-avro/pom.xml b/runtime/model-avro/pom.xml index ec7b097e7e..83de9f065e 100644 --- a/runtime/model-avro/pom.xml +++ b/runtime/model-avro/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/model-core/pom.xml b/runtime/model-core/pom.xml index 406a2f987e..616f0bfee2 100644 --- a/runtime/model-core/pom.xml +++ b/runtime/model-core/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/model-json/pom.xml b/runtime/model-json/pom.xml index 8dd5e143b4..e0a12a9755 100644 --- a/runtime/model-json/pom.xml +++ b/runtime/model-json/pom.xml @@ -6,7 +6,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/model-protobuf/pom.xml b/runtime/model-protobuf/pom.xml index ec84b5cfd7..95f59c8dea 100644 --- a/runtime/model-protobuf/pom.xml +++ b/runtime/model-protobuf/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/pom.xml b/runtime/pom.xml index d42e0cc398..d182f6e898 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/resolver-env/pom.xml b/runtime/resolver-env/pom.xml index a5c86d1070..3ab33371bd 100644 --- a/runtime/resolver-env/pom.xml +++ b/runtime/resolver-env/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/runtime/vault-filesystem/pom.xml b/runtime/vault-filesystem/pom.xml index a856149b05..84573df494 100644 --- a/runtime/vault-filesystem/pom.xml +++ b/runtime/vault-filesystem/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla runtime - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-asyncapi.spec/pom.xml b/specs/binding-asyncapi.spec/pom.xml index 55fe296472..b7cc45c0d8 100644 --- a/specs/binding-asyncapi.spec/pom.xml +++ b/specs/binding-asyncapi.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-echo.spec/pom.xml b/specs/binding-echo.spec/pom.xml index 02660f2ad2..76e3d34ef7 100644 --- a/specs/binding-echo.spec/pom.xml +++ b/specs/binding-echo.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-fan.spec/pom.xml b/specs/binding-fan.spec/pom.xml index 0256388967..9657f29507 100644 --- a/specs/binding-fan.spec/pom.xml +++ b/specs/binding-fan.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-filesystem.spec/pom.xml b/specs/binding-filesystem.spec/pom.xml index d95e29fbcc..a050973822 100644 --- a/specs/binding-filesystem.spec/pom.xml +++ b/specs/binding-filesystem.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-grpc-kafka.spec/pom.xml b/specs/binding-grpc-kafka.spec/pom.xml index 3721a7cfad..980ebc196d 100644 --- a/specs/binding-grpc-kafka.spec/pom.xml +++ b/specs/binding-grpc-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-grpc.spec/pom.xml b/specs/binding-grpc.spec/pom.xml index eaf6d7b1a6..a8ce68ffe4 100644 --- a/specs/binding-grpc.spec/pom.xml +++ b/specs/binding-grpc.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-http-filesystem.spec/pom.xml b/specs/binding-http-filesystem.spec/pom.xml index e8164f7ab4..eb7616d6f3 100644 --- a/specs/binding-http-filesystem.spec/pom.xml +++ b/specs/binding-http-filesystem.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-http-kafka.spec/pom.xml b/specs/binding-http-kafka.spec/pom.xml index be894338f9..58ca8f5679 100644 --- a/specs/binding-http-kafka.spec/pom.xml +++ b/specs/binding-http-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-http.spec/pom.xml b/specs/binding-http.spec/pom.xml index 61282d8951..eff006d035 100644 --- a/specs/binding-http.spec/pom.xml +++ b/specs/binding-http.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-kafka-grpc.spec/pom.xml b/specs/binding-kafka-grpc.spec/pom.xml index c9ec172761..11b6190426 100644 --- a/specs/binding-kafka-grpc.spec/pom.xml +++ b/specs/binding-kafka-grpc.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-kafka.spec/pom.xml b/specs/binding-kafka.spec/pom.xml index 129341bd51..52a5a666c2 100644 --- a/specs/binding-kafka.spec/pom.xml +++ b/specs/binding-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-mqtt-kafka.spec/pom.xml b/specs/binding-mqtt-kafka.spec/pom.xml index 2941bcfc83..36470e0fb0 100644 --- a/specs/binding-mqtt-kafka.spec/pom.xml +++ b/specs/binding-mqtt-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-mqtt.spec/pom.xml b/specs/binding-mqtt.spec/pom.xml index 9f16169b5a..fbd18bd57e 100644 --- a/specs/binding-mqtt.spec/pom.xml +++ b/specs/binding-mqtt.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-openapi-asyncapi.spec/pom.xml b/specs/binding-openapi-asyncapi.spec/pom.xml index b1913e3065..6a692ce430 100644 --- a/specs/binding-openapi-asyncapi.spec/pom.xml +++ b/specs/binding-openapi-asyncapi.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-openapi.spec/pom.xml b/specs/binding-openapi.spec/pom.xml index 7a1c356c94..5c99531792 100644 --- a/specs/binding-openapi.spec/pom.xml +++ b/specs/binding-openapi.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-proxy.spec/pom.xml b/specs/binding-proxy.spec/pom.xml index 4408d55147..40d4d94cb9 100644 --- a/specs/binding-proxy.spec/pom.xml +++ b/specs/binding-proxy.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-sse-kafka.spec/pom.xml b/specs/binding-sse-kafka.spec/pom.xml index b72428eb1b..c1ec8e75a1 100644 --- a/specs/binding-sse-kafka.spec/pom.xml +++ b/specs/binding-sse-kafka.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-sse.spec/pom.xml b/specs/binding-sse.spec/pom.xml index 7079f2e1ae..4e9e5da1ab 100644 --- a/specs/binding-sse.spec/pom.xml +++ b/specs/binding-sse.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-tcp.spec/pom.xml b/specs/binding-tcp.spec/pom.xml index 0c30ded08e..9e3d2faddf 100644 --- a/specs/binding-tcp.spec/pom.xml +++ b/specs/binding-tcp.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-tls.spec/pom.xml b/specs/binding-tls.spec/pom.xml index fdc955ef96..e3c756ba23 100644 --- a/specs/binding-tls.spec/pom.xml +++ b/specs/binding-tls.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/binding-ws.spec/pom.xml b/specs/binding-ws.spec/pom.xml index 5dc9b1a9b6..6265adeb90 100644 --- a/specs/binding-ws.spec/pom.xml +++ b/specs/binding-ws.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/catalog-apicurio.spec/pom.xml b/specs/catalog-apicurio.spec/pom.xml index 444c97efb8..5238a8e523 100644 --- a/specs/catalog-apicurio.spec/pom.xml +++ b/specs/catalog-apicurio.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/catalog-filesystem.spec/pom.xml b/specs/catalog-filesystem.spec/pom.xml index 3c39bb0d06..475f28c39b 100644 --- a/specs/catalog-filesystem.spec/pom.xml +++ b/specs/catalog-filesystem.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/catalog-inline.spec/pom.xml b/specs/catalog-inline.spec/pom.xml index 8a90f4e4cb..8b255d54f0 100644 --- a/specs/catalog-inline.spec/pom.xml +++ b/specs/catalog-inline.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/catalog-karapace.spec/pom.xml b/specs/catalog-karapace.spec/pom.xml index 3e150cf9b4..6c17f302d6 100644 --- a/specs/catalog-karapace.spec/pom.xml +++ b/specs/catalog-karapace.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/catalog-schema-registry.spec/pom.xml b/specs/catalog-schema-registry.spec/pom.xml index e822b9989c..f2d63edbf9 100644 --- a/specs/catalog-schema-registry.spec/pom.xml +++ b/specs/catalog-schema-registry.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/engine.spec/pom.xml b/specs/engine.spec/pom.xml index b3b73bb237..ece8609fec 100644 --- a/specs/engine.spec/pom.xml +++ b/specs/engine.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/exporter-otlp.spec/pom.xml b/specs/exporter-otlp.spec/pom.xml index 9f5df63979..eb1af20f6a 100644 --- a/specs/exporter-otlp.spec/pom.xml +++ b/specs/exporter-otlp.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/exporter-prometheus.spec/pom.xml b/specs/exporter-prometheus.spec/pom.xml index 935f76f3e0..c3fd454240 100644 --- a/specs/exporter-prometheus.spec/pom.xml +++ b/specs/exporter-prometheus.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/exporter-stdout.spec/pom.xml b/specs/exporter-stdout.spec/pom.xml index 359074548d..09270e2e17 100644 --- a/specs/exporter-stdout.spec/pom.xml +++ b/specs/exporter-stdout.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/filesystem-http.spec/pom.xml b/specs/filesystem-http.spec/pom.xml index 98bf6f77aa..f7d7f80008 100644 --- a/specs/filesystem-http.spec/pom.xml +++ b/specs/filesystem-http.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/guard-jwt.spec/pom.xml b/specs/guard-jwt.spec/pom.xml index 1c9ee70d5a..c62f23f9db 100644 --- a/specs/guard-jwt.spec/pom.xml +++ b/specs/guard-jwt.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/metrics-grpc.spec/pom.xml b/specs/metrics-grpc.spec/pom.xml index 72a14cd179..e2eee06fb2 100644 --- a/specs/metrics-grpc.spec/pom.xml +++ b/specs/metrics-grpc.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/metrics-http.spec/pom.xml b/specs/metrics-http.spec/pom.xml index 292e82a329..dbc592886c 100644 --- a/specs/metrics-http.spec/pom.xml +++ b/specs/metrics-http.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/metrics-stream.spec/pom.xml b/specs/metrics-stream.spec/pom.xml index bc5ef9c6a0..ab665f6945 100644 --- a/specs/metrics-stream.spec/pom.xml +++ b/specs/metrics-stream.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/model-avro.spec/pom.xml b/specs/model-avro.spec/pom.xml index 3599ba1aa3..a20e8f6fa0 100644 --- a/specs/model-avro.spec/pom.xml +++ b/specs/model-avro.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/model-core.spec/pom.xml b/specs/model-core.spec/pom.xml index 9b5b0b41ec..1050c0af3c 100644 --- a/specs/model-core.spec/pom.xml +++ b/specs/model-core.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/model-json.spec/pom.xml b/specs/model-json.spec/pom.xml index c7e0a3ab97..d8d8caa7b8 100644 --- a/specs/model-json.spec/pom.xml +++ b/specs/model-json.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/model-protobuf.spec/pom.xml b/specs/model-protobuf.spec/pom.xml index f040110f1d..9157d40e5e 100644 --- a/specs/model-protobuf.spec/pom.xml +++ b/specs/model-protobuf.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/pom.xml b/specs/pom.xml index a04ebc5efe..5cde3e488b 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla zilla - develop-SNAPSHOT + 0.9.111 ../pom.xml diff --git a/specs/vault-filesystem.spec/pom.xml b/specs/vault-filesystem.spec/pom.xml index fbf4dbaad6..1142a5dade 100644 --- a/specs/vault-filesystem.spec/pom.xml +++ b/specs/vault-filesystem.spec/pom.xml @@ -8,7 +8,7 @@ io.aklivity.zilla specs - develop-SNAPSHOT + 0.9.111 ../pom.xml