Skip to content

Commit 6a42513

Browse files
arjantijmsarjantijms
authored
Merge pull request #359 from arjantijms/ee12_milestones
Update EE12 milestone dependencies
2 parents 74e8062 + b8638b4 commit 6a42513

5 files changed

Lines changed: 39 additions & 33 deletions

File tree

‎api/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2024 Contributors to the Eclipse Foundation.
4+
Copyright (c) 2019, 2026 Contributors to the Eclipse Foundation.
55
Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
66
77
This program and the accompanying materials are made available under the
@@ -30,7 +30,7 @@
3030

3131
<groupId>jakarta.security.enterprise</groupId>
3232
<artifactId>jakarta.security.enterprise-api</artifactId>
33-
<version>4.0.1-SNAPSHOT</version>
33+
<version>5.0.0-SNAPSHOT</version>
3434

3535
<name>Jakarta Security</name>
3636
<description>
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>jakarta.servlet</groupId>
7171
<artifactId>jakarta.servlet-api</artifactId>
72-
<version>6.1.0</version>
72+
<version>6.2.0-M1</version>
7373
<scope>provided</scope>
7474
</dependency>
7575
<dependency>
@@ -81,13 +81,13 @@
8181
<dependency>
8282
<groupId>jakarta.el</groupId>
8383
<artifactId>jakarta.el-api</artifactId>
84-
<version>6.0.0</version>
84+
<version>6.1.0-M1</version>
8585
<scope>provided</scope>
8686
</dependency>
8787
<dependency>
8888
<groupId>jakarta.enterprise</groupId>
8989
<artifactId>jakarta.enterprise.cdi-api</artifactId>
90-
<version>4.1.0</version>
90+
<version>5.0.0-M1</version>
9191
<scope>provided</scope>
9292
</dependency>
9393
<dependency>
@@ -183,7 +183,7 @@
183183
<!-- Restricts the Java version to 17 -->
184184
<plugin>
185185
<artifactId>maven-compiler-plugin</artifactId>
186-
<version>3.13.0</version>
186+
<version>3.15.0</version>
187187
<configuration>
188188
<release>17</release>
189189
<compilerArgument>-Xlint:unchecked</compilerArgument>
@@ -199,7 +199,7 @@
199199
<version>2.2</version>
200200
<configuration>
201201
<spec>
202-
<specVersion>4.0</specVersion>
202+
<specVersion>5.0</specVersion>
203203
<specImplVersion>${project.version}</specImplVersion>
204204
<apiPackage>jakarta.security.enterprise</apiPackage>
205205
</spec>
@@ -218,7 +218,7 @@
218218
<plugin>
219219
<groupId>org.apache.felix</groupId>
220220
<artifactId>maven-bundle-plugin</artifactId>
221-
<version>5.1.9</version>
221+
<version>6.0.0</version>
222222
<configuration>
223223
<supportedProjectTypes>
224224
<supportedProjectType>jar</supportedProjectType>
@@ -304,7 +304,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
304304
<plugin>
305305
<groupId>org.codehaus.mojo</groupId>
306306
<artifactId>flatten-maven-plugin</artifactId>
307-
<version>1.6.0</version>
307+
<version>1.7.3</version>
308308
<configuration>
309309
<flattenMode>ossrh</flattenMode>
310310
</configuration>

‎pom.xml‎

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

33
<!--
44
5-
Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation.
5+
Copyright (c) 2019, 2026 Contributors to the Eclipse Foundation.
66
77
This program and the accompanying materials are made available under the
88
terms of the Eclipse Public License v. 2.0, which is available at
@@ -109,7 +109,7 @@
109109
</plugins>
110110
</pluginManagement>
111111
<plugins>
112-
<!-- Sets minimal Maven version to 3.8.6 -->
112+
<!-- Sets minimal Maven version to 3.9.6 -->
113113
<plugin>
114114
<groupId>org.apache.maven.plugins</groupId>
115115
<artifactId>maven-enforcer-plugin</artifactId>
@@ -122,7 +122,7 @@
122122
<configuration>
123123
<rules>
124124
<requireMavenVersion>
125-
<version>3.8.6</version>
125+
<version>3.9.6</version>
126126
</requireMavenVersion>
127127
</rules>
128128
</configuration>

‎spec/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2024 Contributors to the Eclipse Foundation.
4+
Copyright (c) 2019, 2026 Contributors to the Eclipse Foundation.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -50,7 +50,7 @@
5050
<plugin>
5151
<groupId>org.codehaus.mojo</groupId>
5252
<artifactId>build-helper-maven-plugin</artifactId>
53-
<version>3.4.0</version>
53+
<version>3.6.1</version>
5454
<executions>
5555
<execution>
5656
<id>timestamp-property</id>
@@ -70,12 +70,12 @@
7070
<plugin>
7171
<groupId>org.asciidoctor</groupId>
7272
<artifactId>asciidoctor-maven-plugin</artifactId>
73-
<version>3.0.0</version>
73+
<version>3.2.0</version>
7474
<dependencies>
7575
<dependency>
7676
<groupId>org.asciidoctor</groupId>
7777
<artifactId>asciidoctorj-pdf</artifactId>
78-
<version>2.3.15</version>
78+
<version>2.3.23</version>
7979
</dependency>
8080
</dependencies>
8181
<executions>
@@ -153,7 +153,7 @@
153153
<plugin>
154154
<groupId>org.apache.maven.plugins</groupId>
155155
<artifactId>maven-assembly-plugin</artifactId>
156-
<version>3.7.1</version>
156+
<version>3.8.0</version>
157157
<inherited>false</inherited>
158158
<executions>
159159
<execution>

