Skip to content

Commit 7155509

Browse files
dmatejdmatej
authored
Merge pull request #26057 from eclipse-ee4j/RELEASE_803
Updated dependencies
2 parents 7bf4d70 + b0d4e4e commit 7155509

190 files changed

Lines changed: 660 additions & 655 deletions

File tree

Some content is hidden

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

‎appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/HttpClient10.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
2+
* Copyright (c) 2023, 2026 Contributors to the Eclipse Foundation.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -66,16 +66,16 @@ public HttpResponse send(String method, String content) throws Exception {
6666
InputStream inputStream = socket.getInputStream();
6767
socket.setSoLinger(true, 1000);
6868
PrintWriter outputWriter = new PrintWriter(new OutputStreamWriter(socket.getOutputStream()));
69-
outputWriter.println(method + " " + url.getPath() + " HTTP/1.0");
70-
outputWriter.println("Host: " + url.getHost() + ':' + url.getPort());
69+
outputWriter.print(method + " " + url.getPath() + " HTTP/1.0\r\n");
70+
outputWriter.print("Host: " + url.getHost() + ':' + url.getPort() + "\r\n");
7171
if (content != null) {
72-
outputWriter.println("Content-Length: " + content.length());
72+
outputWriter.print("Content-Length: " + content.length() + "\r\n");
7373
}
7474
if (user != null && password != null) {
7575
String basicAuth = Base64.getEncoder().encodeToString((user + ":" + password).getBytes(UTF_8));
76-
outputWriter.println("Authorization: Basic " + basicAuth);
76+
outputWriter.print("Authorization: Basic " + basicAuth + "\r\n");
7777
}
78-
outputWriter.println("");
78+
outputWriter.print("\r\n");
7979
if (content != null) {
8080
outputWriter.print(content);
8181
}

‎appserver/tests/application-tests/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<jacoco.includes>org/glassfish/**\:com/sun/enterprise/**</jacoco.includes>
4646

47-
<omnifish.arquillian.version>2.1.3</omnifish.arquillian.version>
47+
<omnifish.arquillian.version>2.2.0</omnifish.arquillian.version>
4848
</properties>
4949

5050
<dependencyManagement>
@@ -61,14 +61,14 @@
6161
<dependency>
6262
<groupId>org.jboss.arquillian</groupId>
6363
<artifactId>arquillian-bom</artifactId>
64-
<version>1.10.1.Final</version>
64+
<version>1.10.2.Final</version>
6565
<scope>import</scope>
6666
<type>pom</type>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.jboss.arquillian.junit5</groupId>
7070
<artifactId>arquillian-junit5-container</artifactId>
71-
<version>1.10.1.Final</version>
71+
<version>1.10.2.Final</version>
7272
<scope>test</scope>
7373
</dependency>
7474

‎appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/WebTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ private static void goGet(String host, int port,
5252
OutputStream os = s.getOutputStream();
5353

5454
contextPath += "?url=" + contextPath;
55-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
56-
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
57-
os.write("Host: localhost\n".getBytes());
58-
os.write("\n".getBytes());
55+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
56+
os.write(("GET " + contextPath + " HTTP/1.1\r\n").getBytes());
57+
os.write("Host: localhost\r\n".getBytes());
58+
os.write("\r\n".getBytes());
5959

6060
InputStream is = s.getInputStream();
6161
System.out.println("Time: " + (System.currentTimeMillis() - time));

‎appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/WebTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ private static void goGet(String host, int port,
5252
OutputStream os = s.getOutputStream();
5353

5454
contextPath += "?url=" + contextPath;
55-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
56-
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
57-
os.write("Host: localhost\n".getBytes());
58-
os.write("\n".getBytes());
55+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
56+
os.write(("GET " + contextPath + " HTTP/1.1\r\n").getBytes());
57+
os.write("Host: localhost\r\n".getBytes());
58+
os.write("\r\n".getBytes());
5959

6060
InputStream is = s.getInputStream();
6161
System.out.println("Time: " + (System.currentTimeMillis() - time));

‎appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/client/WebTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ private static void goGet(String host, int port,
5151
OutputStream os = s.getOutputStream();
5252

5353
contextPath += "?url=" + contextPath;
54-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
55-
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
56-
os.write("Host: localhost\n".getBytes());
57-
os.write("\n".getBytes());
54+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
55+
os.write(("GET " + contextPath + " HTTP/1.1\r\n").getBytes());
56+
os.write("Host: localhost\r\n".getBytes());
57+
os.write("\r\n".getBytes());
5858

5959
InputStream is = s.getInputStream();
6060
System.out.println("Time: " + (System.currentTimeMillis() - time));

‎appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/client/WebTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ private static void goGet(String host, int port,
5252
OutputStream os = s.getOutputStream();
5353

5454
contextPath += "?url=" + contextPath;
55-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
56-
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
57-
os.write("Host: localhost\n".getBytes());
58-
os.write("\n".getBytes());
55+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
56+
os.write(("GET " + contextPath + " HTTP/1.1\r\n").getBytes());
57+
os.write("Host: localhost\r\n".getBytes());
58+
os.write("\r\n".getBytes());
5959

6060
InputStream is = s.getInputStream();
6161
System.out.println("Time: " + (System.currentTimeMillis() - time));
@@ -98,9 +98,9 @@ private static void goGet(String host, int port,
9898
/*
9999
s = new Socket(host, port);
100100
os = s.getOutputStream();
101-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
102-
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
103-
os.write("\n".getBytes());
101+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
102+
os.write(("GET " + contextPath + " HTTP/1.0\r\n").getBytes());
103+
os.write("\r\n".getBytes());
104104
is = s.getInputStream();
105105
bis = new BufferedReader(new InputStreamReader(is));
106106

‎appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/client/WebTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ private static void goGet(String host, int port,
5252
OutputStream os = s.getOutputStream();
5353

5454
contextPath += "?url=" + contextPath;
55-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
56-
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
57-
os.write("Host: localhost\n".getBytes());
58-
os.write("\n".getBytes());
55+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
56+
os.write(("GET " + contextPath + " HTTP/1.1\r\n").getBytes());
57+
os.write("Host: localhost\r\n".getBytes());
58+
os.write("\r\n".getBytes());
5959

6060
InputStream is = s.getInputStream();
6161
System.out.println("Time: " + (System.currentTimeMillis() - time));

‎appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/client/WebTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ private static void goGet(String host, int port,
5151
OutputStream os = s.getOutputStream();
5252

5353
contextPath += "?url=" + contextPath;
54-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
55-
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
56-
os.write("Host: localhost\n".getBytes());
57-
os.write("\n".getBytes());
54+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
55+
os.write(("GET " + contextPath + " HTTP/1.1\r\n").getBytes());
56+
os.write("Host: localhost\r\n".getBytes());
57+
os.write("\r\n".getBytes());
5858

5959
InputStream is = s.getInputStream();
6060
System.out.println("Time: " + (System.currentTimeMillis() - time));

‎appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/client/WebTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ private static void goGet(String host, int port,
5252
OutputStream os = s.getOutputStream();
5353

5454
contextPath += "?url=" + contextPath;
55-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
56-
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
57-
os.write("Host: localhost\n".getBytes());
58-
os.write("\n".getBytes());
55+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
56+
os.write(("GET " + contextPath + " HTTP/1.1\r\n").getBytes());
57+
os.write("Host: localhost\r\n".getBytes());
58+
os.write("\r\n".getBytes());
5959

6060
InputStream is = s.getInputStream();
6161
System.out.println("Time: " + (System.currentTimeMillis() - time));
@@ -98,9 +98,9 @@ private static void goGet(String host, int port,
9898
/*
9999
s = new Socket(host, port);
100100
os = s.getOutputStream();
101-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
102-
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
103-
os.write("\n".getBytes());
101+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
102+
os.write(("GET " + contextPath + " HTTP/1.0\r\n").getBytes());
103+
os.write("\r\n".getBytes());
104104
is = s.getInputStream();
105105
bis = new BufferedReader(new InputStreamReader(is));
106106

‎appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/WebTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ private static void goGet(String host, int port,
5252
OutputStream os = s.getOutputStream();
5353

5454
contextPath += "?url=" + contextPath;
55-
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
56-
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
57-
os.write("Host: localhost\n".getBytes());
58-
os.write("\n".getBytes());
55+
System.out.println(("GET " + contextPath + " HTTP/1.1\r\n"));
56+
os.write(("GET " + contextPath + " HTTP/1.1\r\n").getBytes());
57+
os.write("Host: localhost\r\n".getBytes());
58+
os.write("\r\n".getBytes());
5959

6060
InputStream is = s.getInputStream();
6161
System.out.println("Time: " + (System.currentTimeMillis() - time));

0 commit comments

Comments
 (0)