Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed Jul 17, 2024
2 parents 2d77e72 + e6ac430 commit 2c294da
Showing 1 changed file with 44 additions and 0 deletions.
44 changes: 44 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1299,25 +1299,62 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
</dependency>
<dependency>
<!-- JSON API -->
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>2.1.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- JSON API -->
<!--
~ @todo #1307:15m/DEV Should be removed after updating
~ all dependent projects to jakarta namespace.
~ The following packages should also be removed:
~ org.glassfish:javax.json
~ javax.ws.rs:jsr311-api
~ javax.xml.bind:jaxb-api
~ javax.servlet:javax.servlet-api
-->
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- JSON reference implementation -->
<groupId>org.eclipse.parsson</groupId>
<artifactId>jakarta.json</artifactId>
<version>1.1.6</version>
<scope>runtime</scope>
</dependency>
<dependency>
<!-- JSON reference implementation -->
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<!-- JSR-311 JAX-RS API -->
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- JSR-311 JAX-RS API -->
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- JAXB API -->
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- JAXB API -->
<groupId>javax.xml.bind</groupId>
Expand Down Expand Up @@ -1456,6 +1493,13 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
<artifactId>tools.logging</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
<!-- Servlet API -->
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- Servlet API -->
<groupId>javax.servlet</groupId>
Expand Down

1 comment on commit 2c294da

@0pdd
Copy link

@0pdd 0pdd commented on 2c294da Jul 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 1307-f30066ce discovered in pom.xml) and submitted as #487. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

Please sign in to comment.