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

Fix incorrect maven coordinates #12602

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Fix incorrect maven coordinates #12602

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
24 changes: 12 additions & 12 deletions jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,36 +80,36 @@
<artifactId>jetty-ee10-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-async-rest-webapp</artifactId>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-servlet5-demo-async-rest-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-jndi-webapp</artifactId>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-servlet5-demo-jndi-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-jsp-webapp</artifactId>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-servlet5-demo-jsp-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-mock-resources</artifactId>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-servlet5-demo-mock-resources</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-simple-webapp</artifactId>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-servlet5-demo-simple-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-spec-webapp</artifactId>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-servlet5-demo-spec-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
Expand Down
17 changes: 11 additions & 6 deletions ...ribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1696,12 +1696,14 @@ public void testXmlDeployWarNotInWebapps(String env) throws Exception
};

// Put war into ${jetty.base}/wars/ directory
Path srcWar = ("ee8".equals(env)
? distribution.resolveArtifact("org.eclipse.jetty.demos:jetty-servlet4-demo-simple-webapp:war:" + jettyVersion) : distribution.resolveArtifact("org.eclipse.jetty.demos:jetty-servlet5-demo-simple-webapp:war:" + jettyVersion));
String coordinates = "org.eclipse.jetty.demos:jetty-%s-demo-simple-webapp:war:%s".formatted(
"ee8".equals(env) ? "servlet4" : "servlet5",
jettyVersion
);
Path warsDir = jettyBase.resolve("wars");
FS.ensureDirExists(warsDir);
Path destWar = warsDir.resolve("demo.war");
Files.copy(srcWar, destWar);
Files.copy(distribution.resolveArtifact(coordinates), destWar);

// Create XML for deployable
String xml = """
Expand Down Expand Up @@ -2169,7 +2171,7 @@ public void testEagerMultiPartContentHandler(HttpVersion httpVersion) throws Exc
}

@ParameterizedTest
@ValueSource(strings = {"ee8", "ee9", "ee10"})
@ValueSource(strings = {"ee8", "ee9", "ee10", "ee11"})
public void testLimitHandlers(String env) throws Exception
{
String jettyVersion = System.getProperty("jettyVersion");
Expand All @@ -2196,8 +2198,11 @@ public void testLimitHandlers(String env) throws Exception
""";
Files.writeString(jettyLogging, loggingConfig, StandardOpenOption.TRUNCATE_EXISTING);

Path war = distribution.resolveArtifact("org.eclipse.jetty." + env + ".demos:jetty-" + env + "-demo-simple-webapp:war:" + jettyVersion);
distribution.installWar(war, "test");
String coordinates = "org.eclipse.jetty.demos:jetty-%s-demo-simple-webapp:war:%s".formatted(
"ee8".equals(env) ? "servlet4" : "servlet5",
jettyVersion
);
distribution.installWar(distribution.resolveArtifact(coordinates), "test");

int port = Tester.freePort();
try (JettyHomeTester.Run run2 = distribution.start("jetty.http.selectors=1", "jetty.http.port=" + port))
Expand Down