apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2026-02-01 01:08:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Split daemon module into daemon and dist #130

Browse Source
This commit is contained in:
Peter Palaga
2020-10-23 18:21:23 +02:00
parent bc2fabe788
commit 8f322e7b0b
14 changed files with 92 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
integration-tests/pom.xml
View File

@@ -32,7 +32,7 @@
<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<mvnd.home>${project.basedir}/../daemon/target/maven-distro/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</mvnd.home>
<mvnd.home>${project.basedir}/../dist/target/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</mvnd.home>
</properties>
<dependencies>
@@ -48,17 +48,8 @@
</dependency>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd-daemon</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd-common</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd-client</artifactId>
<artifactId>mvnd-dist</artifactId>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>

142
integration-tests/src/test/java/org/jboss/fuse/mvnd/it/DistroIT.java Normal file
View File

@@ -0,0 +1,142 @@
/*
* Copyright 2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class DistroIT {
/**
* Asserts that we do not have the same libs in lib/ext and in lib or boot directories.
*/
@Test
void noDuplicateJars() {
final Path mavenHome = Paths.get(System.getProperty("mvnd.home"));
Set<Avc> mavenLibs = streamJars(mavenHome, "mvn/lib", "mvn/boot").collect(Collectors.toCollection(TreeSet::new));
Assertions.assertFalse(mavenLibs.isEmpty());
final List<Avc> mvndJars = streamJars(mavenHome, "mvn/lib/ext").collect(Collectors.toList());
Assertions.assertFalse(mvndJars.isEmpty());
final List<Avc> dups = mvndJars.stream()
.filter(avc -> mavenLibs.stream().anyMatch(mvnAvc -> mvnAvc.sameArtifactId(avc)))
.collect(Collectors.toList());
final String msg = mavenHome.resolve("mvn/lib/ext") + " contains duplicates available in "
+ mavenHome.resolve("mvn/lib")
+ " or " + mavenHome.resolve("mvn/lib");
Assertions.assertEquals(new ArrayList<String>(), dups, msg);
}
@Test
void avcOf() {
assertAvcOf("foo-bar-1.2.3.jar", "foo-bar", "1.2.3", null);
assertAvcOf("foo_bar-1.2.3-classifier.jar", "foo_bar", "1.2.3", "classifier");
}
void assertAvcOf(String jarName, String artifactId, String version, String classifier) {
Avc avc = Avc.of(jarName);
Assertions.assertEquals(artifactId, avc.artifactId, "artifactId in " + jarName);
Assertions.assertEquals(version, avc.version, "version in " + jarName);
Assertions.assertEquals(classifier, avc.classifier, "classifier in " + jarName);
}
private static Stream<Avc> streamJars(Path mavenHome, String... dirs) {
return Stream.of(dirs)
.map(mavenHome::resolve)
.flatMap((Path p) -> {
try {
return Files.list(p);
} catch (java.io.IOException e) {
throw new RuntimeException("Could not list " + p, e);
}
})
.filter(p -> p.getFileName().toString().endsWith(".jar"))
.filter(Files::isRegularFile)
.map(Path::getFileName)
.map(Path::toString)
.map(Avc::of);
}
static class Avc implements Comparable<Avc> {
private static final Pattern JAR_NAME_PATTERN = Pattern.compile("^(.*)(?:-([0-9]+(?:\\.[0-9]+)*))(?:-(.*))?.jar$");
public static Avc of(String jarName) {
final Matcher m = JAR_NAME_PATTERN.matcher(jarName);
if (m.find()) {
return new Avc(m.group(1), m.group(2), m.group(3), jarName);
} else {
throw new IllegalStateException("Jar name " + jarName + " does not match " + JAR_NAME_PATTERN.pattern());
}
}
private final String artifactId;
private final String version;
private final String classifier;
private final String jarName;
public Avc(String artifactId, String version, String classifier, String jarName) {
this.artifactId = artifactId;
this.version = version;
this.classifier = classifier;
this.jarName = jarName;
}
@Override
public String toString() {
return jarName;
}
@Override
public int hashCode() {
return jarName.hashCode();
}
public boolean sameArtifactId(Avc other) {
return this.artifactId.equals(other.artifactId);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Avc other = (Avc) obj;
return this.jarName.equals(other.jarName);
}
@Override
public int compareTo(Avc other) {
return this.jarName.compareTo(other.jarName);
}
}
}