Jetty 12 - Move test JPMS out of main `module-info.java` (#9203)

* Move test jpms out of main module-info.java
* There's no jetty-core/jetty-security anymore
This commit is contained in:
Joakim Erdfelt 2023-01-26 09:26:27 -06:00 committed by GitHub
parent 177fc234ef
commit 7f0294d4e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 28 deletions

View File

@ -20,7 +20,6 @@ module org.eclipse.jetty.jndi
// Only required if using DataSourceCloser. // Only required if using DataSourceCloser.
requires static java.sql; requires static java.sql;
// requires static org.eclipse.jetty.security;
exports org.eclipse.jetty.jndi; exports org.eclipse.jetty.jndi;
exports org.eclipse.jetty.jndi.java; exports org.eclipse.jetty.jndi.java;

View File

@ -21,7 +21,9 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine> <argLine>
@{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED @{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging
--add-reads org.eclipse.jetty.server=java.xml
</argLine> </argLine>
</configuration> </configuration>
</plugin> </plugin>

View File

@ -19,9 +19,6 @@ module org.eclipse.jetty.server
// Only required if using JMX. // Only required if using JMX.
requires static org.eclipse.jetty.jmx; requires static org.eclipse.jetty.jmx;
// TODO needed for testing??
requires static java.xml;
exports org.eclipse.jetty.server; exports org.eclipse.jetty.server;
exports org.eclipse.jetty.server.handler; exports org.eclipse.jetty.server.handler;
exports org.eclipse.jetty.server.handler.gzip; exports org.eclipse.jetty.server.handler.gzip;
@ -31,7 +28,4 @@ module org.eclipse.jetty.server
exports org.eclipse.jetty.server.jmx to exports org.eclipse.jetty.server.jmx to
org.eclipse.jetty.jmx; org.eclipse.jetty.jmx;
// TODO required for testing ????
exports org.eclipse.jetty.server.ssl;
} }

View File

@ -1,20 +0,0 @@
//
// ========================================================================
// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.server.ssl;
public class FixJPMS
{
// This class only exists to make the tests in org.eclipse.jetty.server.ssl work
// These tests probably should not be in that package, but leaving them there for now to make sure we don't miss them
}