‎tck-dist/userguide/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2024 Contributors to the Eclipse Foundation.
4+
Copyright (c) 2024, 2026 Contributors to the Eclipse Foundation.
55
Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
66
77
This program and the accompanying materials are made available under the
@@ -100,12 +100,12 @@
100100
<plugin>
101101
<groupId>org.asciidoctor</groupId>
102102
<artifactId>asciidoctor-maven-plugin</artifactId>
103-
<version>3.0.0</version>
103+
<version>3.2.0</version>
104104
<dependencies>
105105
<dependency>
106106
<groupId>org.asciidoctor</groupId>
107107
<artifactId>asciidoctorj-pdf</artifactId>
108-
<version>2.3.15</version>
108+
<version>2.3.23</version>
109109
</dependency>
110110
</dependencies>
111111
</plugin>

‎tck/app-securitycontext-customprincipal/src/test/java/ee/jakarta/tck/security/test/AppSecurityContextCallerPrincipalIT.java‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,41 +36,47 @@ public static Archive<?> createDeployment() {
3636
@Test
3737
public void testServletCustomPrincipal() {
3838
String resp = readFromServer("/servlet");
39-
assertTrue(isContainerPrincipalTypeInResponse(resp,false));
39+
assertTrue(isContainerPrincipalTypeInResponse(resp, false));
4040
}
4141

4242
@Test
4343
public void testServletCustomCallerPrincipal() {
4444
String resp = readFromServer("/servlet?useCallerPrincipal");
45-
assertTrue(isContainerPrincipalTypeInResponse(resp,true));
45+
assertTrue(isContainerPrincipalTypeInResponse(resp, true));
4646
}
4747

4848
@Test
4949
public void testEjbCustomPrincipal() {
5050
String resp = readFromServer("/ejb-servlet");
51-
assertTrue(isContainerPrincipalTypeInResponse(resp,false));
51+
assertTrue(isContainerPrincipalTypeInResponse(resp, false));
5252
}
5353

5454
@Test
5555
public void testEjbCustomCallerPrincipal() {
5656
String resp = readFromServer("/ejb-servlet?useCallerPrincipal");
57-
assertTrue(isContainerPrincipalTypeInResponse(resp,true));
57+
assertTrue(isContainerPrincipalTypeInResponse(resp, true));
5858
}
5959

6060
public boolean isContainerPrincipalTypeInResponse(String response, boolean isCallerPrincipalUsed) {
6161
String[] principalArray = response.split(",");
6262
String containerPrincipal = principalArray[0];
6363
String applicationPrincipal = principalArray[1];
64-
String inputApplicationPrincipal = isCallerPrincipalUsed ? "ee.jakarta.tck.security.test.CustomCallerPrincipal" : "ee.jakarta.tck.security.test.CustomPrincipal";
65-
boolean isContainerPricipalCorrect = containerPrincipal.contains("com.sun.enterprise.security.web.integration.WebPrincipal") ||
66-
containerPrincipal.contains("weblogic.security.principal.WLSUserImpl") ||
67-
containerPrincipal.contains("com.ibm.ws.security.authentication.principals.WSPrincipal") ||
68-
containerPrincipal.contains("org.jboss.security.SimplePrincipal") ||
69-
containerPrincipal.contains("org.jboss.security.SimpleGroup") ||
70-
containerPrincipal.contains("org.apache.tomee.catalina.TomcatSecurityService$TomcatUser") ||
71-
containerPrincipal.contains("jakarta.security.enterprise.CallerPrincipal") ||
72-
containerPrincipal.contains(inputApplicationPrincipal);
64+
String inputApplicationPrincipal = isCallerPrincipalUsed ?
65+
"ee.jakarta.tck.security.test.CustomCallerPrincipal"
66+
: "ee.jakarta.tck.security.test.CustomPrincipal";
67+
68+
boolean isContainerPricipalCorrect =
69+
containerPrincipal.contains("com.sun.enterprise.security.web.integration.WebPrincipal")
70+
|| containerPrincipal.contains("weblogic.security.principal.WLSUserImpl")
71+
|| containerPrincipal.contains("com.ibm.ws.security.authentication.principals.WSPrincipal")
72+
|| containerPrincipal.contains("org.jboss.security.SimplePrincipal")
73+
|| containerPrincipal.contains("org.jboss.security.SimpleGroup")
74+
|| containerPrincipal.contains("org.apache.tomee.catalina.TomcatSecurityService$TomcatUser")
75+
|| containerPrincipal.contains("jakarta.security.enterprise.CallerPrincipal")
76+
|| containerPrincipal.contains(inputApplicationPrincipal);
77+
7378
boolean isApplicationPrincipalCorrect = applicationPrincipal.contains(inputApplicationPrincipal);
79+
7480
return isContainerPricipalCorrect && isApplicationPrincipalCorrect;
7581
}
7682
}

0 commit comments

Comments
 (0)