Skip to content

Commit c9a849e

Browse files
authored
Improving JPA pom.xml as part of overall JPA refactoring (helidon-io#6508)
Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
1 parent 1dea349 commit c9a849e

3 files changed

Lines changed: 158 additions & 98 deletions

File tree

dependencies/pom.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<version.lib.jakarta.transaction-api>2.0.0</version.lib.jakarta.transaction-api>
8181
<version.lib.jakarta.validation-api>3.0.0</version.lib.jakarta.validation-api>
8282
<version.lib.jakarta.websockets-api>2.0.0</version.lib.jakarta.websockets-api>
83+
<!-- Check Hibernate when upgrading to ensure its supplied jaxb-runtime is compatible. -->
8384
<version.lib.jakarta.xml.bind-api>3.0.1</version.lib.jakarta.xml.bind-api>
8485
<version.lib.jandex>2.4.3.Final</version.lib.jandex>
8586
<version.lib.jaxb-core>3.0.2</version.lib.jaxb-core>
@@ -263,21 +264,42 @@
263264
<artifactId>opentracing-tracerresolver</artifactId>
264265
<version>${version.lib.opentracing.tracerresolver}</version>
265266
</dependency>
267+
<!--
268+
"Jakarta XML Binding API". (See
269+
https://github.com/jakartaee/jaxb-api/blob/d8a68e76a5391cb2462f540c9e4c5c81d0a91942/jaxb-api/pom.xml#L23-L25)
270+
-->
266271
<dependency>
267272
<groupId>jakarta.xml.bind</groupId>
268273
<artifactId>jakarta.xml.bind-api</artifactId>
269274
<version>${version.lib.jakarta.xml.bind-api}</version>
270275
</dependency>
276+
<!--
277+
"Old JAXB Core". (See
278+
https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/bundles/core/pom.xml#L25-L30.)
279+
-->
271280
<dependency>
272281
<groupId>com.sun.xml.bind</groupId>
273282
<artifactId>jaxb-core</artifactId>
274283
<version>${version.lib.jaxb-core}</version>
275284
</dependency>
285+
<!--
286+
"Old JAXB Runtime". (See
287+
https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/bundles/runtime/pom.xml#L25-L30.)
288+
-->
276289
<dependency>
277290
<groupId>com.sun.xml.bind</groupId>
278291
<artifactId>jaxb-impl</artifactId>
279292
<version>${version.lib.jaxb-impl}</version>
280293
</dependency>
294+
<!--
295+
"JAXB Runtime"/"JAXB (JSR 222) Reference Implementation". (See
296+
https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/runtime/impl/pom.xml#L25-L30.)
297+
-->
298+
<dependency>
299+
<groupId>org.glassfish.jaxb</groupId>
300+
<artifactId>jaxb-runtime</artifactId>
301+
<version>${version.lib.jaxb-runtime}</version>
302+
</dependency>
281303
<dependency>
282304
<groupId>jakarta.ws.rs</groupId>
283305
<artifactId>jakarta.ws.rs-api</artifactId>
Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2019, 2021 Oracle and/or its affiliates.
3+
Copyright (c) 2019, 2023 Oracle and/or its affiliates.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -31,30 +31,4 @@
3131
<Class name="io.helidon.integrations.cdi.jpa.DelegatingTypedQuery"/>
3232
<Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
3333
</Match>
34-
35-
<!-- These are delegating classes. User input validation would need to occur upstream -->
36-
<Match>
37-
<Class name="io.helidon.integrations.cdi.jpa.DelegatingConnection"/>
38-
<Bug pattern="EXTERNAL_CONFIG_CONTROL"/>
39-
</Match>
40-
<Match>
41-
<Class name="io.helidon.integrations.cdi.jpa.DelegatingConnection"/>
42-
<Bug pattern="SQL_INJECTION_JDBC"/>
43-
</Match>
44-
<Match>
45-
<Class name="io.helidon.integrations.cdi.jpa.DelegatingEntityManager"/>
46-
<Bug pattern="SQL_INJECTION_JDBC"/>
47-
</Match>
48-
<Match>
49-
<Class name="io.helidon.integrations.cdi.jpa.JpaTransactionScopedEntityManager"/>
50-
<Bug pattern="SQL_INJECTION_JPA"/>
51-
</Match>
52-
<Match>
53-
<Class name="io.helidon.integrations.cdi.jpa.NonTransactionalEntityManager"/>
54-
<Bug pattern="SQL_INJECTION_JPA"/>
55-
</Match>
56-
<Match>
57-
<Class name="io.helidon.integrations.cdi.jpa.DelegatingEntityManager"/>
58-
<Bug pattern="SQL_INJECTION_JPA"/>
59-
</Match>
6034
</FindBugsFilter>

0 commit comments

Comments
 (0)