argsList = new ArrayList<>(Arrays.asList(args));
- if (!argsList.contains("spring.jmx.default-domain")) {
- argsList.add("--spring.jmx.default-domain=module-launcher");
- }
- SpringApplication.run(ModuleLauncherApplication.class, argsList.toArray(new String[0]));
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherConfiguration.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherConfiguration.java
deleted file mode 100644
index 370ca3120..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherConfiguration.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.launcher;
-
-import org.springframework.cloud.stream.module.resolver.ModuleResolver;
-import org.springframework.cloud.stream.module.resolver.ModuleResolverConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * Configuration class that has the beans required for module launcher.
- *
- * @author Marius Bogoevici
- * @author Ilayaperumal Gopinathan
- * @author Eric Bottard
- */
-@Configuration
-@Import(ModuleResolverConfiguration.class)
-public class ModuleLauncherConfiguration {
-
- @Bean
- public ModuleLauncher moduleLauncher(ModuleResolver moduleResolver) {
- return new ModuleLauncher(moduleResolver);
- }
-
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherProperties.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherProperties.java
deleted file mode 100644
index ba7a3ce2d..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherProperties.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.launcher;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.core.env.Environment;
-
-/**
- * Configuration properties for {@link ModuleLauncher}.
- *
- * Expects the following keys (resolved from the {@link Environment}, so this could take many forms _ System
- * properties, environment variables, program arguments, etc. _):
- * - {@literal modules =
}: an ordered list of maven coordinates of modules to launch
- * - {@literal args[][] = }: key/value pairs that will become module arguments,
- * where {@literal } is the 0-based index of the module in the list above and '*' can be used for passing
- * arguments to all modules
- * - {@literal aggregate = true | false}
: whether multiple modules launched together should be aggregated,
- * case in which they will be launched as a single individual unit, and {@literal args['aggregate'][] = }
- * can be used for passing arguments to the aggregate;
- *
- *
- * As an example, this is how one would launch the {@literal time --fixedDelay=4 | log} canonical example:
- *
- * modules = org.springframework.cloud.modules:time-source:1.0.0-SNAPSHOT,org.springframework.cloud.modules:log-sink:1.0.0-SNAPSHOT
- * args.0.fixedDelay=4
- *
- *
- * And this is how one would launch the {@literal time --fixedDelay=4 | log} example as an aggregate:
- *
- * modules = org.springframework.cloud.modules:time-source:1.0.0-SNAPSHOT,org.springframework.cloud.modules:log-sink:1.0.0-SNAPSHOT
- * args.0.fixedDelay=4
- * aggregate=true
- *
- *
- *
- * @author Ilayaperumal Gopinathan
- * @author Marius Bogoevici
- * @author Eric Bottard
- */
-@ConfigurationProperties
-public class ModuleLauncherProperties {
-
- /**
- * True if aggregating multiple modules when launched together
- */
- private boolean aggregate;
-
- /**
- * File path to a locally available maven repository, where modules will be downloaded.
- */
- private String[] modules;
-
- /**
- * Map of arguments, keyed by the 0-based index in the {@link #modules array}, allowing for an additional generic
- * key for global arguments.
- */
- private Map> args = new HashMap<>();
-
- public boolean isAggregate() {
- return aggregate;
- }
-
- public void setAggregate(boolean aggregate) {
- this.aggregate = aggregate;
- }
-
- public void setModules(String[] modules) {
- this.modules = modules;
- }
-
- @NotEmpty(message = "A list of modules must be specified.")
- public String[] getModules() {
- return modules;
- }
-
- public void setArgs(Map> args) {
- this.args = args;
- }
-
- public Map> getArgs() {
- return args;
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherRunner.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherRunner.java
deleted file mode 100644
index 7463ec1a5..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherRunner.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.launcher;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * Spring boot {@link ApplicationRunner} that triggers {@link ModuleLauncher} to launch the modules.
- *
- * @author Marius Bogoevici
- * @author Ilayaperumal Gopinathan
- * @author Eric Bottard
- */
-@Component
-@EnableConfigurationProperties(ModuleLauncherProperties.class)
-public class ModuleLauncherRunner implements CommandLineRunner {
-
- private final static Log log = LogFactory.getLog(ModuleLauncherRunner.class);
-
- private final static String GLOBAL_ARGS_KEY = "*";
-
- private final static String AGGREGATE_ARGS_KEY = "aggregate";
-
- @Autowired
- private ModuleLauncherProperties moduleLauncherProperties;
-
- @Autowired
- private ModuleLauncher moduleLauncher;
-
- @Override
- public void run(String... args) throws Exception {
- List launchRequests = generateModuleLaunchRequests();
- if (log.isInfoEnabled()) {
- StringBuilder sb = new StringBuilder("Launching\n");
- for (ModuleLaunchRequest moduleLaunchRequest : launchRequests) {
- sb.append('\t').append(moduleLaunchRequest).append('\n');
- }
- log.info(sb.toString());
- }
- this.moduleLauncher.launch(launchRequests,
- moduleLauncherProperties.isAggregate(),
- moduleLauncherProperties.isAggregate() ?
- moduleLauncherProperties.getArgs().get(AGGREGATE_ARGS_KEY) :
- Collections.emptyMap());
- }
-
- private List generateModuleLaunchRequests() {
- List requests = new ArrayList<>();
- String[] modules = this.moduleLauncherProperties.getModules();
- Map> arguments = this.moduleLauncherProperties.getArgs();
- for (int i = 0; i < modules.length; i++) {
- // merge the global arguments with the module specific arguments
- Map moduleArguments = new HashMap<>();
- if (arguments != null) {
- // by inserting the global args first and the module specific args next
- // we ensure that the latter have precedence
- Map globalArgs = arguments.get(GLOBAL_ARGS_KEY);
- if (globalArgs != null) {
- moduleArguments.putAll(globalArgs);
- }
- Map moduleSpecificArgs = arguments.get(Integer.toString(i));
- if (moduleSpecificArgs != null) {
- moduleArguments.putAll(moduleSpecificArgs);
- }
- }
- ModuleLaunchRequest moduleLaunchRequest = new ModuleLaunchRequest(modules[i], moduleArguments);
- requests.add(moduleLaunchRequest);
- }
- return requests;
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/MultiArchiveLauncher.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/MultiArchiveLauncher.java
deleted file mode 100644
index 0d798a7f3..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/MultiArchiveLauncher.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.launcher;
-
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.boot.loader.Launcher;
-import org.springframework.boot.loader.archive.Archive;
-import org.springframework.cloud.stream.module.utils.ClassloaderUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * A {@link Launcher} for multiple independent JAR archives (which aren't nested in an uber jar). This class
- * supports adding includes and excludes to a module's classpath.
- *
- * @author Marius Bogoevici
- * @author Eric Bottard
- */
-public class MultiArchiveLauncher extends Launcher {
-
- private static Log log = LogFactory.getLog(MultiArchiveLauncher.class);
-
- private final List archives;
-
- /**
- * A list of archives, the first of which is expected to be a Spring boot uberJar
- *
- * @param archives
- */
- public MultiArchiveLauncher(List archives) {
- Assert.notEmpty(archives, "A list of archives must be provided");
- this.archives = archives;
- }
-
- @Override
- protected String getMainClass() throws Exception {
- return archives.get(0).getManifest().getMainAttributes().getValue("Start-Class");
- }
-
- @Override
- protected List getClassPathArchives() throws Exception {
- return archives;
- }
-
- @Override
- public void launch(String[] args) {
- super.launch(args);
- }
-
- @Override
- protected void launch(String[] args, String mainClass, ClassLoader classLoader)
- throws Exception {
- if (log.isDebugEnabled()) {
- for (Archive archive : archives) {
- log.debug("Launching with: " + archive.getUrl().toString());
- }
- }
- if (ClassUtils.isPresent(
- "org.apache.catalina.webresources.TomcatURLStreamHandlerFactory",
- classLoader)) {
- // Ensure the method is invoked on a class that is loaded by the provided
- // class loader (not the current context class loader):
- Method method = ReflectionUtils
- .findMethod(
- classLoader
- .loadClass("org.apache.catalina.webresources.TomcatURLStreamHandlerFactory"),
- "disable");
- ReflectionUtils.invokeMethod(method, null);
- }
- super.launch(args, mainClass, classLoader);
- }
-
- @Override
- protected ClassLoader createClassLoader(URL[] urls) throws Exception {
- return ClassloaderUtils.createModuleClassloader(urls);
- }
-
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolver.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolver.java
deleted file mode 100644
index e0ea3f498..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolver.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright 2015-2016 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.resolver;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-import org.eclipse.aether.DefaultRepositorySystemSession;
-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.connector.basic.BasicRepositoryConnectorFactory;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.impl.DefaultServiceLocator;
-import org.eclipse.aether.repository.Authentication;
-import org.eclipse.aether.repository.AuthenticationContext;
-import org.eclipse.aether.repository.AuthenticationDigest;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.Proxy;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.ArtifactRequest;
-import org.eclipse.aether.resolution.ArtifactResolutionException;
-import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.DependencyRequest;
-import org.eclipse.aether.resolution.DependencyResolutionException;
-import org.eclipse.aether.resolution.DependencyResult;
-import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
-import org.eclipse.aether.spi.connector.transport.TransporterFactory;
-import org.eclipse.aether.transport.file.FileTransporterFactory;
-import org.eclipse.aether.transport.http.HttpTransporterFactory;
-import org.eclipse.aether.util.artifact.JavaScopes;
-import org.eclipse.aether.util.repository.DefaultProxySelector;
-
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * An implementation of ModuleResolver using remoteRepositories;
-
- private final RepositorySystem repositorySystem;
-
- private volatile boolean offline = false;
-
- private final AetherProxyProperties proxyProperties;
-
- private Authentication authentication;
-
- /**
- * Create an instance specifying the locations of the local and remote repositories.
- * @param localRepository the root path of the local maven repository
- * @param remoteRepositories a Map containing pairs of (repository ID,repository URL). This
- * may be null or empty if the local repository is off line.
- * @param proxyProperties the proxy properties for the maven proxy settings.
- */
- public AetherModuleResolver(File localRepository, Map remoteRepositories,
- final AetherProxyProperties proxyProperties) {
- Assert.notNull(localRepository, "Local repository path cannot be null");
- if (log.isDebugEnabled()) {
- log.debug("Local repository: " + localRepository);
- if (!CollectionUtils.isEmpty(remoteRepositories)) {
- // just listing the values, ids are simply informative
- log.debug("Remote repositories: " + StringUtils.collectionToCommaDelimitedString(remoteRepositories.values()));
- }
- }
- this.proxyProperties = proxyProperties;
- if (isProxyEnabled() && proxyHasCredentials()) {
- this.authentication = new Authentication() {
- @Override
- public void fill(AuthenticationContext context, String key, Map data) {
- context.put(context.USERNAME, proxyProperties.getAuth().getUsername());
- context.put(context.PASSWORD, proxyProperties.getAuth().getPassword());
- }
-
- @Override
- public void digest(AuthenticationDigest digest) {
- digest.update(AuthenticationContext.USERNAME, proxyProperties.getAuth().getUsername(),
- AuthenticationContext.PASSWORD, proxyProperties.getAuth().getPassword());
- }
- };
- }
- if (!localRepository.exists()) {
- Assert.isTrue(localRepository.mkdirs(),
- "Unable to create directory for local repository: " + localRepository);
- }
- this.localRepository = localRepository;
- this.remoteRepositories = new LinkedList<>();
- if (!CollectionUtils.isEmpty(remoteRepositories)) {
- for (Map.Entry remoteRepo : remoteRepositories.entrySet()) {
- RemoteRepository.Builder remoteRepositoryBuilder = new RemoteRepository.Builder(remoteRepo.getKey(),
- DEFAULT_CONTENT_TYPE, remoteRepo.getValue());
- if (this.authentication != null) {
- //todo: Set direct authentication for the remote repositories
- remoteRepositoryBuilder.setProxy(new Proxy(proxyProperties.getProtocol(), proxyProperties.getHost(),
- proxyProperties.getPort(), authentication));
- }
- this.remoteRepositories.add(remoteRepositoryBuilder.build());
- }
- }
- repositorySystem = newRepositorySystem();
- }
-
- /**
- * Check if the proxy settings are provided.
- *
- * @return boolean true if the proxy settings are provided.
- */
- private boolean isProxyEnabled() {
- return (this.proxyProperties != null && this.proxyProperties.getHost() != null && proxyProperties.getPort() > 0);
- }
-
- /**
- * Check if the proxy setting has username/password set.
- *
- * @return boolean true if both the username/password are set
- */
- private boolean proxyHasCredentials() {
- return (this.proxyProperties != null && this.proxyProperties.getAuth() != null &&
- this.proxyProperties.getAuth().getUsername() != null && this.proxyProperties.getAuth().getPassword() != null);
- }
-
- public void setOffline(boolean offline) {
- this.offline = offline;
- }
-
- /**
- * Resolve an artifact and return its location in the local repository. Aether performs the normal
- * Maven resolution process ensuring that the latest update is cached to the local repository.
- * @param coordinates the Maven coordinates of the artifact
- * @return a {@link FileSystemResource} representing the resolved artifact in the local repository
- * @throws RuntimeException if the artifact does not exist or the resolution fails
- */
- @Override
- public Resource resolve(Coordinates coordinates) {
- return this.resolve(coordinates, null, null)[0];
- }
-
- /*
- * Create a session to manage remote and local synchronization.
- */
- private DefaultRepositorySystemSession newRepositorySystemSession(RepositorySystem system, String localRepoPath) {
- DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
- LocalRepository localRepo = new LocalRepository(localRepoPath);
- session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
- session.setOffline(this.offline);
- if (isProxyEnabled()) {
- DefaultProxySelector proxySelector = new DefaultProxySelector();
- Proxy proxy = new Proxy(proxyProperties.getProtocol(), proxyProperties.getHost(), proxyProperties.getPort(),
- authentication);
- proxySelector.add(proxy, proxyProperties.getNonProxyHosts());
- session.setProxySelector(proxySelector);
- }
- return session;
- }
-
- /*
- * Aether's components implement {@link org.eclipse.aether.spi.locator.Service} to ease manual wiring.
- * Using the prepopulated {@link DefaultServiceLocator}, we need to register the repository connector
- * and transporter factories
- */
- private RepositorySystem newRepositorySystem() {
- DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator();
- locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
- locator.addService(TransporterFactory.class, FileTransporterFactory.class);
- locator.addService(TransporterFactory.class, HttpTransporterFactory.class);
- locator.setErrorHandler(new DefaultServiceLocator.ErrorHandler() {
- @Override
- public void serviceCreationFailed(Class type, Class impl, Throwable exception) {
- throw new RuntimeException(exception);
- }
- });
- return locator.getService(RepositorySystem.class);
- }
-
-
- /**
- * Resolve a set of artifacts based on their coordinates, including their dependencies, and return the locations of
- * the transitive set in the local repository. Aether performs the normal Maven resolution process ensuring that the
- * latest update is cached to the local repository. A number of additional includes and excludes can be specified,
- * allowing to override the transitive dependencies of the original set. Includes and their transitive dependencies
- * will always
- *
- * @param root the Maven coordinates of the artifacts
- * @return a {@link FileSystemResource} representing the resolved artifact in the local repository
- * @throws RuntimeException if the artifact does not exist or the resolution fails
- */
- @Override
- public Resource[] resolve(Coordinates root, Coordinates[] includes, String[] excludePatterns) {
- Assert.notNull(root, "Root cannot be null");
- validateCoordinates(root);
- if (!ObjectUtils.isEmpty(includes)) {
- for (Coordinates include : includes) {
- Assert.notNull(include, "Includes cannot be null");
- validateCoordinates(include);
- }
- }
- List result = new ArrayList<>();
- Artifact rootArtifact = toArtifact(root);
- RepositorySystemSession session = newRepositorySystemSession(repositorySystem,
- localRepository.getAbsolutePath());
- if (ObjectUtils.isEmpty(includes) && ObjectUtils.isEmpty(excludePatterns)) {
- ArtifactResult resolvedArtifact;
- try {
- resolvedArtifact = repositorySystem.resolveArtifact(session,
- new ArtifactRequest(rootArtifact, remoteRepositories, JavaScopes.RUNTIME));
- }
- catch (ArtifactResolutionException e) {
- throw new RuntimeException(e);
- }
- result.add(toResource(resolvedArtifact));
- }
- else {
- try {
- CollectRequest collectRequest = new CollectRequest();
- collectRequest.setRepositories(remoteRepositories);
- collectRequest.setRoot(new Dependency(rootArtifact, JavaScopes.RUNTIME));
- Artifact[] includeArtifacts = new Artifact[!ObjectUtils.isEmpty(includes) ? includes.length : 0];
- int i = 0;
- for (Coordinates include : includes) {
- Artifact includedArtifact = toArtifact(include);
- collectRequest.addDependency(new Dependency(includedArtifact, JavaScopes.RUNTIME));
- includeArtifacts[i++] = includedArtifact;
- }
- DependencyResult dependencyResult =
- repositorySystem.resolveDependencies(session,
- new DependencyRequest(collectRequest,
- new ModuleDependencyFilter(includeArtifacts, excludePatterns)));
- for (ArtifactResult artifactResult : dependencyResult.getArtifactResults()) {
- // we are only interested in the jars
- if ("jar".equalsIgnoreCase(artifactResult.getArtifact().getExtension())) {
- result.add(toResource(artifactResult));
- }
- }
- }
- catch (DependencyResolutionException e) {
- throw new RuntimeException(e);
- }
- }
- return result.toArray(new Resource[result.size()]);
- }
-
- private void validateCoordinates(Coordinates coordinates) {
- Assert.hasText(coordinates.getGroupId(), "'groupId' cannot be blank.");
- Assert.hasText(coordinates.getArtifactId(), "'artifactId' cannot be blank.");
- Assert.hasText(coordinates.getExtension(), "'extension' cannot be blank.");
- Assert.hasText(coordinates.getVersion(), "'version' cannot be blank.");
- }
-
- public FileSystemResource toResource(ArtifactResult resolvedArtifact) {
- return new FileSystemResource(resolvedArtifact.getArtifact().getFile());
- }
-
- private Artifact toArtifact(Coordinates root) {
- return new DefaultArtifact(root.getGroupId(),
- root.getArtifactId(),
- root.getClassifier() != null ? root.getClassifier() : "",
- root.getExtension(),
- root.getVersion());
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherProxyProperties.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherProxyProperties.java
deleted file mode 100644
index df4086d86..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherProxyProperties.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.resolver;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Proxy properties for the Aether Module Resolver.
- *
- * @author Ilayaperumal Gopinathan
- */
-@ConfigurationProperties(prefix = "aether.proxy")
-public class AetherProxyProperties {
- /**
- * Protocol to use for proxy settings.
- */
- private String protocol = "http";
-
- /**
- * Host for the proxy.
- */
- private String host;
-
- /**
- * Port for the proxy.
- */
- private int port;
-
- /**
- * List of non proxy hosts.
- */
- private String nonProxyHosts;
-
- private Authentication auth;
-
- public String getProtocol() {
- return this.protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
- public String getHost() {
- return this.host;
- }
-
- public void setHost(String host) {
- this.host = host;
- }
-
- public int getPort() {
- return this.port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public String getNonProxyHosts() {
- return this.nonProxyHosts;
- }
-
- public void setNonProxyHosts(String nonProxyHosts) {
- this.nonProxyHosts = nonProxyHosts;
- }
-
- public Authentication getAuth() {
- return this.auth;
- }
-
- public void setAuth(Authentication auth) {
- this.auth = auth;
- }
-
- public static class Authentication {
-
- /**
- * Username for the proxy.
- */
- private String username;
-
- /**
- * Password for the proxy.
- */
- private String password;
-
- public String getUsername() {
- return this.username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return this.password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/Coordinates.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/Coordinates.java
deleted file mode 100644
index e3fdc234f..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/Coordinates.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.resolver;
-
-/**
- * Encapsulates Maven coordinates.
- *
- * @author Marius Bogoevici
- * @author Eric Bottard
- */
-public class Coordinates {
-
- private final String groupId;
-
- private final String artifactId;
-
- private final String extension;
-
- private String classifier;
-
- private final String version;
-
- /**
- * @param groupId the groupId
- * @param artifactId the artifactId
- * @param extension the file extension
- * @param classifier classifier
- * @param version the version
- */
- public Coordinates(String groupId, String artifactId, String extension, String classifier, String version) {
- this.groupId = groupId;
- this.artifactId = artifactId;
- this.extension = extension;
- this.classifier = classifier;
- this.version = version;
- }
-
- public String getGroupId() {
- return groupId;
- }
-
- public String getArtifactId() {
- return artifactId;
- }
-
- public String getExtension() {
- return extension;
- }
-
- public String getClassifier() {
- return classifier;
- }
-
- public String getVersion() {
- return version;
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleDependencyFilter.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleDependencyFilter.java
deleted file mode 100644
index 20f67e159..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleDependencyFilter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.resolver;
-
-import java.util.List;
-
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.util.filter.PatternExclusionsDependencyFilter;
-
-import org.springframework.util.ObjectUtils;
-
-/**
- * A {@link DependencyFilter} that uses a list of explicit includes and pattern-based excludes. Any items that match
- * the exclusion pattern will be rejected, unless they are accepted explicitly
- *
- * @author Marius Bogoevici
- */
-public class ModuleDependencyFilter implements DependencyFilter {
-
- private final PatternExclusionsDependencyFilter patternExclusionsDependencyFilter;
-
- private final Artifact[] includes;
-
- private boolean acceptOptional = false;
-
- public ModuleDependencyFilter(Artifact[] includes, String... excludes) {
- this.patternExclusionsDependencyFilter = new PatternExclusionsDependencyFilter(excludes);
- this.includes = includes != null ? includes : new Artifact[0];
- }
-
- public void setAcceptOptional(boolean acceptOptional) {
- this.acceptOptional = acceptOptional;
- }
-
- @Override
- public boolean accept(DependencyNode node, List parents) {
- // optional nodes are rejected conditionally
- // nodes included explicitly are always accepted
- return (acceptOptional || !node.getDependency().isOptional())
- && (isIncludedDirectly(node) || patternExclusionsDependencyFilter.accept(node, parents));
- }
-
- private boolean isIncludedDirectly(DependencyNode node) {
- if (node.getArtifact() != null) {
- for (Artifact include : includes) {
- Artifact nodeArtifact = node.getArtifact();
- // we check if this was a specifically included artifact by checking its group, artifactId, extension and
- // classifier. The version is left out in the case when resolution produces a different artifact version
- // (there cannot be two artifacts with the same group, artifactId, extension and classifier but different
- // version in the resolved group)
- if (ObjectUtils.nullSafeEquals(include.getGroupId(), nodeArtifact.getGroupId())
- && ObjectUtils.nullSafeEquals(include.getArtifactId(), nodeArtifact.getArtifactId())
- && ObjectUtils.nullSafeEquals(include.getClassifier(), nodeArtifact.getClassifier())
- && ObjectUtils.nullSafeEquals(include.getExtension(), nodeArtifact.getExtension())) {
- return true;
- }
- }
- return false;
- }
- return true;
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolver.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolver.java
deleted file mode 100644
index d175b2762..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolver.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.resolver;
-
-import org.springframework.core.io.Resource;
-
-/**
- * Interface used to return a {@link Resource} that provides access to a module
- * uber-jar based on its Maven coordinates.
- *
- * @author David Turanski
- * @author Marius Bogoevici
- * @author Eric Bottard
- */
-public interface ModuleResolver {
-
- /**
- * Retrieve a resource given its coordinates.
- *
- * @param coordinates the coordinates of a resource
- * @return the resource
- */
- Resource resolve(Coordinates coordinates);
-
- /**
- * Retrieve a set of resources given their coordinates, along with additional dependencies.
- * Exclusion rules patterns (conforming to {@link org.eclipse.aether.util.filter.PatternExclusionsDependencyFilter}
- * can be provided as well.
- *
- * @param root the coordinates of the main resource
- * @param includes a list of coordinates to include along the main resource
- * @param excludePatterns a list of exclusion patterns
- * @see org.eclipse.aether.util.filter.PatternExclusionsDependencyFilter
- * @return the main resource and the additional dependencies
- */
- Resource[] resolve(Coordinates root, Coordinates[] includes, String[] excludePatterns);
-
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolverConfiguration.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolverConfiguration.java
deleted file mode 100644
index c1a951a1d..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolverConfiguration.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2015-2016 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.resolver;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-
-/**
- * Sets up the default Aether-based module resolver, unless overridden.
- *
- * @author Eric Bottard
- * @author Ilayaperumal Gopinathan
- */
-@EnableConfigurationProperties({ModuleResolverProperties.class, AetherProxyProperties.class})
-public class ModuleResolverConfiguration {
-
- @Autowired
- private ModuleResolverProperties properties;
-
- @Autowired
- private AetherProxyProperties proxyProperties;
-
- @Bean
- @ConditionalOnMissingBean(ModuleResolver.class)
- public ModuleResolver moduleResolver() {
- int i = 1;
- Map repositoriesMap = new HashMap<>();
- for (String repository : properties.getRemoteRepositories()) {
- repositoriesMap.put("repository " + i++, repository);
- }
- AetherModuleResolver aetherModuleResolver = new AetherModuleResolver(properties.getLocalRepository(),
- repositoriesMap, proxyProperties);
- aetherModuleResolver.setOffline(properties.isOffline());
- return aetherModuleResolver;
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolverProperties.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolverProperties.java
deleted file mode 100644
index 9b09b6578..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/ModuleResolverProperties.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.resolver;
-
-import java.io.File;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Configuration properties for {@link ModuleResolver}.
- *
- * @author Ilayaperumal Gopinathan
- */
-@ConfigurationProperties
-public class ModuleResolverProperties {
-
- /**
- * File path to a locally available maven repository, where modules will be downloaded.
- */
- private File localRepository = new File(System.getProperty("user.home") + File.separator + ".m2" +
- File.separator + "repository");
-
- /**
- * Location of comma separated remote maven repositories from which modules will be downloaded, if not available locally.
- */
- private String[] remoteRepositories = new String[]{"https://repo.spring.io/libs-snapshot"};
-
- /**
- * Whether the resolver should operate in offline mode.
- */
- private boolean offline = false;
-
- public void setRemoteRepositories(String[] remoteRepositories) {
- this.remoteRepositories = remoteRepositories;
- }
-
- public String[] getRemoteRepositories() {
- return remoteRepositories;
- }
-
- public void setLocalRepository(File localRepository) {
- this.localRepository = localRepository;
- }
-
- public File getLocalRepository() {
- return localRepository;
- }
-
- public boolean isOffline() {
- return offline;
- }
-
- public void setOffline(boolean offline) {
- this.offline = offline;
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/package-info.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/package-info.java
deleted file mode 100644
index 0a457ab6b..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Root package of the ModuleResolver support.
- */
-
-package org.springframework.cloud.stream.module.resolver;
diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/utils/ClassloaderUtils.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/utils/ClassloaderUtils.java
deleted file mode 100644
index 3c540236f..000000000
--- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/utils/ClassloaderUtils.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.utils;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.boot.loader.LaunchedURLClassLoader;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Marius Bogoevici
- */
-public class ClassloaderUtils {
-
- private static final Log log = LogFactory.getLog(ClassloaderUtils.class);
-
- /**
- * Creates a ClassLoader for the launched modules by merging the URLs supplied as argument with the URLs that
- * make up the additional classpath of the launched JVM (retrieved from the application classloader), and
- * setting the extension classloader of the JVM as parent, if accessible.
- *
- * @param urls a list of library URLs
- * @return the resulting classloader
- */
- public static ClassLoader createModuleClassloader(URL[] urls) {
- ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
- if (log.isDebugEnabled()) {
- log.debug("systemClassLoader is " + systemClassLoader);
- }
- if (systemClassLoader instanceof URLClassLoader) {
- // add the URLs of the application classloader to the created classloader
- // to compensate for LaunchedURLClassLoader not delegating to parent to retrieve resources
- @SuppressWarnings("resource")
- URLClassLoader systemUrlClassLoader = (URLClassLoader) systemClassLoader;
- URL[] mergedUrls = new URL[urls.length + systemUrlClassLoader.getURLs().length];
- if (log.isDebugEnabled()) {
- log.debug("Original URLs: " +
- StringUtils.arrayToCommaDelimitedString(urls));
- log.debug("Java Classpath URLs: " +
- StringUtils.arrayToCommaDelimitedString(systemUrlClassLoader.getURLs()));
- }
- System.arraycopy(urls, 0, mergedUrls, 0, urls.length);
- System.arraycopy(systemUrlClassLoader.getURLs(), 0, mergedUrls, urls.length,
- systemUrlClassLoader.getURLs().length);
- // add the extension classloader as parent to the created context, if accessible
- if (log.isDebugEnabled()) {
- log.debug("Classloader URLs: " + StringUtils.arrayToCommaDelimitedString(mergedUrls));
- }
- return new LaunchedURLClassLoader(mergedUrls, systemUrlClassLoader.getParent());
- }
- return new LaunchedURLClassLoader(urls, systemClassLoader);
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/test/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolverTests.java b/spring-cloud-stream-module-launcher/src/test/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolverTests.java
deleted file mode 100644
index 5cb755e7a..000000000
--- a/spring-cloud-stream-module-launcher/src/test/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolverTests.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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 org.springframework.cloud.stream.module.resolver;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
-import static org.hamcrest.Matchers.arrayWithSize;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.object.HasToString.hasToString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.eclipse.aether.resolution.ArtifactResolutionException;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.util.SocketUtils;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-/**
- * @author David Turanski
- */
-public class AetherModuleResolverTests {
-
- private int port = SocketUtils.findAvailableTcpPort();
-
- @Rule
- public WireMockRule wireMockRule = new WireMockRule(port);
-
- @Test
- public void testResolveLocal() throws IOException {
- ClassPathResource cpr = new ClassPathResource("local-repo");
- File localRepository = cpr.getFile();
- AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, null, null);
- Resource resource = defaultModuleResolver.resolve(new Coordinates("foo.bar", "foo-bar", "jar", "", "1.0.0"));
- assertTrue(resource.exists());
- assertEquals(resource.getFile().getName(), "foo-bar-1.0.0.jar");
- }
-
- @Test
- public void testResolveLocalWithIncludes() throws IOException {
- ClassPathResource cpr = new ClassPathResource("local-repo");
- File localRepository = cpr.getFile();
- AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, null, null);
- Resource[] resources = defaultModuleResolver.resolve(
- new Coordinates("foo.bar", "foo-bar", "jar", "", "1.0.0"),
- new Coordinates[]{new Coordinates("qux.bar", "qux-bar", "jar", "", "1.0.0")},new String[]{});
- assertThat(resources, arrayWithSize(2));
- assertTrue(resources[0].exists());
- assertTrue(resources[1].exists());
- // the optional dependency 'foo.baz:foo-baz:1.0.0'of 'foo.bar:foo-bar' is not included
- assertThat(resources, arrayContainingInAnyOrder(
- hasToString(containsString("foo-bar-1.0.0.jar")),
- hasToString(containsString("qux-bar-1.0.0.jar"))));
- }
-
- @Test(expected = RuntimeException.class)
- public void testResolveDoesNotExist() throws IOException {
- ClassPathResource cpr = new ClassPathResource("local-repo");
- File localRepository = cpr.getFile();
- AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, null, null);
- defaultModuleResolver.resolve(new Coordinates("niente", "nada", "jar", "", "zilch"));
- }
-
- @Test
- @Ignore
- public void testResolveRemote() throws IOException {
- File localRepository = Files.createTempDirectory(UUID.randomUUID().toString()).toFile();
- localRepository.deleteOnExit();
- Map remoteRepos = new HashMap<>();
- remoteRepos.put("modules", "http://repo.spring.io/libs-snapshot");
- AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, remoteRepos, null);
- Resource resource = defaultModuleResolver.resolve(
- new Coordinates("org.springframework.cloud.stream.module", "time-source", "jar", "exec", "1.0.0.BUILD-SNAPSHOT"));
- assertTrue(resource.exists());
- assertEquals(resource.getFile().getName(), "time-source-1.0.0.BUILD-SNAPSHOT-exec.jar");
- }
-
- @Test
- public void testResolveMockRemote() throws IOException {
- File localRepository = Files.createTempDirectory(UUID.randomUUID().toString()).toFile();
- localRepository.deleteOnExit();
- ClassPathResource stubJarResource = new ClassPathResource("__files/foo.jar");
- String stubFileName = stubJarResource.getFile().getName();
- Map remoteRepos = new HashMap<>();
- remoteRepos.put("repo0", "http://localhost:" + port + "/repo0");
- remoteRepos.put("repo1", "http://localhost:" + port + "/repo1");
- stubFor(get(urlEqualTo("/repo1/org/bar/foo/1.0.0/foo-1.0.0.jar"))
- .willReturn(aResponse()
- .withStatus(200)
- .withBodyFile(stubFileName)));
- AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, remoteRepos, null);
- Resource resource = defaultModuleResolver.resolve(new Coordinates("org.bar", "foo", "jar", "", "1.0.0"));
- assertTrue(resource.exists());
- assertEquals(resource.getFile().getName(), "foo-1.0.0.jar");
- }
-
- @Test
- public void testResolveOfflineWithMockRemote() throws IOException {
- try {
- File localRepository = Files.createTempDirectory(UUID.randomUUID().toString()).toFile();
- localRepository.deleteOnExit();
- ClassPathResource stubJarResource = new ClassPathResource("__files/foo.jar");
- String stubFileName = stubJarResource.getFile().getName();
- Map remoteRepos = new HashMap<>();
- remoteRepos.put("repo0", "http://localhost:" + port + "/repo0");
- remoteRepos.put("repo1", "http://localhost:" + port + "/repo1");
- stubFor(get(urlEqualTo("/repo1/org/bar/foo/1.0.0/foo-1.0.0.jar"))
- .willReturn(aResponse()
- .withStatus(200)
- .withBodyFile(stubFileName)));
- AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, remoteRepos, null);
- defaultModuleResolver.setOffline(true);
- defaultModuleResolver.resolve(new Coordinates("org.bar", "foo", "jar", "", "1.0.0"));
- } catch (RuntimeException e) {
- // remote resolution fails because the resolver is operating offline
- assertThat(e.getCause(), instanceOf(ArtifactResolutionException.class));
- }
- }
-}
diff --git a/spring-cloud-stream-module-launcher/src/test/resources/__files/foo.jar b/spring-cloud-stream-module-launcher/src/test/resources/__files/foo.jar
deleted file mode 100644
index e69de29bb..000000000
diff --git a/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/bar/foo-bar/1.0.0/foo-bar-1.0.0.jar b/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/bar/foo-bar/1.0.0/foo-bar-1.0.0.jar
deleted file mode 100644
index e69de29bb..000000000
diff --git a/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/bar/foo-bar/1.0.0/foo-bar-1.0.0.pom b/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/bar/foo-bar/1.0.0/foo-bar-1.0.0.pom
deleted file mode 100644
index 1210081ad..000000000
--- a/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/bar/foo-bar/1.0.0/foo-bar-1.0.0.pom
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- 4.0.0
-
- foo.bar
- foo-bar
- 1.0.0
-
- jar
- foo-bar
-
-
-
- foo.baz
- foo-baz
- 1.0.0
- true
-
-
-
diff --git a/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/baz/foo-baz/1.0.0/foo-baz-1.0.0.jar b/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/baz/foo-baz/1.0.0/foo-baz-1.0.0.jar
deleted file mode 100644
index e69de29bb..000000000
diff --git a/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/baz/foo-baz/1.0.0/foo-baz-1.0.0.pom b/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/baz/foo-baz/1.0.0/foo-baz-1.0.0.pom
deleted file mode 100644
index 29b3ddd84..000000000
--- a/spring-cloud-stream-module-launcher/src/test/resources/local-repo/foo/baz/foo-baz/1.0.0/foo-baz-1.0.0.pom
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 4.0.0
-
- foo.baz
- foo-baz
- 1.0.0
-
- jar
- foo-baz
-
-
diff --git a/spring-cloud-stream-module-launcher/src/test/resources/local-repo/qux/bar/qux-bar/1.0.0/qux-bar-1.0.0.jar b/spring-cloud-stream-module-launcher/src/test/resources/local-repo/qux/bar/qux-bar/1.0.0/qux-bar-1.0.0.jar
deleted file mode 100644
index e69de29bb..000000000
diff --git a/spring-cloud-stream-module-launcher/src/test/resources/local-repo/qux/bar/qux-bar/1.0.0/qux-bar-1.0.0.pom b/spring-cloud-stream-module-launcher/src/test/resources/local-repo/qux/bar/qux-bar/1.0.0/qux-bar-1.0.0.pom
deleted file mode 100644
index 4c5205853..000000000
--- a/spring-cloud-stream-module-launcher/src/test/resources/local-repo/qux/bar/qux-bar/1.0.0/qux-bar-1.0.0.pom
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 4.0.0
-
- qux-bar
- qux-bar
- 1.0.0
-
- jar
- qux-bar
-
-