Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changes to websocket poms and module-info from review 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2023-06-30 13:15:03 +10:00
parent f1109464bb
commit e1b0d01aa0
19 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-ee10/jetty-ee10-bom/pom.xml
View File

@ -142,7 +142,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-client</artifactId>
<artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
<version>12.0.0-SNAPSHOT</version>
</dependency>
<dependency>

2
jetty-ee10/jetty-ee10-home/pom.xml
View File

@ -428,7 +428,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-client</artifactId>
<artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>

1
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml
View File

@ -22,7 +22,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>

3
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/src/main/java/module-info.java
View File

@ -16,9 +16,8 @@ import org.eclipse.jetty.ee10.websocket.jakarta.client.webapp.JakartaWebSocketSh
module org.eclipse.jetty.ee10.websocket.jakarta.client.webapp
{
requires org.slf4j;
requires transitive org.eclipse.jetty.ee10.websocket.jakarta.client;
requires transitive jakarta.servlet;
requires transitive org.eclipse.jetty.ee10.websocket.jakarta.client;
exports org.eclipse.jetty.ee10.websocket.jakarta.client.webapp;

6
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml → jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml
View File

@ -7,11 +7,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ee10-websocket-jetty-client</artifactId>
<name>EE10 :: Websocket :: Jetty Client</name>
<artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
<name>EE10 :: Websocket :: Jetty Client WebApp</name>
<properties>
<bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
<bundle-symbolic-name>${project.groupId}.client.webapp</bundle-symbolic-name>
</properties>
<build>

2
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod → jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod
View File

@ -15,7 +15,7 @@ ee10-annotations
websocket-jetty-client
[lib]
lib/ee10-websocket/jetty-ee10-websocket-jetty-client-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jetty-client-webapp-${jetty.version}.jar
[jpms]
# The implementation needs to access method handles in

0
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/java/module-info.java → jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/java/module-info.java
View File

0
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/java/org/eclipse/jetty/ee10/websocket/client/config/JettyWebSocketClientConfiguration.java → jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/java/org/eclipse/jetty/ee10/websocket/client/config/JettyWebSocketClientConfiguration.java
View File

0
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration → jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration
View File

2
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml
View File

@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-client</artifactId>
<artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>

2
jetty-ee10/jetty-ee10-websocket/pom.xml
View File

@ -22,7 +22,7 @@
<module>jetty-ee10-websocket-jakarta-common</module>
<module>jetty-ee10-websocket-jakarta-server</module>
<module>jetty-ee10-websocket-jakarta-tests</module>
<module>jetty-ee10-websocket-jetty-client</module>
<module>jetty-ee10-websocket-jetty-client-webapp</module>
<module>jetty-ee10-websocket-jetty-server</module>
<module>jetty-ee10-websocket-jetty-tests</module>
<module>jetty-ee10-websocket-servlet</module>

2
jetty-ee10/pom.xml
View File

@ -177,7 +177,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-client</artifactId>
<artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

6
jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml
View File

@ -35,15 +35,15 @@
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Description>jakarta.websocket.client WebApp Implementation</Bundle-Description>
<Bundle-Description>javax.websocket.client WebApp Implementation</Bundle-Description>
<Export-Package>
org.eclipse.jetty.ee8.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
org.eclipse.jetty.ee8.websocket.javax.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
</Export-Package>
<Require-Capability>
osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
</Require-Capability>
<Provide-Capability>
osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider
osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer
</Provide-Capability>
</instructions>
</configuration>

6
jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml
View File

@ -63,15 +63,15 @@
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Description>jakarta.websocket.client Implementation</Bundle-Description>
<Bundle-Description>javax.websocket.client Implementation</Bundle-Description>
<Export-Package>
org.eclipse.jetty.ee8.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
org.eclipse.jetty.ee8.websocket.javax.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
</Export-Package>
<Require-Capability>
osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
</Require-Capability>
<Provide-Capability>
osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider
osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider
</Provide-Capability>
</instructions>
</configuration>

8
jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml
View File

@ -49,7 +49,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server
@{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server
</argLine>
</configuration>
</plugin>
@ -59,13 +59,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Description>jakarta.websocket.server Implementation</Bundle-Description>
<Bundle-Description>javax.websocket.server Implementation</Bundle-Description>
<Export-Package>
org.eclipse.jetty.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
</Export-Package>
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
<Provide-Capability>
osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator
osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator
</Provide-Capability>
</instructions>
</configuration>

0
jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client.mod → jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod
View File

3
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/src/main/java/module-info.java
View File

@ -16,9 +16,8 @@ import org.eclipse.jetty.ee9.websocket.jakarta.client.webapp.JakartaWebSocketShu
module org.eclipse.jetty.ee9.websocket.jakarta.client.webapp
{
requires org.slf4j;
requires transitive org.eclipse.jetty.ee9.websocket.jakarta.client;
requires transitive jetty.servlet.api;
requires transitive org.eclipse.jetty.ee9.websocket.jakarta.client;
exports org.eclipse.jetty.ee9.websocket.jakarta.client.webapp;

0
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client.mod → jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod
View File

1
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/java/module-info.java
View File

@ -16,7 +16,6 @@ import org.eclipse.jetty.ee9.websocket.client.config.JettyWebSocketClientConfigu
module org.eclipse.jetty.ee9.websocket.jetty.client.webapp
{
requires org.slf4j;
requires transitive org.eclipse.jetty.ee9.webapp;
exports org.eclipse.jetty.ee9.websocket.client.config;