Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions LABELS
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ This product bundles Java Servlet API version 2.5, copyright Oracle and/or its a
* https://github.com/javaee/servlet-spec
* javax.servlet:javax.servlet-api

This product bundles JAXB version 2.2.2, copyright Oracle and/or its affiliates.,
which is available under the CDDL 1.1. For details, see licenses/bin/javax.CDDL11
* https://github.com/javaee/jaxb-v2
* javax.xml.bind:jaxb-api

This product bundles stax-api version 1.0-2, copyright Oracle and/or its affiliates.,
which is available under the CDDL 1.1. For details, see licenses/bin/javax.CDDL11
* https://github.com/javaee/
Expand Down
8 changes: 4 additions & 4 deletions extensions-core/orc-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
<artifactId>jsr311-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
Expand Down Expand Up @@ -131,8 +131,8 @@
<artifactId>commons-lang</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
Expand Down
41 changes: 17 additions & 24 deletions licenses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3724,30 +3724,6 @@ libraries:

---

name: JAXB
license_category: binary
module: hadoop-client
license_name: CDDL 1.1
version: 2.2.2
copyright: Oracle and/or its affiliates.
license_file_path: licenses/bin/javax.CDDL11
libraries:
- javax.xml.bind: jaxb-api

---

name: JAXB
license_category: binary
module: java-core
license_name: CDDL 1.1
version: 2.3.1
copyright: Oracle and/or its affiliates.
license_file_path: licenses/bin/javax.CDDL11
libraries:
- javax.xml.bind: jaxb-api

---

name: jsp-api
license_category: binary
module: hadoop-client
Expand Down Expand Up @@ -5006,6 +4982,23 @@ libraries:
- com.sun.activation: jakarta.activation

---
Comment thread
suraj-goel marked this conversation as resolved.
name: jakarta.activation-api
license_category: binary
module: core
license_name: Eclipse Distribution License 1.0
version: 1.2.2
libraries:
- jakarta.activation: jakarta.activation-api

---
name: jakarta.xml.bind-api
license_category: binary
module: core
license_name: Eclipse Distribution License 1.0
version: 2.3.3
libraries:
- jakarta.xml.bind: jakarta.xml.bind-api
---

# Web console modules start
name: "@babel/code-frame"
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -644,9 +644,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
Expand All @@ -661,7 +661,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.1</version>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.jdbi</groupId>
Expand Down
4 changes: 2 additions & 2 deletions processing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
12 changes: 2 additions & 10 deletions services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@
<version>3.6.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.jdbi</groupId>
Expand Down Expand Up @@ -341,15 +341,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<!--
~ The analysis gets confused between javax.xml.bind:jaxb-api and jakarta.xml.bind:jakarta.xml.bind-api.
~ The former is a direct dependency, and the latter is a transitive dependency of jackson 2.10+.
-->
<usedDependencies>
<dependency>javax.xml.bind:jaxb-api</dependency>
</usedDependencies>
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>jakarta.xml.bind:jakarta.xml.bind-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>jakarta.inject:jakarta.inject-api</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
</configuration>
Expand Down