Skip to content

Commit

Permalink
Merge pull request #449 from arjantijms/ee11_dependencies
Browse files Browse the repository at this point in the history
Update dependencies to Jakarta EE 11 ones
  • Loading branch information
arjantijms committed Mar 7, 2024
2 parents dad8f6f + d1899ee commit 1a08be0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -31,4 +31,4 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
run: mvn -B -Pstaging package --file pom.xml
4 changes: 2 additions & 2 deletions api/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -164,7 +164,7 @@
<header><![CDATA[<br>Jakarta Concurrency API v${project.version}]]></header>
<bottom><![CDATA[
Comments to: <a href="mailto:cu-dev@eclipse.org">cu-dev@eclipse.org</a>.<br>
Copyright &#169; 2020, 2022 Eclipse Foundation. All rights reserved.<br>
Copyright &#169; 2020, 2024 Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom>
<docfilessubdirs>true</docfilessubdirs>
Expand Down
13 changes: 6 additions & 7 deletions pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
~ Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
~
~ This program and the accompanying materials are made available under the
~ terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -78,13 +78,12 @@
<junit5.version>5.10.2</junit5.version>
<arquillian.version>1.8.0.Final</arquillian.version>

<!-- TODO update for Jakarta 11 -->
<jakarta.servlet.version>6.0.0</jakarta.servlet.version>
<jakarta.servlet.version>6.1.0-M2</jakarta.servlet.version>
<jakarta.ejb.version>4.0.1</jakarta.ejb.version>
<jakarta.jsp.version>3.1.1</jakarta.jsp.version>
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
<jakarta.cdi.version>4.0.1</jakarta.cdi.version>
<jakarta.jsp.version>4.0.0-M2</jakarta.jsp.version>
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
<jakarta.interceptor.version>2.2.0</jakarta.interceptor.version>
<jakarta.cdi.version>4.1.0</jakarta.cdi.version>
</properties>

<dependencyManagement>
Expand Down

0 comments on commit 1a08be0

Please sign in to comment.