diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml index 67ecc6c..ec143e9 100644 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml +++ b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml @@ -163,6 +163,13 @@ provided + + net.lingala.zip4j + zip4j + 2.6.1 + test + + \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java index 3f93369..a8d9986 100644 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java +++ b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java @@ -15,7 +15,7 @@ */ package org.springframework.sbm; -import org.apache.commons.io.FileUtils; +import net.lingala.zip4j.ZipFile; import org.apache.maven.shared.invoker.*; import org.junit.jupiter.api.*; import org.junit.jupiter.api.io.TempDir; @@ -42,14 +42,11 @@ import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; import java.io.*; -import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; import java.util.List; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; @@ -97,30 +94,52 @@ public class PrivateArtifactRepositoryTest { // All test resources live here public static final String TESTCODE_DIR = "testcode/maven-projects/private-repository"; + public static final String REPOSITORIES_ZIP = Path + .of("./testcode/maven-projects/private-repository/reposilite-data.zip") + .toAbsolutePath() + .toString(); + + public static final String DEPENDENCY_CLASS_FQNAME = "com.example.dependency.DependencyClass"; + + private static final String NEW_USER_HOME = Path.of(".") + .resolve(TESTCODE_DIR + "/user.home") + .toAbsolutePath() + .normalize() + .toString(); + private static final File LOCAL_MAVEN_REPOSITORY = Path.of(NEW_USER_HOME + "/.m2/repository").toFile(); + + private static final Path DEPENDENCY_PATH_IN_LOCAL_MAVEN_REPO = Path + .of(NEW_USER_HOME + "/.m2/repository/com/example/dependency/dependency-project") + .toAbsolutePath() + .normalize(); + + // File path was too long under Windows when Maven repository was under TESTCODE_DIR + + // "/reposilite-data" + // To fix this the repo with jars for reposilite is extracted from a zip to its target + // dir. + private static final Path TEMP_DIR; + static { + try { + TEMP_DIR = Files.createTempDirectory("reposilite-data"); + } + catch (IOException e) { + throw new RuntimeException(e); + } + if (!Files.exists(TEMP_DIR.resolve("reposilite-data"))) { + TestHelper.unzip(TEMP_DIR); + } + } + private static final Path REPOSILITE_DATA_DIR = TEMP_DIR.resolve("reposilite-data"); + // The private Artifact repository (reposilite) provides the dependency. @Container static GenericContainer reposilite = new GenericContainer(DockerImageName.parse("dzikoysk/reposilite:3.4.10")) .withExposedPorts(8080) // copy required config files and cached dependency to repository - .withCopyFileToContainer(MountableFile.forHostPath("./" + TESTCODE_DIR + "/reposilite-data"), "/app/data") + .withCopyFileToContainer(MountableFile.forHostPath(REPOSILITE_DATA_DIR), "/app/data") // Create temp user 'user' with password 'secret' .withEnv("REPOSILITE_OPTS", "--token user:secret --shared-config shared.configuration.json"); - public static final String DEPENDENCY_CLASS_FQNAME = "com.example.dependency.DependencyClass"; - - private static final String NEW_USER_HOME = Path.of(".") - .resolve(TESTCODE_DIR + "/user.home") - .toAbsolutePath() - .normalize() - .toString(); - - private static final Path DEPENDENCY_PATH_IN_LOCAL_MAVEN_REPO = Path - .of(NEW_USER_HOME + "/.m2/repository/com/example/dependency/dependency-project") - .toAbsolutePath() - .normalize(); - - private static final File LOCAL_MAVEN_REPOSITORY = Path.of(NEW_USER_HOME + "/.m2/repository").toFile(); - private static MavenRepository originalMavenRepository; private static String originalUserHome; @@ -146,14 +165,6 @@ public class PrivateArtifactRepositoryTest { Whitebox.setInternalState(MavenRepository.class, "MAVEN_LOCAL_DEFAULT", mavenRepository); } - @AfterAll - static void afterAll() { - // set back to initial values - System.setProperty("user.home", originalUserHome); - Whitebox.setInternalState(MavenRepository.class, "MAVEN_LOCAL_DEFAULT", originalMavenRepository); - FileSystemUtils.deleteRecursively(LOCAL_MAVEN_REPOSITORY); - } - @BeforeEach void beforeEach() throws IOException { Integer port = reposilite.getMappedPort(8080); @@ -162,6 +173,14 @@ public class PrivateArtifactRepositoryTest { TestHelper.clearDependencyFromLocalMavenRepo(); } + @AfterAll + static void afterAll() { + // set back to initial values + System.setProperty("user.home", originalUserHome); + Whitebox.setInternalState(MavenRepository.class, "MAVEN_LOCAL_DEFAULT", originalMavenRepository); + FileSystemUtils.deleteRecursively(LOCAL_MAVEN_REPOSITORY); + } + @Test @DisplayName("Maven settings should be read from secured private repo") void mavenSettingsShouldBeReadFromSecuredPrivateRepo() { @@ -275,15 +294,6 @@ public class PrivateArtifactRepositoryTest { } } - } - - /* - * Currently not used as the dependency is provided to the container (cached). But - * kept in case deployment of the dependency or building the dependent project is - * needed. - */ - class DeploymentHelper { - void deployDependency(Path pomXmlPath) throws MavenInvocationException { InvocationRequest request = new DefaultInvocationRequest(); request.setPomFile(pomXmlPath.toFile()); @@ -328,86 +338,24 @@ public class PrivateArtifactRepositoryTest { } } - static void installMavenForTestIfNotExists(Path tempDir) { - if (!Path.of("./testcode/maven-projects/private-repository/user.home/apache-maven-3.9.5/bin/mvn") - .toFile() - .exists()) { - String mavenDownloadUrl = "https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip"; - try { - Path mavenInstallDir = Path.of(TESTCODE_DIR + "/user.home"); - File downloadedMavenZipFile = tempDir.resolve("apache-maven-3.9.5-bin.zip").toFile(); - FileUtils.copyURLToFile(new URL(mavenDownloadUrl), downloadedMavenZipFile, 10000, 30000); - Unzipper.unzip(downloadedMavenZipFile, mavenInstallDir); - File file = mavenInstallDir.resolve("apache-maven-3.9.5/bin/mvn").toFile(); - file.setExecutable(true, false); - assertThat(file.canExecute()).isTrue(); - } - catch (IOException e) { - throw new RuntimeException(e); - } + static void unzip(Path repoDir) { + try { + ; + ZipFile zipFile = new ZipFile(REPOSITORIES_ZIP); + zipFile.extractAll(repoDir.toString()); } - } - - class Unzipper { - - private static void unzip(File downloadedMavenZipFile, Path mavenInstallDir) { - try { - byte[] buffer = new byte[1024]; - ZipInputStream zis = null; - - zis = new ZipInputStream(new FileInputStream(downloadedMavenZipFile)); - - ZipEntry zipEntry = zis.getNextEntry(); - while (zipEntry != null) { - File newFile = newFile(mavenInstallDir.toFile(), zipEntry); - if (zipEntry.isDirectory()) { - if (!newFile.isDirectory() && !newFile.mkdirs()) { - throw new IOException("Failed to create directory " + newFile); - } - } - else { - // fix for Windows-created archives - File parent = newFile.getParentFile(); - if (!parent.isDirectory() && !parent.mkdirs()) { - throw new IOException("Failed to create directory " + parent); - } - - // write file content - FileOutputStream fos = new FileOutputStream(newFile); - int len; - while ((len = zis.read(buffer)) > 0) { - fos.write(buffer, 0, len); - } - fos.close(); - } - zipEntry = zis.getNextEntry(); - } - zis.closeEntry(); - zis.close(); - } - catch (FileNotFoundException e) { - throw new RuntimeException(e); - } - catch (IOException e) { - throw new RuntimeException(e); - } - } - - public static File newFile(File destinationDir, ZipEntry zipEntry) throws IOException { - File destFile = new File(destinationDir, zipEntry.getName()); - - String destDirPath = destinationDir.getCanonicalPath(); - String destFilePath = destFile.getCanonicalPath(); - - if (!destFilePath.startsWith(destDirPath + java.io.File.separator)) { - throw new IOException("Entry is outside of the target dir: " + zipEntry.getName()); - } - - return destFile; + catch (IOException e) { + throw new RuntimeException(e); } } + static void mkdir(Path target) { + boolean mkdir = target.toFile().mkdir(); + if (!mkdir) { + throw new RuntimeException("Could not create target dir"); + } + } } } diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/.gitignore b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/.gitignore index b8f740a..10c4650 100644 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/.gitignore +++ b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/.gitignore @@ -8,8 +8,9 @@ /user.home/.m2/settings.xml !/user.home/.m2/settings.xml.template !/user.home/.m2/settings-security.xml -/reposilite-data/static -/reposilite-data/.local -/reposilite-data/plugins -/reposilite-data/reposilite.db -/reposilite-data/configuration.cdn +#/reposilite-data/static +#/reposilite-data/.local +#/reposilite-data/plugins +#/reposilite-data/repositories +#/reposilite-data/reposilite.db +#/reposilite-data--/configuration.cdn diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data.zip b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data.zip new file mode 100644 index 0000000..070422a Binary files /dev/null and b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data.zip differ diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar deleted file mode 100644 index 7e3c168..0000000 Binary files a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar and /dev/null differ diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.md5 b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.md5 deleted file mode 100644 index 49cdda0..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -5c1fa9eb9814ca94bec1d507acb02910 \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.sha1 b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.sha1 deleted file mode 100644 index 27e7477..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -453d6aa069f223e17d5505601a3a3a7f576d61f4 \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom deleted file mode 100644 index 78420e9..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - com.example.dependency - dependency-project - 1.0-SNAPSHOT - - dependency-project - - - UTF-8 - 17 - 17 - - - - - repository-snapshots - Snapshots Repository - http://localhost:52260/snapshots - - - diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.md5 b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.md5 deleted file mode 100644 index 940ac3b..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -b5e883c0ee08ff935cf96727bb8623f4 \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.sha1 b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.sha1 deleted file mode 100644 index 50ec63f..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -534f31aa5ef763fe4562871d4dbb167a5cdc26f0 \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0.jar b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0.jar deleted file mode 100644 index 7e3c168..0000000 Binary files a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0.jar and /dev/null differ diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml deleted file mode 100644 index aacf348..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - com.example.dependency - dependency-project - - 20231105102337 - - 20231105.102337 - 1 - - - - pom - 1.0-20231105.102337-1 - 20231105102337 - - - jar - 1.0-20231105.102337-1 - 20231105102337 - - - - 1.0-SNAPSHOT - diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.md5 b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.md5 deleted file mode 100644 index 03c2d4d..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -40910b0eb66467f44ca8792bfe5a847e \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.sha1 b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.sha1 deleted file mode 100644 index 24af63b..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -6262ab25ed0f7e2128fb26fab1acd090c535abaf \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml deleted file mode 100644 index 10b9e95..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - com.example.dependency - dependency-project - - - 1.0-SNAPSHOT - - 20231105102337 - - diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.md5 b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.md5 deleted file mode 100644 index fa762d2..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -9bf1c816b6c0f8166efd71605db83682 \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.sha1 b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.sha1 deleted file mode 100644 index 3aa41af..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -4fa1150761b6af92a0b232fe8ec688b9e90d0f88 \ No newline at end of file diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/shared.configuration.json b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/shared.configuration.json deleted file mode 100644 index 90c3c48..0000000 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/testcode/maven-projects/private-repository/reposilite-data/shared.configuration.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "statistics": { - "enabled": true, - "resolvedRequestsInterval": "MONTHLY" - }, - "web": { - "forwardedIp": "X-Forwarded-For" - }, - "frontend": { - "id": "reposilite-repository", - "title": "Reposilite Repository", - "description": "Public Maven repository hosted through the Reposilite", - "organizationWebsite": "https://reposilite.com", - "organizationLogo": "https://avatars.githubusercontent.com/u/88636591", - "icpLicense": "" - }, - "authentication": { - "ldap": { - "enabled": false, - "ssl": false, - "hostname": "ldap.domain.com", - "port": 389, - "baseDn": "dc=company,dc=com", - "searchUserDn": "cn=reposilite,ou=admins,dc=domain,dc=com", - "searchUserPassword": "reposilite-admin-secret", - "typeAttribute": "person", - "userAttribute": "cn", - "userFilter": "(&(objectClass=person)(ou=Maven Users))", - "userType": "PERSISTENT" - } - }, - "maven": { - "repositories": [ - { - "id": "releases", - "visibility": "PRIVATE", - "redeployment": false, - "preserveSnapshots": false, - "storageProvider": { - "type": "fs", - "quota": "100%", - "mount": "" - }, - "storagePolicy": "PRIORITIZE_UPSTREAM_METADATA", - "proxied": [] - }, - { - "id": "snapshots", - "visibility": "PRIVATE", - "redeployment": true, - "preserveSnapshots": false, - "storageProvider": { - "type": "fs", - "quota": "100%", - "mount": "./snapshots" - }, - "storagePolicy": "PRIORITIZE_UPSTREAM_METADATA", - "proxied": [] - }, - { - "id": "private", - "visibility": "PRIVATE", - "redeployment": false, - "preserveSnapshots": false, - "storageProvider": { - "type": "fs", - "quota": "100%", - "mount": "" - }, - "storagePolicy": "PRIORITIZE_UPSTREAM_METADATA", - "proxied": [] - } - ] - } -} \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/.gitignore b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/.gitignore deleted file mode 100644 index cc73b93..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -/testcode/**/target/** -/testcode/testcode/**/.rewrite-cache/** -/dependency-project/pom.xml -/dependency-project/target -/dependent-project/pom.xml -/dependent-project/target -/user.home/.config/ -/user.home/apache-maven-3.9.5/ -/user.home/.m2/repository -/user.home/.m2/settings.xml -!/user.home/.m2/settings.xml.template -!/user.home/.m2/settings-security.xml -/reposilite-data/static -/reposilite-data/.local -/reposilite-data/plugins -/reposilite-data/reposilite.db -/reposilite-data/configuration.cdn diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/README.adoc b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/README.adoc deleted file mode 100644 index 094c99e..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/README.adoc +++ /dev/null @@ -1,36 +0,0 @@ -# Artifact Repository Test - -Test that artifacts available in a private artifact repository configured in `~/.m2/settings.xml` can be accessed. -This is important as many enterprise projects use their private artifact repository to retrieve private dependencies. - -- A private artifact repository using (https://github.com/dzikoysk/reposilite[reposilite]) is started in a Docker container. -The reposilite instance has a user configured (admin:secret) which can deploy and access artifacts. - -- The repositories in the artifact repository (e.g. snapshot) require successful authentication (deploy + download). - -- `dependency-project` has a simple class `DependencyClass` and gets deployed to the artifact repository. - -- `dependent-project` depends on `dependency-project` and has a class `DependentClass` that uses `DependencyClass` - -- `dependent-project` gets parsed - -- The resulting AST has the type information of `dependency-project` resolved when the repository information and credentials were read from `settings.xml` and `security-settings.xml`. - -Technical requirements: - -- The port of the Docker container is dynamic and used in settings.xml and pom.xml. -- The local Maven installation of any system should not be affected by this test. -- The location of the Maven dir `.m2` must therefore point to a different location while the test is running. - - - - - - -This requires temporarily a different `.m2` location, here `testcode/maven-projects/private-repository/user.home/.m2`. -When deploying the `dependency-project` the path to `settings.xml` is provided, pointing to `testcode/maven-projects/private-repository/user.home/.m2/settings.xml`. -This file declares the location of the local Maven repository pointing to the same dir. -Because these paths can't be relative for this test and absolute paths - - -The `user.home` is set to point to `testcode/maven-projects/private-repository/user.home` which contains a `.m2` directory providing access configuration to the reposilite instance through `.m2/settings.xml` and `.m2/security-settings.xml`, diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependency-project/pom.xml.template b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependency-project/pom.xml.template deleted file mode 100644 index 920e5e6..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependency-project/pom.xml.template +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - com.example.dependency - dependency-project - 1.0-SNAPSHOT - - dependency-project - - - UTF-8 - 17 - 17 - - - - - repository-snapshots - Snapshots Repository - http://localhost:${port}/snapshots - - - diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependency-project/src/main/java/com/example/dependency/DependencyClass.java b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependency-project/src/main/java/com/example/dependency/DependencyClass.java deleted file mode 100644 index 67b1f0d..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependency-project/src/main/java/com/example/dependency/DependencyClass.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.dependency; -public class DependencyClass -{ - private String value; - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependent-project/pom.xml.template b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependent-project/pom.xml.template deleted file mode 100644 index 797073c..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependent-project/pom.xml.template +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - com.example.dependent - dependent-project - 1.0-SNAPSHOT - - dependent-project - - - UTF-8 - 17 - 17 - - - - - com.example.dependency - dependency-project - 1.0-SNAPSHOT - - - - - - repository-snapshots - Snapshots Repository - http://localhost:${port}/snapshots - - - diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependent-project/src/main/java/com/example/dependent/DependentClass.java b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependent-project/src/main/java/com/example/dependent/DependentClass.java deleted file mode 100644 index 2fead28..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/dependent-project/src/main/java/com/example/dependent/DependentClass.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.dependent; - -import com.example.dependency.DependencyClass; - -public class DependentClass { - private DependencyClass dependencyClass; -} diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar deleted file mode 100644 index 7e3c168..0000000 Binary files a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar and /dev/null differ diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.md5 b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.md5 deleted file mode 100644 index 49cdda0..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -5c1fa9eb9814ca94bec1d507acb02910 \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.sha1 b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.sha1 deleted file mode 100644 index 27e7477..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -453d6aa069f223e17d5505601a3a3a7f576d61f4 \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom deleted file mode 100644 index 78420e9..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - com.example.dependency - dependency-project - 1.0-SNAPSHOT - - dependency-project - - - UTF-8 - 17 - 17 - - - - - repository-snapshots - Snapshots Repository - http://localhost:52260/snapshots - - - diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.md5 b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.md5 deleted file mode 100644 index 940ac3b..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -b5e883c0ee08ff935cf96727bb8623f4 \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.sha1 b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.sha1 deleted file mode 100644 index 50ec63f..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0-20231105.102337-1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -534f31aa5ef763fe4562871d4dbb167a5cdc26f0 \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0.jar b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0.jar deleted file mode 100644 index 7e3c168..0000000 Binary files a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/dependency-project-1.0.jar and /dev/null differ diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml deleted file mode 100644 index aacf348..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - com.example.dependency - dependency-project - - 20231105102337 - - 20231105.102337 - 1 - - - - pom - 1.0-20231105.102337-1 - 20231105102337 - - - jar - 1.0-20231105.102337-1 - 20231105102337 - - - - 1.0-SNAPSHOT - diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.md5 b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.md5 deleted file mode 100644 index 03c2d4d..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -40910b0eb66467f44ca8792bfe5a847e \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.sha1 b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.sha1 deleted file mode 100644 index 24af63b..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/1.0-SNAPSHOT/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -6262ab25ed0f7e2128fb26fab1acd090c535abaf \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml deleted file mode 100644 index 10b9e95..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - com.example.dependency - dependency-project - - - 1.0-SNAPSHOT - - 20231105102337 - - diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.md5 b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.md5 deleted file mode 100644 index fa762d2..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -9bf1c816b6c0f8166efd71605db83682 \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.sha1 b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.sha1 deleted file mode 100644 index 3aa41af..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/repositories/snapshots/com/example/dependency/dependency-project/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -4fa1150761b6af92a0b232fe8ec688b9e90d0f88 \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/shared.configuration.json b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/shared.configuration.json deleted file mode 100644 index 90c3c48..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/reposilite-data/shared.configuration.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "statistics": { - "enabled": true, - "resolvedRequestsInterval": "MONTHLY" - }, - "web": { - "forwardedIp": "X-Forwarded-For" - }, - "frontend": { - "id": "reposilite-repository", - "title": "Reposilite Repository", - "description": "Public Maven repository hosted through the Reposilite", - "organizationWebsite": "https://reposilite.com", - "organizationLogo": "https://avatars.githubusercontent.com/u/88636591", - "icpLicense": "" - }, - "authentication": { - "ldap": { - "enabled": false, - "ssl": false, - "hostname": "ldap.domain.com", - "port": 389, - "baseDn": "dc=company,dc=com", - "searchUserDn": "cn=reposilite,ou=admins,dc=domain,dc=com", - "searchUserPassword": "reposilite-admin-secret", - "typeAttribute": "person", - "userAttribute": "cn", - "userFilter": "(&(objectClass=person)(ou=Maven Users))", - "userType": "PERSISTENT" - } - }, - "maven": { - "repositories": [ - { - "id": "releases", - "visibility": "PRIVATE", - "redeployment": false, - "preserveSnapshots": false, - "storageProvider": { - "type": "fs", - "quota": "100%", - "mount": "" - }, - "storagePolicy": "PRIORITIZE_UPSTREAM_METADATA", - "proxied": [] - }, - { - "id": "snapshots", - "visibility": "PRIVATE", - "redeployment": true, - "preserveSnapshots": false, - "storageProvider": { - "type": "fs", - "quota": "100%", - "mount": "./snapshots" - }, - "storagePolicy": "PRIORITIZE_UPSTREAM_METADATA", - "proxied": [] - }, - { - "id": "private", - "visibility": "PRIVATE", - "redeployment": false, - "preserveSnapshots": false, - "storageProvider": { - "type": "fs", - "quota": "100%", - "mount": "" - }, - "storagePolicy": "PRIORITIZE_UPSTREAM_METADATA", - "proxied": [] - } - ] - } -} \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/user.home/.m2/settings-clear-password.xml b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/user.home/.m2/settings-clear-password.xml deleted file mode 100644 index 4d22090..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/user.home/.m2/settings-clear-password.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - /Users/fkrueger/projects/spring-boot-migrator/sbm-support-rewrite/testcode/maven-projects/private-repository/user.home/.m2/repository - - - - repository-snapshots - user - - secret - - - diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/user.home/.m2/settings-security.xml b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/user.home/.m2/settings-security.xml deleted file mode 100644 index 69a6799..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/user.home/.m2/settings-security.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - {BzCEWWQMgMkHk0P8+Rr+hsscSisZT6A4+G9Mub7f/m4=} - \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/user.home/.m2/settings.xml.template b/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/user.home/.m2/settings.xml.template deleted file mode 100644 index 6994fc2..0000000 --- a/spring-rewrite-commons-launcher/testcode/maven-projects/private-repository/user.home/.m2/settings.xml.template +++ /dev/null @@ -1,15 +0,0 @@ - - - ${user.home}/.m2/repository - - - - repository-snapshots - user - - {iKYxpFKiVu0HTAe4w0RAzev3TAav0DG8wEom2qNoRws=} - - - -