Skip to content

Commit 4f670a7

Browse files
committed
Revert usage of bogous jakarta artifacts.
1 parent 410f14c commit 4f670a7

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

pom.xml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -529,19 +529,19 @@
529529
</dependency>
530530

531531
<dependency>
532-
<groupId>jakarta.activation</groupId>
533-
<artifactId>jakarta.activation-api</artifactId>
534-
<version>${version.jakarta.activation.api}</version>
532+
<groupId>javax.activation</groupId>
533+
<artifactId>javax.activation-api</artifactId>
534+
<version>${version.javax.activation.api}</version>
535535
</dependency>
536536
<dependency>
537-
<groupId>jakarta.annotation</groupId>
538-
<artifactId>jakarta.annotation-api</artifactId>
539-
<version>${version.jakarta.annotation.api}</version>
537+
<groupId>javax.annotation</groupId>
538+
<artifactId>javax.annotation-api</artifactId>
539+
<version>${version.javax.annotation.api}</version>
540540
</dependency>
541541
<dependency>
542-
<groupId>jakarta.xml.bind</groupId>
543-
<artifactId>jakarta.xml.bind-api</artifactId>
544-
<version>${version.jakarta.xml.bind.api}</version>
542+
<groupId>javax.xml.bind</groupId>
543+
<artifactId>jaxb-api</artifactId>
544+
<version>${version.javax.xml.bind.api}</version>
545545
</dependency>
546546
<dependency>
547547
<groupId>com.sun.xml.ws</groupId>
@@ -1108,11 +1108,10 @@
11081108
<version.commons.lang3>3.8.1</version.commons.lang3>
11091109
<version.hsqldb>2.2.8</version.hsqldb>
11101110
<version.io.github.x-stream.mxparser>1.2.2</version.io.github.x-stream.mxparser>
1111-
<version.jakarta.activation.api>1.2.1</version.jakarta.activation.api>
1112-
<version.jakarta.annotation.api>1.3.4</version.jakarta.annotation.api>
11131111
<version.jakarta.inject.api>1.0</version.jakarta.inject.api>
1114-
<version.jakarta.xml.bind.api>2.3.2</version.jakarta.xml.bind.api>
11151112
<version.javaassist>3.12.1.GA</version.javaassist>
1113+
<version.javax.activation.api>1.2.0</version.javax.activation.api>
1114+
<version.javax.annotation.api>1.3.2</version.javax.annotation.api>
11161115
<version.javax.xml.bind.api>2.3.1</version.javax.xml.bind.api>
11171116
<version.javax.xml.ws.jaxws.rt>2.2</version.javax.xml.ws.jaxws.rt><!-- Java 5 -->
11181117
<version.jmock>1.0.1</version.jmock>

xstream-jmh/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
</configuration>
5151
<dependencies>
5252
<dependency>
53-
<groupId>jakarta.annotation</groupId>
54-
<artifactId>jakarta.annotation-api</artifactId>
55-
<version>${version.jakarta.annotation.api}</version>
53+
<groupId>javax.annotation</groupId>
54+
<artifactId>javax.annotation-api</artifactId>
55+
<version>${version.javax.annotation.api}</version>
5656
</dependency>
5757
</dependencies>
5858
</plugin>
@@ -168,8 +168,8 @@
168168
<scope>compile</scope>
169169
</dependency>
170170
<dependency>
171-
<groupId>jakarta.xml.bind</groupId>
172-
<artifactId>jakarta.xml.bind-api</artifactId>
171+
<groupId>javax.xml.bind</groupId>
172+
<artifactId>jaxb-api</artifactId>
173173
</dependency>
174174
</dependencies>
175175
<properties>

xstream/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@
100100
</dependency>
101101

102102
<dependency>
103-
<groupId>jakarta.activation</groupId>
104-
<artifactId>jakarta.activation-api</artifactId>
103+
<groupId>javax.activation</groupId>
104+
<artifactId>javax.activation-api</artifactId>
105105
<optional>true</optional>
106106
</dependency>
107107
<dependency>
108-
<groupId>jakarta.xml.bind</groupId>
109-
<artifactId>jakarta.xml.bind-api</artifactId>
108+
<groupId>javax.xml.bind</groupId>
109+
<artifactId>jaxb-api</artifactId>
110110
<scope>provided</scope><!-- only required for compilation with Java 11 or higher, but only used by Java 7 or below -->
111111
</dependency>
112112

@@ -386,9 +386,9 @@
386386
<artifactId>maven-surefire-plugin</artifactId>
387387
<dependencies>
388388
<dependency>
389-
<groupId>jakarta.xml.bind</groupId>
390-
<artifactId>jakarta.xml.bind-api</artifactId>
391-
<version>${version.jakarta.xml.bind.api}</version>
389+
<groupId>javax.xml.bind</groupId>
390+
<artifactId>jaxb-api</artifactId>
391+
<version>${version.javax.xml.bind.api}</version>
392392
</dependency>
393393
</dependencies>
394394
</plugin>

0 commit comments

Comments
 (0)