Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to new Quarkus platform without universe BOM #101

Merged
merged 1 commit into from
Jul 30, 2021
Merged

Move to new Quarkus platform without universe BOM #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions testsuite/src/it/java/io/quarkus/ts/startstop/ArtifactGeneratorBOMTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import io.quarkus.ts.startstop.utils.Apps;
import io.quarkus.ts.startstop.utils.Commands;
import io.quarkus.ts.startstop.utils.FakeOIDCServer;
import io.quarkus.ts.startstop.utils.MvnCmds;
import io.quarkus.ts.startstop.utils.TestFlags;
import io.quarkus.ts.startstop.utils.URLContent;
Expand Down Expand Up @@ -95,8 +94,6 @@ public void testRuntime(TestInfo testInfo, String[] extensions, Set<TestFlags> f

URLContent skeletonApp = Apps.GENERATED_SKELETON.urlContent;

FakeOIDCServer fakeOIDCServer = new FakeOIDCServer(6661, "localhost");

try {
// Cleanup
cleanDirOrFile(appDir.getAbsolutePath(), logsDir);
Expand Down Expand Up @@ -160,8 +157,6 @@ public void testRuntime(TestInfo testInfo, String[] extensions, Set<TestFlags> f

checkJarSuffixes(flags, appDir);
} finally {
fakeOIDCServer.stop();

// Make sure processes are down even if there was an exception / failure
if (pA != null) {
processStopper(pA, true);
Expand Down Expand Up @@ -203,27 +198,4 @@ public void quarkusProductBomExtensionsB(TestInfo testInfo) throws Exception {
testRuntime(testInfo, supportedExtensionsSubsetSetB, EnumSet.of(TestFlags.PRODUCT_BOM));
}

@Test
@Tag("community")
public void quarkusUniverseBomExtensionsA(TestInfo testInfo) throws Exception {
testRuntime(testInfo, supportedExtensionsSubsetSetA, EnumSet.of(TestFlags.UNIVERSE_BOM));
}

@Test
@Tag("community")
public void quarkusUniverseBomExtensionsB(TestInfo testInfo) throws Exception {
testRuntime(testInfo, supportedExtensionsSubsetSetB, EnumSet.of(TestFlags.UNIVERSE_BOM));
}

@Test
@Tag("product")
public void quarkusUniverseProductBomExtensionsA(TestInfo testInfo) throws Exception {
testRuntime(testInfo, supportedExtensionsSubsetSetA, EnumSet.of(TestFlags.UNIVERSE_PRODUCT_BOM));
}

@Test
@Tag("product")
public void quarkusUniverseProductBomExtensionsB(TestInfo testInfo) throws Exception {
testRuntime(testInfo, supportedExtensionsSubsetSetB, EnumSet.of(TestFlags.UNIVERSE_PRODUCT_BOM));
}
}
6 changes: 2 additions & 4 deletions testsuite/src/it/java/io/quarkus/ts/startstop/ArtifactGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@

import io.quarkus.ts.startstop.utils.Apps;
import io.quarkus.ts.startstop.utils.Commands;
import io.quarkus.ts.startstop.utils.FakeOIDCServer;
import io.quarkus.ts.startstop.utils.LogBuilder;
import io.quarkus.ts.startstop.utils.Logs;
import io.quarkus.ts.startstop.utils.MvnCmds;
Expand Down Expand Up @@ -118,7 +117,8 @@ public class ArtifactGeneratorTest {
"vertx",
"vertx-web",
"grpc",
"infinispan-client",
// TODO https://github.com/quarkusio/quarkus/issues/19081
// "infinispan-client",
"cache",
"micrometer",
"quarkus-openshift-client",
Expand Down Expand Up @@ -183,7 +183,6 @@ public void testRuntime(TestInfo testInfo, String[] extensions, Set<TestFlags> f
} else {
LOGGER.info(mn + ": Testing setup: " + String.join(" ", generatorCmd));
}
FakeOIDCServer fakeOIDCServer = new FakeOIDCServer(6661, "localhost");

try {
// Cleanup
Expand Down Expand Up @@ -290,7 +289,6 @@ public void testRuntime(TestInfo testInfo, String[] extensions, Set<TestFlags> f
appendln(whatIDidReport, log.headerMarkdown + "\n" + log.lineMarkdown);
checkThreshold(Apps.GENERATED_SKELETON, MvnCmds.GENERATOR, SKIP, timeToFirstOKRequest, timeToReloadedOKRequest);
} finally {
fakeOIDCServer.stop();
// Make sure processes are down even if there was an exception / failure
if (pA != null) {
processStopper(pA, true);
Expand Down
8 changes: 1 addition & 7 deletions testsuite/src/it/java/io/quarkus/ts/startstop/utils/Commands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,6 @@ public static List<String> getGeneratorCommand(Set<TestFlags> flags, String[] ba
} else if (flags.contains(TestFlags.QUARKUS_BOM)) {
generatorCmd.add("-DplatformArtifactId=quarkus-bom");
generatorCmd.add("-DplatformVersion=" + getQuarkusVersion());
} else if (flags.contains(TestFlags.UNIVERSE_BOM)) {
generatorCmd.add("-DplatformArtifactId=quarkus-universe-bom");
generatorCmd.add("-DplatformVersion=" + getQuarkusVersion());
} else if (flags.contains(TestFlags.UNIVERSE_PRODUCT_BOM)) {
generatorCmd.add("-DplatformArtifactId=quarkus-universe-bom");
generatorCmd.add("-DplatformGroupId=com.redhat.quarkus");
generatorCmd.add("-DplatformVersion=" + getQuarkusPlatformVersion());
}
generatorCmd.add("-Dextensions=" + String.join(",", extensions));
generatorCmd.add("-Dmaven.repo.local=" + repoDir);
Expand All @@ -306,6 +299,7 @@ public static List<String> getGeneratorCommand(String[] baseCommand, String[] ex
generatorCmd.add("/C");
}
generatorCmd.addAll(Arrays.asList(baseCommand));
generatorCmd.add("-DplatformArtifactId=quarkus-bom"); // https://github.com/quarkusio/quarkus/issues/19083
generatorCmd.add("-DplatformVersion=" + getQuarkusVersion());
generatorCmd.add("-Dextensions=" + String.join(",", extensions));
generatorCmd.add("-Dmaven.repo.local=" + getLocalMavenRepoDir());
Expand Down
2 changes: 1 addition & 1 deletion testsuite/src/it/java/io/quarkus/ts/startstop/utils/Logs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ private static boolean isWhiteListed(Pattern[] patterns, String line) {
}

public static void checkJarSuffixes(Set<TestFlags> flags, File appDir) throws IOException {
if (flags.contains(TestFlags.PRODUCT_BOM) || flags.contains(TestFlags.UNIVERSE_PRODUCT_BOM)) {
if (flags.contains(TestFlags.PRODUCT_BOM)) {
List<Path> possiblyUnwantedArtifacts = Logs.listJarsFailingNameCheck(
appDir.getAbsolutePath() + File.separator + "target" + File.separator + "lib");
List<String> reportArtifacts = new ArrayList<>();
Expand Down
4 changes: 1 addition & 3 deletions testsuite/src/it/java/io/quarkus/ts/startstop/utils/TestFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
public enum TestFlags {
WARM_UP("This run is just a warm up for Dev mode."),
QUARKUS_BOM("platformArtifactId will use quarkus-bom"),
PRODUCT_BOM("platformArtifactId will use quarkus-product-bom"),
UNIVERSE_BOM("platformArtifactId will use quarkus-universe-bom"),
UNIVERSE_PRODUCT_BOM("platformArtifactId will use quarkus-universe-bom, and -DplatformGroupId=com.redhat.quarkus");
PRODUCT_BOM("platformArtifactId will use quarkus-product-bom");
public final String label;

TestFlags(String label) {
Expand Down
1 change: 1 addition & 0 deletions testsuite/src/it/java/io/quarkus/ts/startstop/utils/WhitelistLogLines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public enum WhitelistLogLines {
Pattern.compile(".*org.apache.maven.settings.io.SettingsParseException: Unrecognised tag: 'blocked'.*"),
Pattern.compile(".*io.qua.arc.impl.*"), // TODO remove when resolved https://github.com/quarkusio/quarkus/issues/18105
Pattern.compile(".*Class does not exist in ClassLoader QuarkusClassLoader.*"), // TODO remove when resolved https://github.com/quarkusio/quarkus/issues/18746
Pattern.compile(".*Detected a split package usage which is considered a bad practice and should be avoided.*"), // TODO remove when resolved https://github.com/quarkusio/quarkus/issues/19092
}),
// Quarkus is not being gratefully shutdown in Windows when running in Dev mode.
// Reported by https://github.com/quarkusio/quarkus/issues/14647.
Expand Down