Skip to content

Commit fc13d5b

Browse files
jlouveljlouvel
committed
Merged Jetty extension into the core Restlet module
 - Connectors moved into the Engine package, MultipartRepresentation into API, test cases into equivalent packages - Needs testing and fixing to have this effectively working
1 parent f72fb42 commit fc13d5b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1363
-1168
lines changed

‎org.restlet.ext.jetty/pom.xml‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -15,66 +15,6 @@
1515
<description>Integration with Jetty.</description>
1616

1717
<dependencies>
18-
<dependency>
19-
<groupId>org.eclipse.jetty</groupId>
20-
<artifactId>jetty-server</artifactId>
21-
<version>${lib-jetty-version}</version>
22-
</dependency>
23-
<dependency>
24-
<groupId>org.eclipse.jetty.http2</groupId>
25-
<artifactId>jetty-http2-server</artifactId>
26-
<version>${lib-jetty-version}</version>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.eclipse.jetty</groupId>
30-
<artifactId>jetty-alpn-server</artifactId>
31-
<version>${lib-jetty-version}</version>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.eclipse.jetty</groupId>
35-
<artifactId>jetty-alpn-java-server</artifactId>
36-
<version>${lib-jetty-version}</version>
37-
</dependency>
38-
<dependency>
39-
<groupId>org.eclipse.jetty.http3</groupId>
40-
<artifactId>jetty-http3-server</artifactId>
41-
<version>${lib-jetty-version}</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.eclipse.jetty.quic</groupId>
45-
<artifactId>jetty-quic-server</artifactId>
46-
<version>${lib-jetty-version}</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.eclipse.jetty</groupId>
50-
<artifactId>jetty-client</artifactId>
51-
<version>${lib-jetty-version}</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.eclipse.jetty.http2</groupId>
55-
<artifactId>jetty-http2-client</artifactId>
56-
<version>${lib-jetty-version}</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>org.eclipse.jetty.http2</groupId>
60-
<artifactId>jetty-http2-client-transport</artifactId>
61-
<version>${lib-jetty-version}</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.eclipse.jetty.http3</groupId>
65-
<artifactId>jetty-http3-client</artifactId>
66-
<version>${lib-jetty-version}</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.eclipse.jetty.http3</groupId>
70-
<artifactId>jetty-http3-client-transport</artifactId>
71-
<version>${lib-jetty-version}</version>
72-
</dependency>
73-
<dependency>
74-
<groupId>org.eclipse.jetty</groupId>
75-
<artifactId>jetty-slf4j-impl</artifactId>
76-
<version>${lib-jetty-version}</version>
77-
</dependency>
7818
<dependency>
7919
<groupId>org.restlet</groupId>
8020
<artifactId>org.restlet</artifactId>

‎org.restlet/pom.xml‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,67 @@
1515
<description>Restlet API and Engine</description>
1616

1717
<dependencies>
18-
<dependency>
18+
<dependency>
19+
<groupId>org.eclipse.jetty</groupId>
20+
<artifactId>jetty-server</artifactId>
21+
<version>${lib-jetty-version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.eclipse.jetty.http2</groupId>
25+
<artifactId>jetty-http2-server</artifactId>
26+
<version>${lib-jetty-version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.eclipse.jetty</groupId>
30+
<artifactId>jetty-alpn-server</artifactId>
31+
<version>${lib-jetty-version}</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.eclipse.jetty</groupId>
35+
<artifactId>jetty-alpn-java-server</artifactId>
36+
<version>${lib-jetty-version}</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.eclipse.jetty.http3</groupId>
40+
<artifactId>jetty-http3-server</artifactId>
41+
<version>${lib-jetty-version}</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.eclipse.jetty.quic</groupId>
45+
<artifactId>jetty-quic-server</artifactId>
46+
<version>${lib-jetty-version}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.eclipse.jetty</groupId>
50+
<artifactId>jetty-client</artifactId>
51+
<version>${lib-jetty-version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.eclipse.jetty.http2</groupId>
55+
<artifactId>jetty-http2-client</artifactId>
56+
<version>${lib-jetty-version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.eclipse.jetty.http2</groupId>
60+
<artifactId>jetty-http2-client-transport</artifactId>
61+
<version>${lib-jetty-version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.eclipse.jetty.http3</groupId>
65+
<artifactId>jetty-http3-client</artifactId>
66+
<version>${lib-jetty-version}</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.eclipse.jetty.http3</groupId>
70+
<artifactId>jetty-http3-client-transport</artifactId>
71+
<version>${lib-jetty-version}</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.eclipse.jetty</groupId>
75+
<artifactId>jetty-slf4j-impl</artifactId>
76+
<version>${lib-jetty-version}</version>
77+
</dependency>
78+
<dependency>
1979
<groupId>org.osgi</groupId>
2080
<artifactId>org.osgi.core</artifactId>
2181
<version>${lib-osgi-version}</version>

0 commit comments

Comments
 (0)