Skip to content

Commit d6f6296

Browse files
maximthomasmaximthomas
authored
move javax.version to servlet-api.version property in maven (#152)
1 parent 53a2e56 commit d6f6296

File tree

10 files changed

+35
-13
lines changed

10 files changed

+35
-13
lines changed

‎commons/audit/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
~ information: "Portions copyright [year] [name of copyright owner]".
1414
~
1515
~ Copyright 2015-2016 ForgeRock AS.
16+
~ Portions copyright 2020-2025 3A Systems LLC.
1617
-->
1718

1819
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -77,7 +78,7 @@
7778
<dependency>
7879
<groupId>javax.servlet</groupId>
7980
<artifactId>javax.servlet-api</artifactId>
80-
<version>${javax.version}</version>
81+
<version>${servlet-api.version}</version>
8182
<scope>provided</scope>
8283
</dependency>
8384
</dependencies>

‎commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2013-2016 ForgeRock AS.
16+
* Portions copyright 2020-2025 3A Systems LLC.
1617
-->
1718
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1819

@@ -59,7 +60,7 @@
5960
<dependency>
6061
<groupId>javax.servlet</groupId>
6162
<artifactId>javax.servlet-api</artifactId>
62-
<version>${javax.version}</version>
63+
<version>${servlet-api.version}</version>
6364
<scope>provided</scope>
6465
</dependency>
6566
<dependency>

‎commons/auth-filters/authz-filter/framework-functional-tests/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2014-2016 ForgeRock AS.
16+
* Portions copyright 2020-2025 3A Systems LLC.
1617
-->
1718
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1819
<modelVersion>4.0.0</modelVersion>
@@ -177,7 +178,7 @@
177178
<dependency>
178179
<groupId>javax.servlet</groupId>
179180
<artifactId>javax.servlet-api</artifactId>
180-
<version>${javax.version}</version>
181+
<version>${servlet-api.version}</version>
181182
<scope>provided</scope>
182183
</dependency>
183184
<dependency>

‎commons/geo/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Header, with the fields enclosed by brackets [] replaced by your own identifying
1212
* information: "Portions copyright [year] [name of copyright owner]".
1313
*
14-
* Copyright 2020-2024 3A Systems LLC.
14+
* Copyright 2020-2025 3A Systems LLC.
1515
-->
1616
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>javax.servlet</groupId>
3131
<artifactId>javax.servlet-api</artifactId>
32-
<version>${javax.version}</version>
32+
<version>${servlet-api.version}</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
<dependency>

‎commons/http-framework/examples/servlet-example/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
information: "Portions Copyright [year] [name of copyright owner]".
1414
1515
Copyright 2015-2016 ForgeRock AS.
16+
Portions Copyright 2020-2025 3A Systems LLC.
1617
-->
1718
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1819
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +41,7 @@
4041
<dependency>
4142
<groupId>javax.servlet</groupId>
4243
<artifactId>javax.servlet-api</artifactId>
43-
<version>${javax.version}</version>
44+
<version>${servlet-api.version}</version>
4445
<scope>provided</scope>
4546
</dependency>
4647
<dependency>

‎commons/http-framework/servlet/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
information: "Portions Copyright [year] [name of copyright owner]".
1414
1515
Copyright 2014-2016 ForgeRock AS.
16-
Portions Copyright 2017-2024 3A Systems, LLC.
16+
Portions Copyright 2017-2025 3A Systems, LLC.
1717
-->
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1919
<modelVersion>4.0.0</modelVersion>
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>javax.servlet</groupId>
3636
<artifactId>javax.servlet-api</artifactId>
37-
<version>${javax.version}</version>
37+
<version>${servlet-api.version}</version>
3838
<scope>provided</scope>
3939
</dependency>
4040
<dependency>

‎commons/httpdump/pom.xml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
<!--
2+
* The contents of this file are subject to the terms of the Common Development and
3+
* Distribution License (the License). You may not use this file except in compliance with the
4+
* License.
5+
*
6+
* You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
7+
* specific language governing permission and limitations under the License.
8+
*
9+
* When distributing Covered Software, include this CDDL Header Notice in each file and include
10+
* the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
11+
* Header, with the fields enclosed by brackets [] replaced by your own identifying
12+
* information: "Portions copyright [year] [name of copyright owner]".
13+
*
14+
* Copyright 2020-2025 3A Systems LLC.
15+
-->
16+
117
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
218
<modelVersion>4.0.0</modelVersion>
319
<parent>
@@ -16,7 +32,7 @@
1632
<dependency>
1733
<groupId>javax.servlet</groupId>
1834
<artifactId>javax.servlet-api</artifactId>
19-
<version>${javax.version}</version>
35+
<version>${servlet-api.version}</version>
2036
<scope>provided</scope>
2137
</dependency>
2238
<dependency>

‎commons/rest/json-resource-http/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
information: "Portions Copyright [year] [name of copyright owner]".
1414
1515
Copyright 2012-2016 ForgeRock AS.
16+
Portions Copyright 2020-2025 3A Systems LLC.
1617
-->
1718
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1819
<modelVersion>4.0.0</modelVersion>
@@ -74,7 +75,7 @@
7475
<dependency>
7576
<groupId>javax.servlet</groupId>
7677
<artifactId>javax.servlet-api</artifactId>
77-
<version>${javax.version}</version>
78+
<version>${servlet-api.version}</version>
7879
<scope>test</scope>
7980
</dependency>
8081
<dependency>

‎guice/servlet/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Header, with the fields enclosed by brackets [] replaced by your own identifying
1313
information: "Portions Copyrighted [year] [name of copyright owner]".
1414
1515
Copyright 2014 ForgeRock AS.
16+
Portions Copyrighted 2020-2025 3A Systems LLC.
1617
-->
1718
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1819
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +38,7 @@ Copyright 2014 ForgeRock AS.
3738
<dependency>
3839
<groupId>javax.servlet</groupId>
3940
<artifactId>javax.servlet-api</artifactId>
40-
<version>${javax.version}</version>
41+
<version>${servlet-api.version}</version>
4142
<scope>provided</scope>
4243
</dependency>
4344
</dependencies>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
<rhino.version>1.7.14</rhino.version>
209209
<jetty.version>9.4.57.v20241219</jetty.version>
210210
<grizzly-framework.version>2.3.35</grizzly-framework.version>
211-
<javax.version>3.1.0</javax.version>
211+
<servlet-api.version>3.1.0</servlet-api.version>
212212
</properties>
213213

214214
<prerequisites>
@@ -705,7 +705,7 @@
705705
<dependency>
706706
<groupId>javax.servlet</groupId>
707707
<artifactId>javax.servlet-api</artifactId>
708-
<version>${javax.version}</version>
708+
<version>${servlet-api.version}</version>
709709
<scope>provided</scope>
710710
</dependency>
711711

0 commit comments

Comments
 (0)