Skip to content

[WFCORE-7694] Wire jose jwk, jwks and util, and Jackson into elytron-base #6915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rawojeda wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WFCORE-7694] Wire jose jwk, jwks and util, and Jackson into elytron-base #6915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions core-feature-pack/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,19 @@
<artifactId>bcutil-jdk18on</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>

<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
Expand Down Expand Up @@ -435,6 +448,18 @@
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-http-util</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-jose-jwk</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-jose-jwks</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-jose-util</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-json-util</artifactId>
Expand Down
14 changes: 14 additions & 0 deletions ...modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright The WildFly Authors
~ SPDX-License-Identifier: Apache-2.0
-->
<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-annotations">
<resources>
<artifact name="${com.fasterxml.jackson.core:jackson-annotations}"/>
</resources>

<dependencies>
</dependencies>
</module>
14 changes: 14 additions & 0 deletions ...ources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright The WildFly Authors
~ SPDX-License-Identifier: Apache-2.0
-->
<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-core">
<resources>
<artifact name="${com.fasterxml.jackson.core:jackson-core}"/>
</resources>

<dependencies>
</dependencies>
</module>
20 changes: 20 additions & 0 deletions ...es/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright The WildFly Authors
~ SPDX-License-Identifier: Apache-2.0
-->
<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-databind">

<resources>
<artifact name="${com.fasterxml.jackson.core:jackson-databind}"/>
</resources>
<dependencies>
<module name="java.desktop"/>
<module name="java.logging"/>
<module name="java.sql"/>
<module name="java.xml"/>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
</dependencies>
</module>
6 changes: 6 additions & 0 deletions ...in/resources/modules/system/layers/base/org/wildfly/security/elytron-base/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
<artifact name="${org.wildfly.security:wildfly-elytron-http-spnego}"/>
<artifact name="${org.wildfly.security:wildfly-elytron-http-sso}"/>
<artifact name="${org.wildfly.security:wildfly-elytron-http-util}"/>
<artifact name="${org.wildfly.security:wildfly-elytron-jose-jwk}"/>
<artifact name="${org.wildfly.security:wildfly-elytron-jose-jwks}"/>
<artifact name="${org.wildfly.security:wildfly-elytron-jose-util}"/>
<artifact name="${org.wildfly.security:wildfly-elytron-json-util}"/>
<!-- <artifact name="${org.wildfly.security:wildfly-elytron-jwt}"/> To be added as independent module in WildFly -->
<artifact name="${org.wildfly.security:wildfly-elytron-keystore}"/>
Expand Down Expand Up @@ -105,6 +108,9 @@
<module name="jakarta.xml.ws.api" optional="true"/>
<module name="org.jboss.ws.spi" optional="true"/>
<module name="org.apache.sshd"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="org.jboss.resteasy.resteasy-jaxrs" optional="true"/>
<!--
This is only exported because some of the ElytronXmlParser methods throw an exception in this module. If other
Expand Down
21 changes: 18 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,13 @@
<legacy.version.org.jboss.spec.javax.security.jacc.jboss-jacc-api_1.5_spec>2.0.0.Final</legacy.version.org.jboss.spec.javax.security.jacc.jboss-jacc-api_1.5_spec>

<version.ch.qos.logback>1.5.38</version.ch.qos.logback>
<version.com.fasterxml.jackson>2.21.6</version.com.fasterxml.jackson>
<version.com.fasterxml.jackson.annotations>2.21</version.com.fasterxml.jackson.annotations>
<version.com.fasterxml.jackson.databind>${version.com.fasterxml.jackson}</version.com.fasterxml.jackson.databind>
<version.com.googlecode.javaewah>1.2.3</version.com.googlecode.javaewah>
<version.com.google.code.findbugs>3.0.2</version.com.google.code.findbugs>
<version.com.google.guava>31.1-jre</version.com.google.guava>
<version.com.google.guava.failureaccess>1.0.3</version.com.google.guava.failureaccess>
<version.com.fasterxml.jackson>2.21.6</version.com.fasterxml.jackson>
<version.com.fasterxml.jackson.annotations>2.21</version.com.fasterxml.jackson.annotations>
<version.com.fasterxml.jackson.databind>${version.com.fasterxml.jackson}</version.com.fasterxml.jackson.databind>
<version.com.jcraft.jsch>0.1.55</version.com.jcraft.jsch>
<version.commons-cli>1.11.0</version.commons-cli>
<version.commons-collections>3.2.2</version.commons-collections>
Expand Down Expand Up @@ -789,6 +789,21 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${version.com.fasterxml.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${version.com.fasterxml.jackson.annotations}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${version.com.fasterxml.jackson.databind}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
Expand Down
Loading