mirror of
https://github.com/ethauvin/bld.git
synced 2025-04-26 00:37:10 -07:00
Provided scope dependencies are now stored in a separate directory and are only added to compile and test classpaths, but are not included for any runtime or distribution contexts.
This commit is contained in:
parent
6ffd6260b1
commit
af6525acfa
27 changed files with 467 additions and 192 deletions
4
.idea/libraries/compile.xml
generated
4
.idea/libraries/compile.xml
generated
|
@ -2,12 +2,16 @@
|
||||||
<library name="compile">
|
<library name="compile">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
4
.idea/libraries/test.xml
generated
4
.idea/libraries/test.xml
generated
|
@ -2,14 +2,18 @@
|
||||||
<library name="test">
|
<library name="test">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
||||||
<root url="file://$PROJECT_DIR$/core/src/test/resources" />
|
<root url="file://$PROJECT_DIR$/core/src/test/resources" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -250,6 +250,13 @@ public class BaseProject extends BuildExecutor {
|
||||||
* @since 1.5
|
* @since 1.5
|
||||||
*/
|
*/
|
||||||
protected File libCompileDirectory = null;
|
protected File libCompileDirectory = null;
|
||||||
|
/**
|
||||||
|
* The provided scope lib directory.
|
||||||
|
*
|
||||||
|
* @see #libProvidedDirectory()
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
protected File libProvidedDirectory = null;
|
||||||
/**
|
/**
|
||||||
* The runtime scope lib directory.
|
* The runtime scope lib directory.
|
||||||
*
|
*
|
||||||
|
@ -1010,6 +1017,16 @@ public class BaseProject extends BuildExecutor {
|
||||||
return Objects.requireNonNullElseGet(libCompileDirectory, () -> new File(libDirectory(), "compile"));
|
return Objects.requireNonNullElseGet(libCompileDirectory, () -> new File(libDirectory(), "compile"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the project provided scope lib directory.
|
||||||
|
* Defaults to {@code "provided"} relative to {@link #libDirectory()}.
|
||||||
|
*
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
public File libProvidedDirectory() {
|
||||||
|
return Objects.requireNonNullElseGet(libProvidedDirectory, () -> new File(libDirectory(), "provided"));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the project runtime scope lib directory.
|
* Returns the project runtime scope lib directory.
|
||||||
* Defaults to {@code "runtime"} relative to {@link #libDirectory()}.
|
* Defaults to {@code "runtime"} relative to {@link #libDirectory()}.
|
||||||
|
@ -1130,6 +1147,7 @@ public class BaseProject extends BuildExecutor {
|
||||||
libDirectory().mkdirs();
|
libDirectory().mkdirs();
|
||||||
libBldDirectory().mkdirs();
|
libBldDirectory().mkdirs();
|
||||||
libCompileDirectory().mkdirs();
|
libCompileDirectory().mkdirs();
|
||||||
|
libProvidedDirectory().mkdirs();
|
||||||
libRuntimeDirectory().mkdirs();
|
libRuntimeDirectory().mkdirs();
|
||||||
if (libStandaloneDirectory() != null) {
|
if (libStandaloneDirectory() != null) {
|
||||||
libStandaloneDirectory().mkdirs();
|
libStandaloneDirectory().mkdirs();
|
||||||
|
@ -1399,6 +1417,24 @@ public class BaseProject extends BuildExecutor {
|
||||||
// build the compilation classpath
|
// build the compilation classpath
|
||||||
var classpath = new ArrayList<>(jar_files.stream().map(file -> new File(dir_abs, file)).toList());
|
var classpath = new ArrayList<>(jar_files.stream().map(file -> new File(dir_abs, file)).toList());
|
||||||
addLocalDependencies(classpath, Scope.compile);
|
addLocalDependencies(classpath, Scope.compile);
|
||||||
|
return classpath;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns all the jar files that are in the provided scope classpath.
|
||||||
|
* <p>
|
||||||
|
* By default, this collects all the jar files in the {@link #libProvidedDirectory()}
|
||||||
|
* and adds all the jar files from the provided scope local dependencies.
|
||||||
|
*
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
public List<File> providedClasspathJars() {
|
||||||
|
// detect the jar files in the provided lib directory
|
||||||
|
var dir_abs = libProvidedDirectory().getAbsoluteFile();
|
||||||
|
var jar_files = FileUtils.getFileList(dir_abs, INCLUDED_JARS, EXCLUDED_JARS);
|
||||||
|
|
||||||
|
// build the compilation classpath
|
||||||
|
var classpath = new ArrayList<>(jar_files.stream().map(file -> new File(dir_abs, file)).toList());
|
||||||
addLocalDependencies(classpath, Scope.provided);
|
addLocalDependencies(classpath, Scope.provided);
|
||||||
return classpath;
|
return classpath;
|
||||||
}
|
}
|
||||||
|
@ -1491,7 +1527,7 @@ public class BaseProject extends BuildExecutor {
|
||||||
* @since 1.5
|
* @since 1.5
|
||||||
*/
|
*/
|
||||||
public List<String> compileMainClasspath() {
|
public List<String> compileMainClasspath() {
|
||||||
return FileUtils.combineToAbsolutePaths(compileClasspathJars());
|
return FileUtils.combineToAbsolutePaths(compileClasspathJars(), providedClasspathJars());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1505,7 +1541,7 @@ public class BaseProject extends BuildExecutor {
|
||||||
public List<String> compileTestClasspath() {
|
public List<String> compileTestClasspath() {
|
||||||
var paths = new ArrayList<String>();
|
var paths = new ArrayList<String>();
|
||||||
paths.add(buildMainDirectory().getAbsolutePath());
|
paths.add(buildMainDirectory().getAbsolutePath());
|
||||||
paths.addAll(FileUtils.combineToAbsolutePaths(compileClasspathJars(), testClasspathJars()));
|
paths.addAll(FileUtils.combineToAbsolutePaths(compileClasspathJars(), providedClasspathJars(), testClasspathJars()));
|
||||||
return paths;
|
return paths;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1542,7 +1578,7 @@ public class BaseProject extends BuildExecutor {
|
||||||
paths.add(srcTestResourcesDirectory().getAbsolutePath());
|
paths.add(srcTestResourcesDirectory().getAbsolutePath());
|
||||||
paths.add(buildMainDirectory().getAbsolutePath());
|
paths.add(buildMainDirectory().getAbsolutePath());
|
||||||
paths.add(buildTestDirectory().getAbsolutePath());
|
paths.add(buildTestDirectory().getAbsolutePath());
|
||||||
paths.addAll(FileUtils.combineToAbsolutePaths(compileClasspathJars(), runtimeClasspathJars(), standaloneClasspathJars(), testClasspathJars()));
|
paths.addAll(FileUtils.combineToAbsolutePaths(compileClasspathJars(), providedClasspathJars(), runtimeClasspathJars(), standaloneClasspathJars(), testClasspathJars()));
|
||||||
return paths;
|
return paths;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -73,8 +73,23 @@ public class DependencyScopes extends LinkedHashMap<Scope, DependencySet> {
|
||||||
*/
|
*/
|
||||||
public DependencySet resolveCompileDependencies(ArtifactRetriever retriever, List<Repository> repositories) {
|
public DependencySet resolveCompileDependencies(ArtifactRetriever retriever, List<Repository> repositories) {
|
||||||
return resolveScopedDependencies(retriever, repositories,
|
return resolveScopedDependencies(retriever, repositories,
|
||||||
new Scope[]{Scope.provided, Scope.compile},
|
|
||||||
new Scope[]{Scope.compile},
|
new Scope[]{Scope.compile},
|
||||||
|
new Scope[]{Scope.compile},
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the transitive set of dependencies that would be used for the provided scope in a project.
|
||||||
|
*
|
||||||
|
* @param retriever the retriever to use to get artifacts
|
||||||
|
* @param repositories the repositories to use for the resolution
|
||||||
|
* @return the provided scope dependency set
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
public DependencySet resolveProvidedDependencies(ArtifactRetriever retriever, List<Repository> repositories) {
|
||||||
|
return resolveScopedDependencies(retriever, repositories,
|
||||||
|
new Scope[]{Scope.provided},
|
||||||
|
new Scope[]{Scope.compile, Scope.runtime},
|
||||||
null);
|
null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,7 +103,7 @@ public class DependencyScopes extends LinkedHashMap<Scope, DependencySet> {
|
||||||
*/
|
*/
|
||||||
public DependencySet resolveRuntimeDependencies(ArtifactRetriever retriever, List<Repository> repositories) {
|
public DependencySet resolveRuntimeDependencies(ArtifactRetriever retriever, List<Repository> repositories) {
|
||||||
return resolveScopedDependencies(retriever, repositories,
|
return resolveScopedDependencies(retriever, repositories,
|
||||||
new Scope[]{Scope.provided, Scope.compile, Scope.runtime},
|
new Scope[]{Scope.compile, Scope.runtime},
|
||||||
new Scope[]{Scope.compile, Scope.runtime},
|
new Scope[]{Scope.compile, Scope.runtime},
|
||||||
resolveCompileDependencies(retriever, repositories));
|
resolveCompileDependencies(retriever, repositories));
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,6 +28,7 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
|
||||||
private final List<Repository> repositories_ = new ArrayList<>();
|
private final List<Repository> repositories_ = new ArrayList<>();
|
||||||
private final DependencyScopes dependencies_ = new DependencyScopes();
|
private final DependencyScopes dependencies_ = new DependencyScopes();
|
||||||
private File libCompileDirectory_;
|
private File libCompileDirectory_;
|
||||||
|
private File libProvidedDirectory_;
|
||||||
private File libRuntimeDirectory_;
|
private File libRuntimeDirectory_;
|
||||||
private File libStandaloneDirectory_;
|
private File libStandaloneDirectory_;
|
||||||
private File libTestDirectory_;
|
private File libTestDirectory_;
|
||||||
|
@ -41,6 +42,7 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
|
||||||
*/
|
*/
|
||||||
public void execute() {
|
public void execute() {
|
||||||
executeDownloadCompileDependencies();
|
executeDownloadCompileDependencies();
|
||||||
|
executeDownloadProvidedDependencies();
|
||||||
executeDownloadRuntimeDependencies();
|
executeDownloadRuntimeDependencies();
|
||||||
executeDownloadStandaloneDependencies();
|
executeDownloadStandaloneDependencies();
|
||||||
executeDownloadTestDependencies();
|
executeDownloadTestDependencies();
|
||||||
|
@ -58,6 +60,15 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
|
||||||
executeDownloadDependencies(libCompileDirectory(), dependencies().resolveCompileDependencies(artifactRetriever(), repositories()));
|
executeDownloadDependencies(libCompileDirectory(), dependencies().resolveCompileDependencies(artifactRetriever(), repositories()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Part of the {@link #execute} operation, download the {@code provided} scope artifacts.
|
||||||
|
*
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
protected void executeDownloadProvidedDependencies() {
|
||||||
|
executeDownloadDependencies(libProvidedDirectory(), dependencies().resolveProvidedDependencies(artifactRetriever(), repositories()));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Part of the {@link #execute} operation, download the {@code runtime} scope artifacts.
|
* Part of the {@link #execute} operation, download the {@code runtime} scope artifacts.
|
||||||
*
|
*
|
||||||
|
@ -123,6 +134,7 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
|
||||||
.repositories(project.repositories())
|
.repositories(project.repositories())
|
||||||
.dependencies(project.dependencies())
|
.dependencies(project.dependencies())
|
||||||
.libCompileDirectory(project.libCompileDirectory())
|
.libCompileDirectory(project.libCompileDirectory())
|
||||||
|
.libProvidedDirectory(project.libProvidedDirectory())
|
||||||
.libRuntimeDirectory(project.libRuntimeDirectory())
|
.libRuntimeDirectory(project.libRuntimeDirectory())
|
||||||
.libStandaloneDirectory(project.libStandaloneDirectory())
|
.libStandaloneDirectory(project.libStandaloneDirectory())
|
||||||
.libTestDirectory(project.libTestDirectory())
|
.libTestDirectory(project.libTestDirectory())
|
||||||
|
@ -180,6 +192,18 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides the {@code provided} scope download directory.
|
||||||
|
*
|
||||||
|
* @param directory the directory to download the {@code provided} scope artifacts into
|
||||||
|
* @return this operation instance
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
public DownloadOperation libProvidedDirectory(File directory) {
|
||||||
|
libProvidedDirectory_ = directory;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides the {@code runtime} scope download directory.
|
* Provides the {@code runtime} scope download directory.
|
||||||
*
|
*
|
||||||
|
@ -288,6 +312,16 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
|
||||||
return libCompileDirectory_;
|
return libCompileDirectory_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves the {@code provided} scope download directory.
|
||||||
|
*
|
||||||
|
* @return the {@code provided} scope download directory
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
public File libProvidedDirectory() {
|
||||||
|
return libProvidedDirectory_;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the {@code runtime} scope download directory.
|
* Retrieves the {@code runtime} scope download directory.
|
||||||
*
|
*
|
||||||
|
|
|
@ -28,6 +28,7 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
|
||||||
private final List<Repository> repositories_ = new ArrayList<>();
|
private final List<Repository> repositories_ = new ArrayList<>();
|
||||||
private final DependencyScopes dependencies_ = new DependencyScopes();
|
private final DependencyScopes dependencies_ = new DependencyScopes();
|
||||||
private File libCompileDirectory_;
|
private File libCompileDirectory_;
|
||||||
|
private File libProvidedDirectory_;
|
||||||
private File libRuntimeDirectory_;
|
private File libRuntimeDirectory_;
|
||||||
private File libStandaloneDirectory_;
|
private File libStandaloneDirectory_;
|
||||||
private File libTestDirectory_;
|
private File libTestDirectory_;
|
||||||
|
@ -41,6 +42,7 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
|
||||||
*/
|
*/
|
||||||
public void execute() {
|
public void execute() {
|
||||||
executePurgeCompileDependencies();
|
executePurgeCompileDependencies();
|
||||||
|
executePurgeProvidedDependencies();
|
||||||
executePurgeRuntimeDependencies();
|
executePurgeRuntimeDependencies();
|
||||||
executePurgeStandaloneDependencies();
|
executePurgeStandaloneDependencies();
|
||||||
executePurgeTestDependencies();
|
executePurgeTestDependencies();
|
||||||
|
@ -58,6 +60,15 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
|
||||||
executePurgeDependencies(libCompileDirectory(), dependencies().resolveCompileDependencies(artifactRetriever(), repositories()));
|
executePurgeDependencies(libCompileDirectory(), dependencies().resolveCompileDependencies(artifactRetriever(), repositories()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Part of the {@link #execute} operation, purge the {@code provided} scope artifacts.
|
||||||
|
*
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
protected void executePurgeProvidedDependencies() {
|
||||||
|
executePurgeDependencies(libProvidedDirectory(), dependencies().resolveProvidedDependencies(artifactRetriever(), repositories()));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Part of the {@link #execute} operation, purge the {@code runtime} scope artifacts.
|
* Part of the {@link #execute} operation, purge the {@code runtime} scope artifacts.
|
||||||
*
|
*
|
||||||
|
@ -137,6 +148,7 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
|
||||||
.repositories(project.repositories())
|
.repositories(project.repositories())
|
||||||
.dependencies(project.dependencies())
|
.dependencies(project.dependencies())
|
||||||
.libCompileDirectory(project.libCompileDirectory())
|
.libCompileDirectory(project.libCompileDirectory())
|
||||||
|
.libProvidedDirectory(project.libProvidedDirectory())
|
||||||
.libRuntimeDirectory(project.libRuntimeDirectory())
|
.libRuntimeDirectory(project.libRuntimeDirectory())
|
||||||
.libStandaloneDirectory(project.libStandaloneDirectory())
|
.libStandaloneDirectory(project.libStandaloneDirectory())
|
||||||
.libTestDirectory(project.libTestDirectory())
|
.libTestDirectory(project.libTestDirectory())
|
||||||
|
@ -220,6 +232,18 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides the {@code provided} scope purge directory.
|
||||||
|
*
|
||||||
|
* @param directory the directory to purge the {@code provided} scope artifacts from
|
||||||
|
* @return this operation instance
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
public PurgeOperation libProvidedDirectory(File directory) {
|
||||||
|
libProvidedDirectory_ = directory;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides the {@code runtime} scope purge directory.
|
* Provides the {@code runtime} scope purge directory.
|
||||||
*
|
*
|
||||||
|
@ -302,6 +326,16 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
|
||||||
return libCompileDirectory_;
|
return libCompileDirectory_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves the {@code provided} scope purge directory.
|
||||||
|
*
|
||||||
|
* @return the {@code provided} scope purge directory
|
||||||
|
* @since 1.8
|
||||||
|
*/
|
||||||
|
public File libProvidedDirectory() {
|
||||||
|
return libProvidedDirectory_;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the {@code runtime} scope purge directory.
|
* Retrieves the {@code runtime} scope purge directory.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
1.7.6-SNAPSHOT
|
1.8.0-SNAPSHOT
|
|
@ -2,12 +2,16 @@
|
||||||
<library name="compile">
|
<library name="compile">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -2,13 +2,17 @@
|
||||||
<library name="test">
|
<library name="test">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -9,6 +9,7 @@
|
||||||
"java.project.referencedLibraries": [
|
"java.project.referencedLibraries": [
|
||||||
"${HOME}/.bld/dist/bld-{{v version/}}.jar",
|
"${HOME}/.bld/dist/bld-{{v version/}}.jar",
|
||||||
"lib/compile/*.jar",
|
"lib/compile/*.jar",
|
||||||
|
"lib/provided/*.jar",
|
||||||
"lib/runtime/*.jar",
|
"lib/runtime/*.jar",
|
||||||
"lib/test/*.jar"
|
"lib/test/*.jar"
|
||||||
]
|
]
|
||||||
|
|
|
@ -2,12 +2,16 @@
|
||||||
<library name="compile">
|
<library name="compile">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -2,13 +2,17 @@
|
||||||
<library name="test">
|
<library name="test">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -9,6 +9,7 @@
|
||||||
"java.project.referencedLibraries": [
|
"java.project.referencedLibraries": [
|
||||||
"${HOME}/.bld/dist/bld-{{v version/}}.jar",
|
"${HOME}/.bld/dist/bld-{{v version/}}.jar",
|
||||||
"lib/compile/*.jar",
|
"lib/compile/*.jar",
|
||||||
|
"lib/provided/*.jar",
|
||||||
"lib/runtime/*.jar",
|
"lib/runtime/*.jar",
|
||||||
"lib/test/*.jar"
|
"lib/test/*.jar"
|
||||||
]
|
]
|
||||||
|
|
|
@ -2,12 +2,16 @@
|
||||||
<library name="compile">
|
<library name="compile">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -2,13 +2,17 @@
|
||||||
<library name="test">
|
<library name="test">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -9,6 +9,7 @@
|
||||||
"java.project.referencedLibraries": [
|
"java.project.referencedLibraries": [
|
||||||
"${HOME}/.bld/dist/bld-{{v version/}}.jar",
|
"${HOME}/.bld/dist/bld-{{v version/}}.jar",
|
||||||
"lib/compile/*.jar",
|
"lib/compile/*.jar",
|
||||||
|
"lib/provided/*.jar",
|
||||||
"lib/runtime/*.jar",
|
"lib/runtime/*.jar",
|
||||||
"lib/test/*.jar"
|
"lib/test/*.jar"
|
||||||
]
|
]
|
||||||
|
|
|
@ -2,12 +2,16 @@
|
||||||
<library name="compile">
|
<library name="compile">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -2,13 +2,17 @@
|
||||||
<library name="test">
|
<library name="test">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
<root url="file://$PROJECT_DIR$/src/test/resources" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
|
<root url="file://$PROJECT_DIR$/lib/provided" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
|
@ -10,6 +10,7 @@
|
||||||
"java.project.referencedLibraries": [
|
"java.project.referencedLibraries": [
|
||||||
"${HOME}/.bld/dist/bld-{{v version/}}.jar",
|
"${HOME}/.bld/dist/bld-{{v version/}}.jar",
|
||||||
"lib/compile/*.jar",
|
"lib/compile/*.jar",
|
||||||
|
"lib/provided/*.jar",
|
||||||
"lib/runtime/*.jar",
|
"lib/runtime/*.jar",
|
||||||
"lib/standalone/*.jar",
|
"lib/standalone/*.jar",
|
||||||
"lib/test/*.jar"
|
"lib/test/*.jar"
|
||||||
|
|
|
@ -307,6 +307,7 @@ public class TestProject {
|
||||||
/lib/bld/bld-build.hash
|
/lib/bld/bld-build.hash
|
||||||
/lib/compile
|
/lib/compile
|
||||||
/lib/compile/rife2-1.5.11.jar
|
/lib/compile/rife2-1.5.11.jar
|
||||||
|
/lib/provided
|
||||||
/lib/runtime
|
/lib/runtime
|
||||||
/lib/test
|
/lib/test
|
||||||
/lib/test/apiguardian-api-1.1.2.jar
|
/lib/test/apiguardian-api-1.1.2.jar
|
||||||
|
@ -321,6 +322,7 @@ public class TestProject {
|
||||||
/lib/test/opentest4j-1.2.0.jar""", FileUtils.generateDirectoryListing(tmp));
|
/lib/test/opentest4j-1.2.0.jar""", FileUtils.generateDirectoryListing(tmp));
|
||||||
|
|
||||||
FileUtils.deleteDirectory(new File(tmp, "lib/compile"));
|
FileUtils.deleteDirectory(new File(tmp, "lib/compile"));
|
||||||
|
FileUtils.deleteDirectory(new File(tmp, "lib/provided"));
|
||||||
FileUtils.deleteDirectory(new File(tmp, "lib/runtime"));
|
FileUtils.deleteDirectory(new File(tmp, "lib/runtime"));
|
||||||
FileUtils.deleteDirectory(new File(tmp, "lib/test"));
|
FileUtils.deleteDirectory(new File(tmp, "lib/test"));
|
||||||
assertEquals("""
|
assertEquals("""
|
||||||
|
@ -346,6 +348,7 @@ public class TestProject {
|
||||||
/lib/bld/bld-build.hash
|
/lib/bld/bld-build.hash
|
||||||
/lib/compile
|
/lib/compile
|
||||||
/lib/compile/rife2-1.5.12.jar
|
/lib/compile/rife2-1.5.12.jar
|
||||||
|
/lib/provided
|
||||||
/lib/runtime
|
/lib/runtime
|
||||||
/lib/test
|
/lib/test
|
||||||
/lib/test/apiguardian-api-1.1.2.jar
|
/lib/test/apiguardian-api-1.1.2.jar
|
||||||
|
@ -369,6 +372,7 @@ public class TestProject {
|
||||||
/lib/bld/bld-build.hash
|
/lib/bld/bld-build.hash
|
||||||
/lib/compile
|
/lib/compile
|
||||||
/lib/compile/rife2-1.5.15.jar
|
/lib/compile/rife2-1.5.15.jar
|
||||||
|
/lib/provided
|
||||||
/lib/runtime
|
/lib/runtime
|
||||||
/lib/test
|
/lib/test
|
||||||
/lib/test/apiguardian-api-1.1.2.jar
|
/lib/test/apiguardian-api-1.1.2.jar
|
||||||
|
|
|
@ -116,6 +116,7 @@ public class TestCleanOperation {
|
||||||
/lib
|
/lib
|
||||||
/lib/bld
|
/lib/bld
|
||||||
/lib/compile
|
/lib/compile
|
||||||
|
/lib/provided
|
||||||
/lib/runtime
|
/lib/runtime
|
||||||
/lib/standalone
|
/lib/standalone
|
||||||
/lib/test
|
/lib/test
|
||||||
|
@ -139,6 +140,7 @@ public class TestCleanOperation {
|
||||||
/lib
|
/lib
|
||||||
/lib/bld
|
/lib/bld
|
||||||
/lib/compile
|
/lib/compile
|
||||||
|
/lib/provided
|
||||||
/lib/runtime
|
/lib/runtime
|
||||||
/lib/standalone
|
/lib/standalone
|
||||||
/lib/test
|
/lib/test
|
||||||
|
|
|
@ -88,6 +88,7 @@ public class TestCreateBaseOperation {
|
||||||
/myapp/lib/bld/bld-wrapper\\.jar
|
/myapp/lib/bld/bld-wrapper\\.jar
|
||||||
/myapp/lib/bld/bld-wrapper\\.properties
|
/myapp/lib/bld/bld-wrapper\\.properties
|
||||||
/myapp/lib/compile
|
/myapp/lib/compile
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
/myapp/src
|
/myapp/src
|
||||||
|
@ -149,6 +150,7 @@ public class TestCreateBaseOperation {
|
||||||
/myapp/lib/bld/bld-wrapper\\.jar
|
/myapp/lib/bld/bld-wrapper\\.jar
|
||||||
/myapp/lib/bld/bld-wrapper\\.properties
|
/myapp/lib/bld/bld-wrapper\\.properties
|
||||||
/myapp/lib/compile
|
/myapp/lib/compile
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
/myapp/src
|
/myapp/src
|
||||||
|
@ -223,6 +225,7 @@ public class TestCreateBaseOperation {
|
||||||
/yourthing/lib/bld/bld-wrapper.jar
|
/yourthing/lib/bld/bld-wrapper.jar
|
||||||
/yourthing/lib/bld/bld-wrapper.properties
|
/yourthing/lib/bld/bld-wrapper.properties
|
||||||
/yourthing/lib/compile
|
/yourthing/lib/compile
|
||||||
|
/yourthing/lib/provided
|
||||||
/yourthing/lib/runtime
|
/yourthing/lib/runtime
|
||||||
/yourthing/lib/test
|
/yourthing/lib/test
|
||||||
/yourthing/src
|
/yourthing/src
|
||||||
|
@ -285,6 +288,7 @@ public class TestCreateBaseOperation {
|
||||||
/yourthing/lib/bld/bld-wrapper.jar
|
/yourthing/lib/bld/bld-wrapper.jar
|
||||||
/yourthing/lib/bld/bld-wrapper.properties
|
/yourthing/lib/bld/bld-wrapper.properties
|
||||||
/yourthing/lib/compile
|
/yourthing/lib/compile
|
||||||
|
/yourthing/lib/provided
|
||||||
/yourthing/lib/runtime
|
/yourthing/lib/runtime
|
||||||
/yourthing/lib/test
|
/yourthing/lib/test
|
||||||
/yourthing/src
|
/yourthing/src
|
||||||
|
|
|
@ -95,6 +95,7 @@ public class TestCreateBlankOperation {
|
||||||
/myapp/lib/bld/bld-wrapper\\.jar
|
/myapp/lib/bld/bld-wrapper\\.jar
|
||||||
/myapp/lib/bld/bld-wrapper\\.properties
|
/myapp/lib/bld/bld-wrapper\\.properties
|
||||||
/myapp/lib/compile
|
/myapp/lib/compile
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
/myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
|
/myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
|
||||||
|
@ -174,6 +175,7 @@ public class TestCreateBlankOperation {
|
||||||
/myapp/lib/bld/bld-wrapper\\.jar
|
/myapp/lib/bld/bld-wrapper\\.jar
|
||||||
/myapp/lib/bld/bld-wrapper\\.properties
|
/myapp/lib/bld/bld-wrapper\\.properties
|
||||||
/myapp/lib/compile
|
/myapp/lib/compile
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
/myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
|
/myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
|
||||||
|
@ -266,6 +268,7 @@ public class TestCreateBlankOperation {
|
||||||
/yourthing/lib/bld/bld-wrapper.jar
|
/yourthing/lib/bld/bld-wrapper.jar
|
||||||
/yourthing/lib/bld/bld-wrapper.properties
|
/yourthing/lib/bld/bld-wrapper.properties
|
||||||
/yourthing/lib/compile
|
/yourthing/lib/compile
|
||||||
|
/yourthing/lib/provided
|
||||||
/yourthing/lib/runtime
|
/yourthing/lib/runtime
|
||||||
/yourthing/lib/test
|
/yourthing/lib/test
|
||||||
/yourthing/src
|
/yourthing/src
|
||||||
|
@ -390,6 +393,7 @@ public class TestCreateBlankOperation {
|
||||||
/myapp/lib/local/junit-platform-engine-1\\.10\\.0\\.jar
|
/myapp/lib/local/junit-platform-engine-1\\.10\\.0\\.jar
|
||||||
/myapp/lib/local/opentest4j-1\\.3\\.0-sources\\.jar
|
/myapp/lib/local/opentest4j-1\\.3\\.0-sources\\.jar
|
||||||
/myapp/lib/local/opentest4j-1\\.3\\.0\\.jar
|
/myapp/lib/local/opentest4j-1\\.3\\.0\\.jar
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
/myapp/src
|
/myapp/src
|
||||||
|
@ -511,6 +515,7 @@ public class TestCreateBlankOperation {
|
||||||
/myapp/lib/local_test/junit-platform-engine-1\\.10\\.0\\.jar
|
/myapp/lib/local_test/junit-platform-engine-1\\.10\\.0\\.jar
|
||||||
/myapp/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar
|
/myapp/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar
|
||||||
/myapp/lib/local_test/opentest4j-1\\.3\\.0\\.jar
|
/myapp/lib/local_test/opentest4j-1\\.3\\.0\\.jar
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
/myapp/src
|
/myapp/src
|
||||||
|
|
|
@ -86,6 +86,7 @@ public class TestCreateLibOperation {
|
||||||
/myapp/lib/bld/bld-wrapper.jar
|
/myapp/lib/bld/bld-wrapper.jar
|
||||||
/myapp/lib/bld/bld-wrapper.properties
|
/myapp/lib/bld/bld-wrapper.properties
|
||||||
/myapp/lib/compile
|
/myapp/lib/compile
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
/myapp/src
|
/myapp/src
|
||||||
|
@ -146,6 +147,7 @@ public class TestCreateLibOperation {
|
||||||
/myapp/lib/bld/bld-wrapper.jar
|
/myapp/lib/bld/bld-wrapper.jar
|
||||||
/myapp/lib/bld/bld-wrapper.properties
|
/myapp/lib/bld/bld-wrapper.properties
|
||||||
/myapp/lib/compile
|
/myapp/lib/compile
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
/myapp/src
|
/myapp/src
|
||||||
|
@ -220,6 +222,7 @@ public class TestCreateLibOperation {
|
||||||
/yourthing/lib/bld/bld-wrapper.jar
|
/yourthing/lib/bld/bld-wrapper.jar
|
||||||
/yourthing/lib/bld/bld-wrapper.properties
|
/yourthing/lib/bld/bld-wrapper.properties
|
||||||
/yourthing/lib/compile
|
/yourthing/lib/compile
|
||||||
|
/yourthing/lib/provided
|
||||||
/yourthing/lib/runtime
|
/yourthing/lib/runtime
|
||||||
/yourthing/lib/test
|
/yourthing/lib/test
|
||||||
/yourthing/src
|
/yourthing/src
|
||||||
|
@ -281,6 +284,7 @@ public class TestCreateLibOperation {
|
||||||
/yourthing/lib/bld/bld-wrapper.jar
|
/yourthing/lib/bld/bld-wrapper.jar
|
||||||
/yourthing/lib/bld/bld-wrapper.properties
|
/yourthing/lib/bld/bld-wrapper.properties
|
||||||
/yourthing/lib/compile
|
/yourthing/lib/compile
|
||||||
|
/yourthing/lib/provided
|
||||||
/yourthing/lib/runtime
|
/yourthing/lib/runtime
|
||||||
/yourthing/lib/test
|
/yourthing/lib/test
|
||||||
/yourthing/src
|
/yourthing/src
|
||||||
|
|
|
@ -102,6 +102,7 @@ public class TestCreateRife2Operation {
|
||||||
/myapp/lib/compile
|
/myapp/lib/compile
|
||||||
/myapp/lib/compile/rife2-.+-sources\\.jar
|
/myapp/lib/compile/rife2-.+-sources\\.jar
|
||||||
/myapp/lib/compile/rife2-.+\\.jar
|
/myapp/lib/compile/rife2-.+\\.jar
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/standalone
|
/myapp/lib/standalone
|
||||||
/myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
|
/myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
|
||||||
|
@ -215,6 +216,7 @@ public class TestCreateRife2Operation {
|
||||||
/myapp/lib/compile
|
/myapp/lib/compile
|
||||||
/myapp/lib/compile/rife2-.+-sources\\.jar
|
/myapp/lib/compile/rife2-.+-sources\\.jar
|
||||||
/myapp/lib/compile/rife2-.+\\.jar
|
/myapp/lib/compile/rife2-.+\\.jar
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/standalone
|
/myapp/lib/standalone
|
||||||
/myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
|
/myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
|
||||||
|
@ -345,6 +347,7 @@ public class TestCreateRife2Operation {
|
||||||
/yourthing/lib/bld/bld-wrapper.jar
|
/yourthing/lib/bld/bld-wrapper.jar
|
||||||
/yourthing/lib/bld/bld-wrapper.properties
|
/yourthing/lib/bld/bld-wrapper.properties
|
||||||
/yourthing/lib/compile
|
/yourthing/lib/compile
|
||||||
|
/yourthing/lib/provided
|
||||||
/yourthing/lib/runtime
|
/yourthing/lib/runtime
|
||||||
/yourthing/lib/standalone
|
/yourthing/lib/standalone
|
||||||
/yourthing/lib/test
|
/yourthing/lib/test
|
||||||
|
@ -508,6 +511,7 @@ public class TestCreateRife2Operation {
|
||||||
/myapp/lib/local/slf4j-api-2\\.0\\.9\\.jar
|
/myapp/lib/local/slf4j-api-2\\.0\\.9\\.jar
|
||||||
/myapp/lib/local/slf4j-simple-2\\.0\\.9-sources\\.jar
|
/myapp/lib/local/slf4j-simple-2\\.0\\.9-sources\\.jar
|
||||||
/myapp/lib/local/slf4j-simple-2\\.0\\.9\\.jar
|
/myapp/lib/local/slf4j-simple-2\\.0\\.9\\.jar
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/standalone
|
/myapp/lib/standalone
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
|
@ -677,6 +681,7 @@ public class TestCreateRife2Operation {
|
||||||
/myapp/lib/local_test/junit-platform-engine-1\\.10\\.0\\.jar
|
/myapp/lib/local_test/junit-platform-engine-1\\.10\\.0\\.jar
|
||||||
/myapp/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar
|
/myapp/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar
|
||||||
/myapp/lib/local_test/opentest4j-1\\.3\\.0\\.jar
|
/myapp/lib/local_test/opentest4j-1\\.3\\.0\\.jar
|
||||||
|
/myapp/lib/provided
|
||||||
/myapp/lib/runtime
|
/myapp/lib/runtime
|
||||||
/myapp/lib/standalone
|
/myapp/lib/standalone
|
||||||
/myapp/lib/test
|
/myapp/lib/test
|
||||||
|
|
|
@ -22,6 +22,7 @@ public class TestDownloadOperation {
|
||||||
assertTrue(operation.dependencies().isEmpty());
|
assertTrue(operation.dependencies().isEmpty());
|
||||||
assertTrue(operation.repositories().isEmpty());
|
assertTrue(operation.repositories().isEmpty());
|
||||||
assertNull(operation.libCompileDirectory());
|
assertNull(operation.libCompileDirectory());
|
||||||
|
assertNull(operation.libProvidedDirectory());
|
||||||
assertNull(operation.libRuntimeDirectory());
|
assertNull(operation.libRuntimeDirectory());
|
||||||
assertNull(operation.libStandaloneDirectory());
|
assertNull(operation.libStandaloneDirectory());
|
||||||
assertNull(operation.libTestDirectory());
|
assertNull(operation.libTestDirectory());
|
||||||
|
@ -37,13 +38,15 @@ public class TestDownloadOperation {
|
||||||
var dir2 = new File("dir2");
|
var dir2 = new File("dir2");
|
||||||
var dir3 = new File("dir3");
|
var dir3 = new File("dir3");
|
||||||
var dir4 = new File("dir4");
|
var dir4 = new File("dir4");
|
||||||
|
var dir5 = new File("dir5");
|
||||||
|
|
||||||
var operation1 = new DownloadOperation()
|
var operation1 = new DownloadOperation()
|
||||||
.repositories(List.of(repository1, repository2))
|
.repositories(List.of(repository1, repository2))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4);
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5);
|
||||||
var dependency_scopes = new DependencyScopes();
|
var dependency_scopes = new DependencyScopes();
|
||||||
dependency_scopes.scope(Scope.compile).include(dependency1).include(dependency2);
|
dependency_scopes.scope(Scope.compile).include(dependency1).include(dependency2);
|
||||||
operation1.dependencies(dependency_scopes);
|
operation1.dependencies(dependency_scopes);
|
||||||
|
@ -52,15 +55,17 @@ public class TestDownloadOperation {
|
||||||
assertTrue(operation1.dependencies().scope(Scope.compile).contains(dependency1));
|
assertTrue(operation1.dependencies().scope(Scope.compile).contains(dependency1));
|
||||||
assertTrue(operation1.dependencies().scope(Scope.compile).contains(dependency2));
|
assertTrue(operation1.dependencies().scope(Scope.compile).contains(dependency2));
|
||||||
assertEquals(dir1, operation1.libCompileDirectory());
|
assertEquals(dir1, operation1.libCompileDirectory());
|
||||||
assertEquals(dir2, operation1.libRuntimeDirectory());
|
assertEquals(dir2, operation1.libProvidedDirectory());
|
||||||
assertEquals(dir3, operation1.libStandaloneDirectory());
|
assertEquals(dir3, operation1.libRuntimeDirectory());
|
||||||
assertEquals(dir4, operation1.libTestDirectory());
|
assertEquals(dir4, operation1.libStandaloneDirectory());
|
||||||
|
assertEquals(dir5, operation1.libTestDirectory());
|
||||||
|
|
||||||
var operation2 = new DownloadOperation()
|
var operation2 = new DownloadOperation()
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4);
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5);
|
||||||
operation2.repositories().add(repository1);
|
operation2.repositories().add(repository1);
|
||||||
operation2.repositories().add(repository2);
|
operation2.repositories().add(repository2);
|
||||||
operation2.dependencies().scope(Scope.compile).include(dependency1).include(dependency2);
|
operation2.dependencies().scope(Scope.compile).include(dependency1).include(dependency2);
|
||||||
|
@ -70,9 +75,10 @@ public class TestDownloadOperation {
|
||||||
assertTrue(operation2.dependencies().scope(Scope.compile).contains(dependency1));
|
assertTrue(operation2.dependencies().scope(Scope.compile).contains(dependency1));
|
||||||
assertTrue(operation2.dependencies().scope(Scope.compile).contains(dependency2));
|
assertTrue(operation2.dependencies().scope(Scope.compile).contains(dependency2));
|
||||||
assertEquals(dir1, operation2.libCompileDirectory());
|
assertEquals(dir1, operation2.libCompileDirectory());
|
||||||
assertEquals(dir2, operation2.libRuntimeDirectory());
|
assertEquals(dir2, operation2.libProvidedDirectory());
|
||||||
assertEquals(dir3, operation2.libStandaloneDirectory());
|
assertEquals(dir3, operation2.libRuntimeDirectory());
|
||||||
assertEquals(dir4, operation2.libTestDirectory());
|
assertEquals(dir4, operation2.libStandaloneDirectory());
|
||||||
|
assertEquals(dir5, operation2.libTestDirectory());
|
||||||
|
|
||||||
var operation3 = new DownloadOperation()
|
var operation3 = new DownloadOperation()
|
||||||
.repositories(repository1, repository2);
|
.repositories(repository1, repository2);
|
||||||
|
@ -89,19 +95,24 @@ public class TestDownloadOperation {
|
||||||
var dir2 = new File(tmp, "dir2");
|
var dir2 = new File(tmp, "dir2");
|
||||||
var dir3 = new File(tmp, "dir3");
|
var dir3 = new File(tmp, "dir3");
|
||||||
var dir4 = new File(tmp, "dir4");
|
var dir4 = new File(tmp, "dir4");
|
||||||
|
var dir5 = new File(tmp, "dir5");
|
||||||
dir1.mkdirs();
|
dir1.mkdirs();
|
||||||
dir2.mkdirs();
|
dir2.mkdirs();
|
||||||
dir3.mkdirs();
|
dir3.mkdirs();
|
||||||
dir4.mkdirs();
|
dir4.mkdirs();
|
||||||
|
dir5.mkdirs();
|
||||||
|
|
||||||
var operation = new DownloadOperation()
|
var operation = new DownloadOperation()
|
||||||
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4);
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5);
|
||||||
operation.dependencies().scope(Scope.compile)
|
operation.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
||||||
|
operation.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
|
||||||
operation.dependencies().scope(Scope.runtime)
|
operation.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
||||||
operation.dependencies().scope(Scope.standalone)
|
operation.dependencies().scope(Scope.standalone)
|
||||||
|
@ -115,15 +126,17 @@ public class TestDownloadOperation {
|
||||||
/dir1
|
/dir1
|
||||||
/dir1/commons-lang3-3.12.0.jar
|
/dir1/commons-lang3-3.12.0.jar
|
||||||
/dir2
|
/dir2
|
||||||
/dir2/commons-collections4-4.4.jar
|
/dir2/jakarta.servlet-api-6.0.0.jar
|
||||||
/dir3
|
/dir3
|
||||||
/dir3/slf4j-api-2.0.6.jar
|
/dir3/commons-collections4-4.4.jar
|
||||||
/dir3/slf4j-simple-2.0.6.jar
|
|
||||||
/dir4
|
/dir4
|
||||||
/dir4/httpclient5-5.2.1.jar
|
/dir4/slf4j-api-2.0.6.jar
|
||||||
/dir4/httpcore5-5.2.jar
|
/dir4/slf4j-simple-2.0.6.jar
|
||||||
/dir4/httpcore5-h2-5.2.jar
|
/dir5
|
||||||
/dir4/slf4j-api-1.7.36.jar""",
|
/dir5/httpclient5-5.2.1.jar
|
||||||
|
/dir5/httpcore5-5.2.jar
|
||||||
|
/dir5/httpcore5-h2-5.2.jar
|
||||||
|
/dir5/slf4j-api-1.7.36.jar""",
|
||||||
FileUtils.generateDirectoryListing(tmp));
|
FileUtils.generateDirectoryListing(tmp));
|
||||||
} finally {
|
} finally {
|
||||||
FileUtils.deleteDirectory(tmp);
|
FileUtils.deleteDirectory(tmp);
|
||||||
|
@ -139,21 +152,26 @@ public class TestDownloadOperation {
|
||||||
var dir2 = new File(tmp, "dir2");
|
var dir2 = new File(tmp, "dir2");
|
||||||
var dir3 = new File(tmp, "dir3");
|
var dir3 = new File(tmp, "dir3");
|
||||||
var dir4 = new File(tmp, "dir4");
|
var dir4 = new File(tmp, "dir4");
|
||||||
|
var dir5 = new File(tmp, "dir5");
|
||||||
dir1.mkdirs();
|
dir1.mkdirs();
|
||||||
dir2.mkdirs();
|
dir2.mkdirs();
|
||||||
dir3.mkdirs();
|
dir3.mkdirs();
|
||||||
dir4.mkdirs();
|
dir4.mkdirs();
|
||||||
|
dir5.mkdirs();
|
||||||
|
|
||||||
var operation = new DownloadOperation()
|
var operation = new DownloadOperation()
|
||||||
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4)
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5)
|
||||||
.downloadJavadoc(true)
|
.downloadJavadoc(true)
|
||||||
.downloadSources(true);
|
.downloadSources(true);
|
||||||
operation.dependencies().scope(Scope.compile)
|
operation.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
||||||
|
operation.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
|
||||||
operation.dependencies().scope(Scope.runtime)
|
operation.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
||||||
operation.dependencies().scope(Scope.standalone)
|
operation.dependencies().scope(Scope.standalone)
|
||||||
|
@ -169,29 +187,33 @@ public class TestDownloadOperation {
|
||||||
/dir1/commons-lang3-3.12.0-sources.jar
|
/dir1/commons-lang3-3.12.0-sources.jar
|
||||||
/dir1/commons-lang3-3.12.0.jar
|
/dir1/commons-lang3-3.12.0.jar
|
||||||
/dir2
|
/dir2
|
||||||
/dir2/commons-collections4-4.4-javadoc.jar
|
/dir2/jakarta.servlet-api-6.0.0-javadoc.jar
|
||||||
/dir2/commons-collections4-4.4-sources.jar
|
/dir2/jakarta.servlet-api-6.0.0-sources.jar
|
||||||
/dir2/commons-collections4-4.4.jar
|
/dir2/jakarta.servlet-api-6.0.0.jar
|
||||||
/dir3
|
/dir3
|
||||||
/dir3/slf4j-api-2.0.6-javadoc.jar
|
/dir3/commons-collections4-4.4-javadoc.jar
|
||||||
/dir3/slf4j-api-2.0.6-sources.jar
|
/dir3/commons-collections4-4.4-sources.jar
|
||||||
/dir3/slf4j-api-2.0.6.jar
|
/dir3/commons-collections4-4.4.jar
|
||||||
/dir3/slf4j-simple-2.0.6-javadoc.jar
|
|
||||||
/dir3/slf4j-simple-2.0.6-sources.jar
|
|
||||||
/dir3/slf4j-simple-2.0.6.jar
|
|
||||||
/dir4
|
/dir4
|
||||||
/dir4/httpclient5-5.2.1-javadoc.jar
|
/dir4/slf4j-api-2.0.6-javadoc.jar
|
||||||
/dir4/httpclient5-5.2.1-sources.jar
|
/dir4/slf4j-api-2.0.6-sources.jar
|
||||||
/dir4/httpclient5-5.2.1.jar
|
/dir4/slf4j-api-2.0.6.jar
|
||||||
/dir4/httpcore5-5.2-javadoc.jar
|
/dir4/slf4j-simple-2.0.6-javadoc.jar
|
||||||
/dir4/httpcore5-5.2-sources.jar
|
/dir4/slf4j-simple-2.0.6-sources.jar
|
||||||
/dir4/httpcore5-5.2.jar
|
/dir4/slf4j-simple-2.0.6.jar
|
||||||
/dir4/httpcore5-h2-5.2-javadoc.jar
|
/dir5
|
||||||
/dir4/httpcore5-h2-5.2-sources.jar
|
/dir5/httpclient5-5.2.1-javadoc.jar
|
||||||
/dir4/httpcore5-h2-5.2.jar
|
/dir5/httpclient5-5.2.1-sources.jar
|
||||||
/dir4/slf4j-api-1.7.36-javadoc.jar
|
/dir5/httpclient5-5.2.1.jar
|
||||||
/dir4/slf4j-api-1.7.36-sources.jar
|
/dir5/httpcore5-5.2-javadoc.jar
|
||||||
/dir4/slf4j-api-1.7.36.jar""",
|
/dir5/httpcore5-5.2-sources.jar
|
||||||
|
/dir5/httpcore5-5.2.jar
|
||||||
|
/dir5/httpcore5-h2-5.2-javadoc.jar
|
||||||
|
/dir5/httpcore5-h2-5.2-sources.jar
|
||||||
|
/dir5/httpcore5-h2-5.2.jar
|
||||||
|
/dir5/slf4j-api-1.7.36-javadoc.jar
|
||||||
|
/dir5/slf4j-api-1.7.36-sources.jar
|
||||||
|
/dir5/slf4j-api-1.7.36.jar""",
|
||||||
FileUtils.generateDirectoryListing(tmp));
|
FileUtils.generateDirectoryListing(tmp));
|
||||||
} finally {
|
} finally {
|
||||||
FileUtils.deleteDirectory(tmp);
|
FileUtils.deleteDirectory(tmp);
|
||||||
|
@ -216,6 +238,8 @@ public class TestDownloadOperation {
|
||||||
project.repositories().add(Repository.MAVEN_CENTRAL);
|
project.repositories().add(Repository.MAVEN_CENTRAL);
|
||||||
project.dependencies().scope(Scope.compile)
|
project.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
||||||
|
project.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
|
||||||
project.dependencies().scope(Scope.runtime)
|
project.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
||||||
project.dependencies().scope(Scope.standalone)
|
project.dependencies().scope(Scope.standalone)
|
||||||
|
@ -234,6 +258,9 @@ public class TestDownloadOperation {
|
||||||
/lib/compile
|
/lib/compile
|
||||||
/lib/compile/commons-lang3-3.12.0-sources.jar
|
/lib/compile/commons-lang3-3.12.0-sources.jar
|
||||||
/lib/compile/commons-lang3-3.12.0.jar
|
/lib/compile/commons-lang3-3.12.0.jar
|
||||||
|
/lib/provided
|
||||||
|
/lib/provided/jakarta.servlet-api-6.0.0-sources.jar
|
||||||
|
/lib/provided/jakarta.servlet-api-6.0.0.jar
|
||||||
/lib/runtime
|
/lib/runtime
|
||||||
/lib/runtime/commons-collections4-4.4-sources.jar
|
/lib/runtime/commons-collections4-4.4-sources.jar
|
||||||
/lib/runtime/commons-collections4-4.4.jar
|
/lib/runtime/commons-collections4-4.4.jar
|
||||||
|
@ -290,6 +317,7 @@ public class TestDownloadOperation {
|
||||||
/lib/compile
|
/lib/compile
|
||||||
/lib/compile/stripe-java-20.136.0-sources.jar
|
/lib/compile/stripe-java-20.136.0-sources.jar
|
||||||
/lib/compile/stripe-java-20.136.0.jar
|
/lib/compile/stripe-java-20.136.0.jar
|
||||||
|
/lib/provided
|
||||||
/lib/runtime
|
/lib/runtime
|
||||||
/lib/runtime/gson-2.9.0-sources.jar
|
/lib/runtime/gson-2.9.0-sources.jar
|
||||||
/lib/runtime/gson-2.9.0.jar
|
/lib/runtime/gson-2.9.0.jar
|
||||||
|
|
|
@ -22,6 +22,7 @@ public class TestPurgeOperation {
|
||||||
assertTrue(operation.dependencies().isEmpty());
|
assertTrue(operation.dependencies().isEmpty());
|
||||||
assertTrue(operation.repositories().isEmpty());
|
assertTrue(operation.repositories().isEmpty());
|
||||||
assertNull(operation.libCompileDirectory());
|
assertNull(operation.libCompileDirectory());
|
||||||
|
assertNull(operation.libProvidedDirectory());
|
||||||
assertNull(operation.libRuntimeDirectory());
|
assertNull(operation.libRuntimeDirectory());
|
||||||
assertNull(operation.libStandaloneDirectory());
|
assertNull(operation.libStandaloneDirectory());
|
||||||
assertNull(operation.libTestDirectory());
|
assertNull(operation.libTestDirectory());
|
||||||
|
@ -37,13 +38,15 @@ public class TestPurgeOperation {
|
||||||
var dir2 = new File("dir2");
|
var dir2 = new File("dir2");
|
||||||
var dir3 = new File("dir3");
|
var dir3 = new File("dir3");
|
||||||
var dir4 = new File("dir4");
|
var dir4 = new File("dir4");
|
||||||
|
var dir5 = new File("dir5");
|
||||||
|
|
||||||
var operation1 = new PurgeOperation()
|
var operation1 = new PurgeOperation()
|
||||||
.repositories(List.of(repository1, repository2))
|
.repositories(List.of(repository1, repository2))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4);
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5);
|
||||||
var dependency_scopes = new DependencyScopes();
|
var dependency_scopes = new DependencyScopes();
|
||||||
dependency_scopes.scope(Scope.compile).include(dependency1).include(dependency2);
|
dependency_scopes.scope(Scope.compile).include(dependency1).include(dependency2);
|
||||||
operation1.dependencies(dependency_scopes);
|
operation1.dependencies(dependency_scopes);
|
||||||
|
@ -52,15 +55,17 @@ public class TestPurgeOperation {
|
||||||
assertTrue(operation1.dependencies().scope(Scope.compile).contains(dependency1));
|
assertTrue(operation1.dependencies().scope(Scope.compile).contains(dependency1));
|
||||||
assertTrue(operation1.dependencies().scope(Scope.compile).contains(dependency2));
|
assertTrue(operation1.dependencies().scope(Scope.compile).contains(dependency2));
|
||||||
assertEquals(dir1, operation1.libCompileDirectory());
|
assertEquals(dir1, operation1.libCompileDirectory());
|
||||||
assertEquals(dir2, operation1.libRuntimeDirectory());
|
assertEquals(dir2, operation1.libProvidedDirectory());
|
||||||
assertEquals(dir3, operation1.libStandaloneDirectory());
|
assertEquals(dir3, operation1.libRuntimeDirectory());
|
||||||
assertEquals(dir4, operation1.libTestDirectory());
|
assertEquals(dir4, operation1.libStandaloneDirectory());
|
||||||
|
assertEquals(dir5, operation1.libTestDirectory());
|
||||||
|
|
||||||
var operation2 = new PurgeOperation()
|
var operation2 = new PurgeOperation()
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4);
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5);
|
||||||
operation2.repositories().add(repository1);
|
operation2.repositories().add(repository1);
|
||||||
operation2.repositories().add(repository2);
|
operation2.repositories().add(repository2);
|
||||||
operation2.dependencies().scope(Scope.compile).include(dependency1).include(dependency2);
|
operation2.dependencies().scope(Scope.compile).include(dependency1).include(dependency2);
|
||||||
|
@ -70,9 +75,10 @@ public class TestPurgeOperation {
|
||||||
assertTrue(operation2.dependencies().scope(Scope.compile).contains(dependency1));
|
assertTrue(operation2.dependencies().scope(Scope.compile).contains(dependency1));
|
||||||
assertTrue(operation2.dependencies().scope(Scope.compile).contains(dependency2));
|
assertTrue(operation2.dependencies().scope(Scope.compile).contains(dependency2));
|
||||||
assertEquals(dir1, operation2.libCompileDirectory());
|
assertEquals(dir1, operation2.libCompileDirectory());
|
||||||
assertEquals(dir2, operation2.libRuntimeDirectory());
|
assertEquals(dir2, operation2.libProvidedDirectory());
|
||||||
assertEquals(dir3, operation2.libStandaloneDirectory());
|
assertEquals(dir3, operation2.libRuntimeDirectory());
|
||||||
assertEquals(dir4, operation2.libTestDirectory());
|
assertEquals(dir4, operation2.libStandaloneDirectory());
|
||||||
|
assertEquals(dir5, operation2.libTestDirectory());
|
||||||
|
|
||||||
var operation3 = new PurgeOperation()
|
var operation3 = new PurgeOperation()
|
||||||
.repositories(repository1, repository2);
|
.repositories(repository1, repository2);
|
||||||
|
@ -89,19 +95,24 @@ public class TestPurgeOperation {
|
||||||
var dir2 = new File(tmp, "dir2");
|
var dir2 = new File(tmp, "dir2");
|
||||||
var dir3 = new File(tmp, "dir3");
|
var dir3 = new File(tmp, "dir3");
|
||||||
var dir4 = new File(tmp, "dir4");
|
var dir4 = new File(tmp, "dir4");
|
||||||
|
var dir5 = new File(tmp, "dir5");
|
||||||
dir1.mkdirs();
|
dir1.mkdirs();
|
||||||
dir2.mkdirs();
|
dir2.mkdirs();
|
||||||
dir3.mkdirs();
|
dir3.mkdirs();
|
||||||
dir4.mkdirs();
|
dir4.mkdirs();
|
||||||
|
dir5.mkdirs();
|
||||||
|
|
||||||
var operation_download1 = new DownloadOperation()
|
var operation_download1 = new DownloadOperation()
|
||||||
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4);
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5);
|
||||||
operation_download1.dependencies().scope(Scope.compile)
|
operation_download1.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 1)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 1)));
|
||||||
|
operation_download1.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5, 0, 0)));
|
||||||
operation_download1.dependencies().scope(Scope.runtime)
|
operation_download1.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 3)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 3)));
|
||||||
operation_download1.dependencies().scope(Scope.standalone)
|
operation_download1.dependencies().scope(Scope.standalone)
|
||||||
|
@ -114,11 +125,14 @@ public class TestPurgeOperation {
|
||||||
var operation_download2 = new DownloadOperation()
|
var operation_download2 = new DownloadOperation()
|
||||||
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4);
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5);
|
||||||
operation_download2.dependencies().scope(Scope.compile)
|
operation_download2.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
||||||
|
operation_download2.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
|
||||||
operation_download2.dependencies().scope(Scope.runtime)
|
operation_download2.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
||||||
operation_download2.dependencies().scope(Scope.standalone)
|
operation_download2.dependencies().scope(Scope.standalone)
|
||||||
|
@ -133,33 +147,39 @@ public class TestPurgeOperation {
|
||||||
/dir1/commons-lang3-3.1.jar
|
/dir1/commons-lang3-3.1.jar
|
||||||
/dir1/commons-lang3-3.12.0.jar
|
/dir1/commons-lang3-3.12.0.jar
|
||||||
/dir2
|
/dir2
|
||||||
/dir2/commons-collections4-4.3.jar
|
/dir2/jakarta.servlet-api-5.0.0.jar
|
||||||
/dir2/commons-collections4-4.4.jar
|
/dir2/jakarta.servlet-api-6.0.0.jar
|
||||||
/dir3
|
/dir3
|
||||||
/dir3/slf4j-api-2.0.0.jar
|
/dir3/commons-collections4-4.3.jar
|
||||||
/dir3/slf4j-api-2.0.6.jar
|
/dir3/commons-collections4-4.4.jar
|
||||||
/dir3/slf4j-simple-2.0.0.jar
|
|
||||||
/dir3/slf4j-simple-2.0.6.jar
|
|
||||||
/dir4
|
/dir4
|
||||||
/dir4/commons-codec-1.13.jar
|
/dir4/slf4j-api-2.0.0.jar
|
||||||
/dir4/httpclient5-5.0.jar
|
/dir4/slf4j-api-2.0.6.jar
|
||||||
/dir4/httpclient5-5.2.1.jar
|
/dir4/slf4j-simple-2.0.0.jar
|
||||||
/dir4/httpcore5-5.0.jar
|
/dir4/slf4j-simple-2.0.6.jar
|
||||||
/dir4/httpcore5-5.2.jar
|
/dir5
|
||||||
/dir4/httpcore5-h2-5.0.jar
|
/dir5/commons-codec-1.13.jar
|
||||||
/dir4/httpcore5-h2-5.2.jar
|
/dir5/httpclient5-5.0.jar
|
||||||
/dir4/slf4j-api-1.7.25.jar
|
/dir5/httpclient5-5.2.1.jar
|
||||||
/dir4/slf4j-api-1.7.36.jar""",
|
/dir5/httpcore5-5.0.jar
|
||||||
|
/dir5/httpcore5-5.2.jar
|
||||||
|
/dir5/httpcore5-h2-5.0.jar
|
||||||
|
/dir5/httpcore5-h2-5.2.jar
|
||||||
|
/dir5/slf4j-api-1.7.25.jar
|
||||||
|
/dir5/slf4j-api-1.7.36.jar""",
|
||||||
FileUtils.generateDirectoryListing(tmp));
|
FileUtils.generateDirectoryListing(tmp));
|
||||||
|
|
||||||
var operation_purge = new PurgeOperation()
|
var operation_purge = new PurgeOperation()
|
||||||
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4);
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5);
|
||||||
operation_purge.dependencies().scope(Scope.compile)
|
operation_purge.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
||||||
|
operation_purge.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
|
||||||
operation_purge.dependencies().scope(Scope.runtime)
|
operation_purge.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
||||||
operation_purge.dependencies().scope(Scope.standalone)
|
operation_purge.dependencies().scope(Scope.standalone)
|
||||||
|
@ -173,15 +193,17 @@ public class TestPurgeOperation {
|
||||||
/dir1
|
/dir1
|
||||||
/dir1/commons-lang3-3.12.0.jar
|
/dir1/commons-lang3-3.12.0.jar
|
||||||
/dir2
|
/dir2
|
||||||
/dir2/commons-collections4-4.4.jar
|
/dir2/jakarta.servlet-api-6.0.0.jar
|
||||||
/dir3
|
/dir3
|
||||||
/dir3/slf4j-api-2.0.6.jar
|
/dir3/commons-collections4-4.4.jar
|
||||||
/dir3/slf4j-simple-2.0.6.jar
|
|
||||||
/dir4
|
/dir4
|
||||||
/dir4/httpclient5-5.2.1.jar
|
/dir4/slf4j-api-2.0.6.jar
|
||||||
/dir4/httpcore5-5.2.jar
|
/dir4/slf4j-simple-2.0.6.jar
|
||||||
/dir4/httpcore5-h2-5.2.jar
|
/dir5
|
||||||
/dir4/slf4j-api-1.7.36.jar""",
|
/dir5/httpclient5-5.2.1.jar
|
||||||
|
/dir5/httpcore5-5.2.jar
|
||||||
|
/dir5/httpcore5-h2-5.2.jar
|
||||||
|
/dir5/slf4j-api-1.7.36.jar""",
|
||||||
FileUtils.generateDirectoryListing(tmp));
|
FileUtils.generateDirectoryListing(tmp));
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -198,21 +220,25 @@ public class TestPurgeOperation {
|
||||||
var dir2 = new File(tmp, "dir2");
|
var dir2 = new File(tmp, "dir2");
|
||||||
var dir3 = new File(tmp, "dir3");
|
var dir3 = new File(tmp, "dir3");
|
||||||
var dir4 = new File(tmp, "dir4");
|
var dir4 = new File(tmp, "dir4");
|
||||||
|
var dir5 = new File(tmp, "dir5");
|
||||||
dir1.mkdirs();
|
dir1.mkdirs();
|
||||||
dir2.mkdirs();
|
|
||||||
dir3.mkdirs();
|
dir3.mkdirs();
|
||||||
dir4.mkdirs();
|
dir4.mkdirs();
|
||||||
|
dir5.mkdirs();
|
||||||
|
|
||||||
var operation_download1 = new DownloadOperation()
|
var operation_download1 = new DownloadOperation()
|
||||||
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4)
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5)
|
||||||
.downloadJavadoc(true)
|
.downloadJavadoc(true)
|
||||||
.downloadSources(true);
|
.downloadSources(true);
|
||||||
operation_download1.dependencies().scope(Scope.compile)
|
operation_download1.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 1)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 1)));
|
||||||
|
operation_download1.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5, 0, 0)));
|
||||||
operation_download1.dependencies().scope(Scope.runtime)
|
operation_download1.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 3)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 3)));
|
||||||
operation_download1.dependencies().scope(Scope.standalone)
|
operation_download1.dependencies().scope(Scope.standalone)
|
||||||
|
@ -225,13 +251,16 @@ public class TestPurgeOperation {
|
||||||
var operation_download2 = new DownloadOperation()
|
var operation_download2 = new DownloadOperation()
|
||||||
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4)
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5)
|
||||||
.downloadJavadoc(true)
|
.downloadJavadoc(true)
|
||||||
.downloadSources(true);
|
.downloadSources(true);
|
||||||
operation_download2.dependencies().scope(Scope.compile)
|
operation_download2.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
||||||
|
operation_download2.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
|
||||||
operation_download2.dependencies().scope(Scope.runtime)
|
operation_download2.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
||||||
operation_download2.dependencies().scope(Scope.standalone)
|
operation_download2.dependencies().scope(Scope.standalone)
|
||||||
|
@ -250,65 +279,75 @@ public class TestPurgeOperation {
|
||||||
/dir1/commons-lang3-3.12.0-sources.jar
|
/dir1/commons-lang3-3.12.0-sources.jar
|
||||||
/dir1/commons-lang3-3.12.0.jar
|
/dir1/commons-lang3-3.12.0.jar
|
||||||
/dir2
|
/dir2
|
||||||
/dir2/commons-collections4-4.3-javadoc.jar
|
/dir2/jakarta.servlet-api-5.0.0-javadoc.jar
|
||||||
/dir2/commons-collections4-4.3-sources.jar
|
/dir2/jakarta.servlet-api-5.0.0-sources.jar
|
||||||
/dir2/commons-collections4-4.3.jar
|
/dir2/jakarta.servlet-api-5.0.0.jar
|
||||||
/dir2/commons-collections4-4.4-javadoc.jar
|
/dir2/jakarta.servlet-api-6.0.0-javadoc.jar
|
||||||
/dir2/commons-collections4-4.4-sources.jar
|
/dir2/jakarta.servlet-api-6.0.0-sources.jar
|
||||||
/dir2/commons-collections4-4.4.jar
|
/dir2/jakarta.servlet-api-6.0.0.jar
|
||||||
/dir3
|
/dir3
|
||||||
/dir3/slf4j-api-2.0.0-javadoc.jar
|
/dir3/commons-collections4-4.3-javadoc.jar
|
||||||
/dir3/slf4j-api-2.0.0-sources.jar
|
/dir3/commons-collections4-4.3-sources.jar
|
||||||
/dir3/slf4j-api-2.0.0.jar
|
/dir3/commons-collections4-4.3.jar
|
||||||
/dir3/slf4j-api-2.0.6-javadoc.jar
|
/dir3/commons-collections4-4.4-javadoc.jar
|
||||||
/dir3/slf4j-api-2.0.6-sources.jar
|
/dir3/commons-collections4-4.4-sources.jar
|
||||||
/dir3/slf4j-api-2.0.6.jar
|
/dir3/commons-collections4-4.4.jar
|
||||||
/dir3/slf4j-simple-2.0.0-javadoc.jar
|
|
||||||
/dir3/slf4j-simple-2.0.0-sources.jar
|
|
||||||
/dir3/slf4j-simple-2.0.0.jar
|
|
||||||
/dir3/slf4j-simple-2.0.6-javadoc.jar
|
|
||||||
/dir3/slf4j-simple-2.0.6-sources.jar
|
|
||||||
/dir3/slf4j-simple-2.0.6.jar
|
|
||||||
/dir4
|
/dir4
|
||||||
/dir4/commons-codec-1.13-javadoc.jar
|
/dir4/slf4j-api-2.0.0-javadoc.jar
|
||||||
/dir4/commons-codec-1.13-sources.jar
|
/dir4/slf4j-api-2.0.0-sources.jar
|
||||||
/dir4/commons-codec-1.13.jar
|
/dir4/slf4j-api-2.0.0.jar
|
||||||
/dir4/httpclient5-5.0-javadoc.jar
|
/dir4/slf4j-api-2.0.6-javadoc.jar
|
||||||
/dir4/httpclient5-5.0-sources.jar
|
/dir4/slf4j-api-2.0.6-sources.jar
|
||||||
/dir4/httpclient5-5.0.jar
|
/dir4/slf4j-api-2.0.6.jar
|
||||||
/dir4/httpclient5-5.2.1-javadoc.jar
|
/dir4/slf4j-simple-2.0.0-javadoc.jar
|
||||||
/dir4/httpclient5-5.2.1-sources.jar
|
/dir4/slf4j-simple-2.0.0-sources.jar
|
||||||
/dir4/httpclient5-5.2.1.jar
|
/dir4/slf4j-simple-2.0.0.jar
|
||||||
/dir4/httpcore5-5.0-javadoc.jar
|
/dir4/slf4j-simple-2.0.6-javadoc.jar
|
||||||
/dir4/httpcore5-5.0-sources.jar
|
/dir4/slf4j-simple-2.0.6-sources.jar
|
||||||
/dir4/httpcore5-5.0.jar
|
/dir4/slf4j-simple-2.0.6.jar
|
||||||
/dir4/httpcore5-5.2-javadoc.jar
|
/dir5
|
||||||
/dir4/httpcore5-5.2-sources.jar
|
/dir5/commons-codec-1.13-javadoc.jar
|
||||||
/dir4/httpcore5-5.2.jar
|
/dir5/commons-codec-1.13-sources.jar
|
||||||
/dir4/httpcore5-h2-5.0-javadoc.jar
|
/dir5/commons-codec-1.13.jar
|
||||||
/dir4/httpcore5-h2-5.0-sources.jar
|
/dir5/httpclient5-5.0-javadoc.jar
|
||||||
/dir4/httpcore5-h2-5.0.jar
|
/dir5/httpclient5-5.0-sources.jar
|
||||||
/dir4/httpcore5-h2-5.2-javadoc.jar
|
/dir5/httpclient5-5.0.jar
|
||||||
/dir4/httpcore5-h2-5.2-sources.jar
|
/dir5/httpclient5-5.2.1-javadoc.jar
|
||||||
/dir4/httpcore5-h2-5.2.jar
|
/dir5/httpclient5-5.2.1-sources.jar
|
||||||
/dir4/slf4j-api-1.7.25-javadoc.jar
|
/dir5/httpclient5-5.2.1.jar
|
||||||
/dir4/slf4j-api-1.7.25-sources.jar
|
/dir5/httpcore5-5.0-javadoc.jar
|
||||||
/dir4/slf4j-api-1.7.25.jar
|
/dir5/httpcore5-5.0-sources.jar
|
||||||
/dir4/slf4j-api-1.7.36-javadoc.jar
|
/dir5/httpcore5-5.0.jar
|
||||||
/dir4/slf4j-api-1.7.36-sources.jar
|
/dir5/httpcore5-5.2-javadoc.jar
|
||||||
/dir4/slf4j-api-1.7.36.jar""",
|
/dir5/httpcore5-5.2-sources.jar
|
||||||
|
/dir5/httpcore5-5.2.jar
|
||||||
|
/dir5/httpcore5-h2-5.0-javadoc.jar
|
||||||
|
/dir5/httpcore5-h2-5.0-sources.jar
|
||||||
|
/dir5/httpcore5-h2-5.0.jar
|
||||||
|
/dir5/httpcore5-h2-5.2-javadoc.jar
|
||||||
|
/dir5/httpcore5-h2-5.2-sources.jar
|
||||||
|
/dir5/httpcore5-h2-5.2.jar
|
||||||
|
/dir5/slf4j-api-1.7.25-javadoc.jar
|
||||||
|
/dir5/slf4j-api-1.7.25-sources.jar
|
||||||
|
/dir5/slf4j-api-1.7.25.jar
|
||||||
|
/dir5/slf4j-api-1.7.36-javadoc.jar
|
||||||
|
/dir5/slf4j-api-1.7.36-sources.jar
|
||||||
|
/dir5/slf4j-api-1.7.36.jar""",
|
||||||
FileUtils.generateDirectoryListing(tmp));
|
FileUtils.generateDirectoryListing(tmp));
|
||||||
|
|
||||||
var operation_purge = new PurgeOperation()
|
var operation_purge = new PurgeOperation()
|
||||||
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
.repositories(List.of(Repository.MAVEN_CENTRAL))
|
||||||
.libCompileDirectory(dir1)
|
.libCompileDirectory(dir1)
|
||||||
.libRuntimeDirectory(dir2)
|
.libProvidedDirectory(dir2)
|
||||||
.libStandaloneDirectory(dir3)
|
.libRuntimeDirectory(dir3)
|
||||||
.libTestDirectory(dir4)
|
.libStandaloneDirectory(dir4)
|
||||||
|
.libTestDirectory(dir5)
|
||||||
.preserveSources(true)
|
.preserveSources(true)
|
||||||
.preserveJavadoc(true);
|
.preserveJavadoc(true);
|
||||||
operation_purge.dependencies().scope(Scope.compile)
|
operation_purge.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
||||||
|
operation_purge.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
|
||||||
operation_purge.dependencies().scope(Scope.runtime)
|
operation_purge.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
||||||
operation_purge.dependencies().scope(Scope.standalone)
|
operation_purge.dependencies().scope(Scope.standalone)
|
||||||
|
@ -324,29 +363,33 @@ public class TestPurgeOperation {
|
||||||
/dir1/commons-lang3-3.12.0-sources.jar
|
/dir1/commons-lang3-3.12.0-sources.jar
|
||||||
/dir1/commons-lang3-3.12.0.jar
|
/dir1/commons-lang3-3.12.0.jar
|
||||||
/dir2
|
/dir2
|
||||||
/dir2/commons-collections4-4.4-javadoc.jar
|
/dir2/jakarta.servlet-api-6.0.0-javadoc.jar
|
||||||
/dir2/commons-collections4-4.4-sources.jar
|
/dir2/jakarta.servlet-api-6.0.0-sources.jar
|
||||||
/dir2/commons-collections4-4.4.jar
|
/dir2/jakarta.servlet-api-6.0.0.jar
|
||||||
/dir3
|
/dir3
|
||||||
/dir3/slf4j-api-2.0.6-javadoc.jar
|
/dir3/commons-collections4-4.4-javadoc.jar
|
||||||
/dir3/slf4j-api-2.0.6-sources.jar
|
/dir3/commons-collections4-4.4-sources.jar
|
||||||
/dir3/slf4j-api-2.0.6.jar
|
/dir3/commons-collections4-4.4.jar
|
||||||
/dir3/slf4j-simple-2.0.6-javadoc.jar
|
|
||||||
/dir3/slf4j-simple-2.0.6-sources.jar
|
|
||||||
/dir3/slf4j-simple-2.0.6.jar
|
|
||||||
/dir4
|
/dir4
|
||||||
/dir4/httpclient5-5.2.1-javadoc.jar
|
/dir4/slf4j-api-2.0.6-javadoc.jar
|
||||||
/dir4/httpclient5-5.2.1-sources.jar
|
/dir4/slf4j-api-2.0.6-sources.jar
|
||||||
/dir4/httpclient5-5.2.1.jar
|
/dir4/slf4j-api-2.0.6.jar
|
||||||
/dir4/httpcore5-5.2-javadoc.jar
|
/dir4/slf4j-simple-2.0.6-javadoc.jar
|
||||||
/dir4/httpcore5-5.2-sources.jar
|
/dir4/slf4j-simple-2.0.6-sources.jar
|
||||||
/dir4/httpcore5-5.2.jar
|
/dir4/slf4j-simple-2.0.6.jar
|
||||||
/dir4/httpcore5-h2-5.2-javadoc.jar
|
/dir5
|
||||||
/dir4/httpcore5-h2-5.2-sources.jar
|
/dir5/httpclient5-5.2.1-javadoc.jar
|
||||||
/dir4/httpcore5-h2-5.2.jar
|
/dir5/httpclient5-5.2.1-sources.jar
|
||||||
/dir4/slf4j-api-1.7.36-javadoc.jar
|
/dir5/httpclient5-5.2.1.jar
|
||||||
/dir4/slf4j-api-1.7.36-sources.jar
|
/dir5/httpcore5-5.2-javadoc.jar
|
||||||
/dir4/slf4j-api-1.7.36.jar""",
|
/dir5/httpcore5-5.2-sources.jar
|
||||||
|
/dir5/httpcore5-5.2.jar
|
||||||
|
/dir5/httpcore5-h2-5.2-javadoc.jar
|
||||||
|
/dir5/httpcore5-h2-5.2-sources.jar
|
||||||
|
/dir5/httpcore5-h2-5.2.jar
|
||||||
|
/dir5/slf4j-api-1.7.36-javadoc.jar
|
||||||
|
/dir5/slf4j-api-1.7.36-sources.jar
|
||||||
|
/dir5/slf4j-api-1.7.36.jar""",
|
||||||
FileUtils.generateDirectoryListing(tmp));
|
FileUtils.generateDirectoryListing(tmp));
|
||||||
|
|
||||||
operation_purge
|
operation_purge
|
||||||
|
@ -357,22 +400,25 @@ public class TestPurgeOperation {
|
||||||
/dir1/commons-lang3-3.12.0-sources.jar
|
/dir1/commons-lang3-3.12.0-sources.jar
|
||||||
/dir1/commons-lang3-3.12.0.jar
|
/dir1/commons-lang3-3.12.0.jar
|
||||||
/dir2
|
/dir2
|
||||||
/dir2/commons-collections4-4.4-sources.jar
|
/dir2/jakarta.servlet-api-6.0.0-sources.jar
|
||||||
/dir2/commons-collections4-4.4.jar
|
/dir2/jakarta.servlet-api-6.0.0.jar
|
||||||
/dir3
|
/dir3
|
||||||
/dir3/slf4j-api-2.0.6-sources.jar
|
/dir3/commons-collections4-4.4-sources.jar
|
||||||
/dir3/slf4j-api-2.0.6.jar
|
/dir3/commons-collections4-4.4.jar
|
||||||
/dir3/slf4j-simple-2.0.6-sources.jar
|
|
||||||
/dir3/slf4j-simple-2.0.6.jar
|
|
||||||
/dir4
|
/dir4
|
||||||
/dir4/httpclient5-5.2.1-sources.jar
|
/dir4/slf4j-api-2.0.6-sources.jar
|
||||||
/dir4/httpclient5-5.2.1.jar
|
/dir4/slf4j-api-2.0.6.jar
|
||||||
/dir4/httpcore5-5.2-sources.jar
|
/dir4/slf4j-simple-2.0.6-sources.jar
|
||||||
/dir4/httpcore5-5.2.jar
|
/dir4/slf4j-simple-2.0.6.jar
|
||||||
/dir4/httpcore5-h2-5.2-sources.jar
|
/dir5
|
||||||
/dir4/httpcore5-h2-5.2.jar
|
/dir5/httpclient5-5.2.1-sources.jar
|
||||||
/dir4/slf4j-api-1.7.36-sources.jar
|
/dir5/httpclient5-5.2.1.jar
|
||||||
/dir4/slf4j-api-1.7.36.jar""",
|
/dir5/httpcore5-5.2-sources.jar
|
||||||
|
/dir5/httpcore5-5.2.jar
|
||||||
|
/dir5/httpcore5-h2-5.2-sources.jar
|
||||||
|
/dir5/httpcore5-h2-5.2.jar
|
||||||
|
/dir5/slf4j-api-1.7.36-sources.jar
|
||||||
|
/dir5/slf4j-api-1.7.36.jar""",
|
||||||
FileUtils.generateDirectoryListing(tmp));
|
FileUtils.generateDirectoryListing(tmp));
|
||||||
|
|
||||||
operation_purge
|
operation_purge
|
||||||
|
@ -382,15 +428,17 @@ public class TestPurgeOperation {
|
||||||
/dir1
|
/dir1
|
||||||
/dir1/commons-lang3-3.12.0.jar
|
/dir1/commons-lang3-3.12.0.jar
|
||||||
/dir2
|
/dir2
|
||||||
/dir2/commons-collections4-4.4.jar
|
/dir2/jakarta.servlet-api-6.0.0.jar
|
||||||
/dir3
|
/dir3
|
||||||
/dir3/slf4j-api-2.0.6.jar
|
/dir3/commons-collections4-4.4.jar
|
||||||
/dir3/slf4j-simple-2.0.6.jar
|
|
||||||
/dir4
|
/dir4
|
||||||
/dir4/httpclient5-5.2.1.jar
|
/dir4/slf4j-api-2.0.6.jar
|
||||||
/dir4/httpcore5-5.2.jar
|
/dir4/slf4j-simple-2.0.6.jar
|
||||||
/dir4/httpcore5-h2-5.2.jar
|
/dir5
|
||||||
/dir4/slf4j-api-1.7.36.jar""",
|
/dir5/httpclient5-5.2.1.jar
|
||||||
|
/dir5/httpcore5-5.2.jar
|
||||||
|
/dir5/httpcore5-h2-5.2.jar
|
||||||
|
/dir5/slf4j-api-1.7.36.jar""",
|
||||||
FileUtils.generateDirectoryListing(tmp));
|
FileUtils.generateDirectoryListing(tmp));
|
||||||
} finally {
|
} finally {
|
||||||
FileUtils.deleteDirectory(tmp);
|
FileUtils.deleteDirectory(tmp);
|
||||||
|
@ -415,6 +463,8 @@ public class TestPurgeOperation {
|
||||||
project1.repositories().add(Repository.MAVEN_CENTRAL);
|
project1.repositories().add(Repository.MAVEN_CENTRAL);
|
||||||
project1.dependencies().scope(Scope.compile)
|
project1.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 1)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 1)));
|
||||||
|
project1.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5, 0, 0)));
|
||||||
project1.dependencies().scope(Scope.runtime)
|
project1.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 3)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 3)));
|
||||||
project1.dependencies().scope(Scope.standalone)
|
project1.dependencies().scope(Scope.standalone)
|
||||||
|
@ -427,6 +477,8 @@ public class TestPurgeOperation {
|
||||||
project2.repositories().add(Repository.MAVEN_CENTRAL);
|
project2.repositories().add(Repository.MAVEN_CENTRAL);
|
||||||
project2.dependencies().scope(Scope.compile)
|
project2.dependencies().scope(Scope.compile)
|
||||||
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
.include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
|
||||||
|
project2.dependencies().scope(Scope.provided)
|
||||||
|
.include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
|
||||||
project2.dependencies().scope(Scope.runtime)
|
project2.dependencies().scope(Scope.runtime)
|
||||||
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
.include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
|
||||||
project2.dependencies().scope(Scope.standalone)
|
project2.dependencies().scope(Scope.standalone)
|
||||||
|
@ -449,6 +501,11 @@ public class TestPurgeOperation {
|
||||||
/lib/compile/commons-lang3-3.1.jar
|
/lib/compile/commons-lang3-3.1.jar
|
||||||
/lib/compile/commons-lang3-3.12.0-sources.jar
|
/lib/compile/commons-lang3-3.12.0-sources.jar
|
||||||
/lib/compile/commons-lang3-3.12.0.jar
|
/lib/compile/commons-lang3-3.12.0.jar
|
||||||
|
/lib/provided
|
||||||
|
/lib/provided/jakarta.servlet-api-5.0.0-sources.jar
|
||||||
|
/lib/provided/jakarta.servlet-api-5.0.0.jar
|
||||||
|
/lib/provided/jakarta.servlet-api-6.0.0-sources.jar
|
||||||
|
/lib/provided/jakarta.servlet-api-6.0.0.jar
|
||||||
/lib/runtime
|
/lib/runtime
|
||||||
/lib/runtime/commons-collections4-4.3-sources.jar
|
/lib/runtime/commons-collections4-4.3-sources.jar
|
||||||
/lib/runtime/commons-collections4-4.3.jar
|
/lib/runtime/commons-collections4-4.3.jar
|
||||||
|
@ -505,6 +562,9 @@ public class TestPurgeOperation {
|
||||||
/lib/compile
|
/lib/compile
|
||||||
/lib/compile/commons-lang3-3.12.0-sources.jar
|
/lib/compile/commons-lang3-3.12.0-sources.jar
|
||||||
/lib/compile/commons-lang3-3.12.0.jar
|
/lib/compile/commons-lang3-3.12.0.jar
|
||||||
|
/lib/provided
|
||||||
|
/lib/provided/jakarta.servlet-api-6.0.0-sources.jar
|
||||||
|
/lib/provided/jakarta.servlet-api-6.0.0.jar
|
||||||
/lib/runtime
|
/lib/runtime
|
||||||
/lib/runtime/commons-collections4-4.4-sources.jar
|
/lib/runtime/commons-collections4-4.4-sources.jar
|
||||||
/lib/runtime/commons-collections4-4.4.jar
|
/lib/runtime/commons-collections4-4.4.jar
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue