Skip to content

Commit

Permalink
fix wrong merge of recent jpa changes, set the jsp version back to 4.…
Browse files Browse the repository at this point in the history
…0.0 with the explicit version of tck artifacts

Signed-off-by: Lukas Jungmann <[email protected]>
  • Loading branch information
lukasj committed Mar 4, 2024
1 parent 4cf7492 commit 13a8e74
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions jpa/bin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>dbprocedures</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
16 changes: 8 additions & 8 deletions jsp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</parent>

<artifactId>jakarta-pages-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>4.0.0</version>
<packaging>jar</packaging>

<name>pages-tck</name>
Expand All @@ -48,32 +48,32 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.parent.version}</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>runtime</artifactId>
<version>${project.parent.version}</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>libutil</artifactId>
<version>${project.parent.version}</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>web-servlet</artifactId>
<version>${project.parent.version}</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>web-jsp</artifactId>
<version>${project.parent.version}</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>assembly</artifactId>
<version>${project.parent.version}</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
Expand All @@ -83,7 +83,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>signaturetest</artifactId>
<version>${project.parent.version}</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.netbeans.tools</groupId>
Expand Down

0 comments on commit 13a8e74

Please sign in to comment.