Skip to content

Commit 0a737eb

Browse files
authored
Merge pull request #1933 from fl4via/dep-upgrade
Upgrade dependencies
2 parents 30e9d5c + d00028f commit 0a737eb

3 files changed

Lines changed: 40 additions & 61 deletions

File tree

‎core/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,20 @@
140140
<scope>test</scope>
141141
</dependency>
142142

143+
<dependency>
144+
<groupId>io.smallrye.common</groupId>
145+
<artifactId>smallrye-common-constraint</artifactId>
146+
<version>${version.io.smallrye.common}</version>
147+
<scope>test</scope>
148+
</dependency>
149+
150+
<dependency>
151+
<groupId>io.smallrye.common</groupId>
152+
<artifactId>smallrye-common-net</artifactId>
153+
<version>${version.io.smallrye.common}</version>
154+
<scope>test</scope>
155+
</dependency>
156+
143157
<dependency>
144158
<groupId>com.h2database</groupId>
145159
<artifactId>h2</artifactId>

‎pom.xml‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,27 +126,28 @@
126126
versions, add the artifactId or other qualifier to the property name.
127127
For example: <version.org.jboss.as.console>
128128
-->
129-
<version.com.h2database>2.1.214</version.com.h2database>
130-
<version.easymock>4.3</version.easymock>
129+
<version.com.h2database>2.4.240</version.com.h2database>
130+
<version.easymock>5.2.0</version.easymock>
131131
<version.jakarta.annotation.jakarta-annotation-api>2.1.1</version.jakarta.annotation.jakarta-annotation-api>
132132
<version.jakarta.servlet.jakarta-servlet-api>6.1.0</version.jakarta.servlet.jakarta-servlet-api>
133133
<version.jakarta.websocket.jakarta-websocket-api>2.1.1</version.jakarta.websocket.jakarta-websocket-api>
134134
<version.junit>4.13.2</version.junit>
135-
<version.netty>4.1.82.Final</version.netty>
135+
<version.netty>4.2.10.Final</version.netty>
136136
<version.org.apache.directory.server>2.0.0.AM26</version.org.apache.directory.server>
137-
<version.org.apache.httpcomponents>4.5.12</version.org.apache.httpcomponents>
138-
<version.org.jboss.classfilewriter>1.2.5.Final</version.org.jboss.classfilewriter>
139-
<version.org.jboss.logging>3.4.3.Final</version.org.jboss.logging>
140-
<version.org.jboss.logging.processor>2.2.1.Final</version.org.jboss.logging.processor>
141-
<version.org.jboss.logmanager>2.1.19.Final</version.org.jboss.logmanager>
137+
<version.org.apache.httpcomponents>4.5.14</version.org.apache.httpcomponents>
138+
<version.org.jboss.classfilewriter>1.3.0.Final</version.org.jboss.classfilewriter>
139+
<version.org.jboss.logging>3.6.2.Final</version.org.jboss.logging>
140+
<version.org.jboss.logging.processor>3.0.4.Final</version.org.jboss.logging.processor>
141+
<version.org.jboss.logmanager>3.1.2.Final</version.org.jboss.logmanager>
142142
<version.xnio>3.8.16.Final</version.xnio>
143143
<!-- TODO remove this dependency once xnio upgrades to latest jboss threads -->
144-
<version.org.jboss.threads>3.9.1</version.org.jboss.threads>
145-
<version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
144+
<version.org.jboss.threads>3.9.2</version.org.jboss.threads>
145+
<version.org.wildfly.common>2.0.1</version.org.wildfly.common>
146+
<version.io.smallrye.common>2.12.0</version.io.smallrye.common>
146147
<version.org.wildfly.client-config>1.0.1.Final</version.org.wildfly.client-config>
147148

148149
<!-- jacoco -->
149-
<version.org.jacoco>0.7.9</version.org.jacoco>
150+
<version.org.jacoco>0.8.14</version.org.jacoco>
150151
<jacoco.agent.argLine></jacoco.agent.argLine>
151152

152153
<!-- Spotbugs properties -->
@@ -162,13 +163,13 @@
162163
<!-- Checkstyle configuration -->
163164
<linkXRef>false</linkXRef>
164165
<version.io.undertow.build.checkstyle-config>2.0.0.Final</version.io.undertow.build.checkstyle-config>
165-
<version.com.github.spotbugs-maven-plugin>4.7.3.4</version.com.github.spotbugs-maven-plugin>
166+
<version.com.github.spotbugs-maven-plugin>4.7.3.6</version.com.github.spotbugs-maven-plugin>
166167

167168
<version.com.twitter.hpack>1.0.2</version.com.twitter.hpack>
168169

169170
<!-- Non-default maven plugin versions and configuration -->
170171
<version.org.wildfly.openssl>2.2.5.Final</version.org.wildfly.openssl>
171-
<version.bundle.plugin>5.1.1</version.bundle.plugin>
172+
<version.bundle.plugin>6.0.2</version.bundle.plugin>
172173

173174
<version.jmh>1.21</version.jmh>
174175
<maven.compiler.release>17</maven.compiler.release>
@@ -582,6 +583,18 @@
582583
<version>${version.org.wildfly.common}</version>
583584
</dependency>
584585

586+
<dependency>
587+
<groupId>io.smallrye.common</groupId>
588+
<artifactId>smallrye-common-constraint</artifactId>
589+
<version>${version.io.smallrye.common}</version>
590+
</dependency>
591+
592+
<dependency>
593+
<groupId>io.smallrye.common</groupId>
594+
<artifactId>smallrye-common-net</artifactId>
595+
<version>${version.io.smallrye.common}</version>
596+
</dependency>
597+
585598
<dependency>
586599
<groupId>com.h2database</groupId>
587600
<artifactId>h2</artifactId>

‎servlet/src/test/java/io/undertow/servlet/test/session/ServletSessionTestCase.java‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -183,52 +183,4 @@ public void clear() {
183183
}
184184
}
185185

186-
@Test
187-
public void testSessionConfigNoCookiesMatrixParameters() throws IOException {
188-
TestHttpClient client = new TestHttpClient();
189-
client.setCookieStore(new CookieStore() {
190-
@Override
191-
public void addCookie(Cookie cookie) {
192-
193-
}
194-
195-
@Override
196-
public List<Cookie> getCookies() {
197-
return Collections.EMPTY_LIST;
198-
}
199-
200-
@Override
201-
public boolean clearExpired(Date date) {
202-
return false;
203-
}
204-
205-
@Override
206-
public void clear() {
207-
208-
}
209-
});
210-
try {
211-
HttpResponse result = client.execute(new HttpGet(DefaultServer.getDefaultServerURL() + ";foo=bar/servletContext/aa/b"));
212-
Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode());
213-
String response = HttpClientUtils.readResponse(result);
214-
Assert.assertEquals("1", response);
215-
String url = result.getHeaders("url")[0].getValue();
216-
217-
result = client.execute(new HttpGet(url));
218-
Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode());
219-
response = HttpClientUtils.readResponse(result);
220-
url = result.getHeaders("url")[0].getValue();
221-
Assert.assertEquals("2", response);
222-
223-
result = client.execute(new HttpGet(url));
224-
Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode());
225-
response = HttpClientUtils.readResponse(result);
226-
Assert.assertEquals("3", response);
227-
228-
229-
} finally {
230-
client.getConnectionManager().shutdown();
231-
}
232-
}
233-
234186
}

0 commit comments

Comments
 (0)