Skip to content

Commit

Permalink
Improving JPA pom.xml as part of overall JPA refactoring (helidon-io#…
Browse files Browse the repository at this point in the history
…6508)

Signed-off-by: Laird Nelson <[email protected]>
  • Loading branch information
ljnelson authored Mar 29, 2023
1 parent 1dea349 commit c9a849e
Show file tree
Hide file tree
Showing 3 changed files with 158 additions and 98 deletions.
22 changes: 22 additions & 0 deletions dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<version.lib.jakarta.transaction-api>2.0.0</version.lib.jakarta.transaction-api>
<version.lib.jakarta.validation-api>3.0.0</version.lib.jakarta.validation-api>
<version.lib.jakarta.websockets-api>2.0.0</version.lib.jakarta.websockets-api>
<!-- Check Hibernate when upgrading to ensure its supplied jaxb-runtime is compatible. -->
<version.lib.jakarta.xml.bind-api>3.0.1</version.lib.jakarta.xml.bind-api>
<version.lib.jandex>2.4.3.Final</version.lib.jandex>
<version.lib.jaxb-core>3.0.2</version.lib.jaxb-core>
Expand Down Expand Up @@ -263,21 +264,42 @@
<artifactId>opentracing-tracerresolver</artifactId>
<version>${version.lib.opentracing.tracerresolver}</version>
</dependency>
<!--
"Jakarta XML Binding API". (See
https://github.com/jakartaee/jaxb-api/blob/d8a68e76a5391cb2462f540c9e4c5c81d0a91942/jaxb-api/pom.xml#L23-L25)
-->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.lib.jakarta.xml.bind-api}</version>
</dependency>
<!--
"Old JAXB Core". (See
https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/bundles/core/pom.xml#L25-L30.)
-->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${version.lib.jaxb-core}</version>
</dependency>
<!--
"Old JAXB Runtime". (See
https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/bundles/runtime/pom.xml#L25-L30.)
-->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.lib.jaxb-impl}</version>
</dependency>
<!--
"JAXB Runtime"/"JAXB (JSR 222) Reference Implementation". (See
https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/runtime/impl/pom.xml#L25-L30.)
-->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${version.lib.jaxb-runtime}</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
Expand Down
28 changes: 1 addition & 27 deletions integrations/cdi/jpa-cdi/etc/spotbugs/exclude.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2021 Oracle and/or its affiliates.
Copyright (c) 2019, 2023 Oracle and/or its affiliates.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -31,30 +31,4 @@
<Class name="io.helidon.integrations.cdi.jpa.DelegatingTypedQuery"/>
<Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
</Match>

<!-- These are delegating classes. User input validation would need to occur upstream -->
<Match>
<Class name="io.helidon.integrations.cdi.jpa.DelegatingConnection"/>
<Bug pattern="EXTERNAL_CONFIG_CONTROL"/>
</Match>
<Match>
<Class name="io.helidon.integrations.cdi.jpa.DelegatingConnection"/>
<Bug pattern="SQL_INJECTION_JDBC"/>
</Match>
<Match>
<Class name="io.helidon.integrations.cdi.jpa.DelegatingEntityManager"/>
<Bug pattern="SQL_INJECTION_JDBC"/>
</Match>
<Match>
<Class name="io.helidon.integrations.cdi.jpa.JpaTransactionScopedEntityManager"/>
<Bug pattern="SQL_INJECTION_JPA"/>
</Match>
<Match>
<Class name="io.helidon.integrations.cdi.jpa.NonTransactionalEntityManager"/>
<Bug pattern="SQL_INJECTION_JPA"/>
</Match>
<Match>
<Class name="io.helidon.integrations.cdi.jpa.DelegatingEntityManager"/>
<Bug pattern="SQL_INJECTION_JPA"/>
</Match>
</FindBugsFilter>
Loading

0 comments on commit c9a849e

Please sign in to comment.