Skip to content
Draft
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
17 changes: 1 addition & 16 deletions core-feature-pack/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -612,22 +612,7 @@

<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-linux-x86_64</artifactId>
</dependency>

<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-linux-s390x</artifactId>
</dependency>

<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-macosx-x86_64</artifactId>
</dependency>

<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-windows-x86_64</artifactId>
<artifactId>wildfly-openssl-all</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,9 @@
-->

<tasks xmlns="urn:wildfly:wildfly-feature-pack-tasks:2.0">
<copy-artifact artifact="org.wildfly.openssl:wildfly-openssl-linux-x86_64" to-location="modules/system/layers/base/org/wildfly/openssl/main/lib" extract="true">
<copy-artifact artifact="org.wildfly.openssl:wildfly-openssl-all" to-location="modules/system/layers/base/org/wildfly/openssl/main/lib" extract="true">
<filter pattern="META-INF*" include="false" />
</copy-artifact>
<copy-artifact artifact="org.wildfly.openssl:wildfly-openssl-linux-s390x" to-location="modules/system/layers/base/org/wildfly/openssl/main/lib" extract="true">
<filter pattern="META-INF*" include="false" />
</copy-artifact>
<copy-artifact artifact="org.wildfly.openssl:wildfly-openssl-macosx-x86_64" to-location="modules/system/layers/base/org/wildfly/openssl/main/lib" extract="true" optional="true">
<filter pattern="META-INF*" include="false" />
</copy-artifact>
<copy-artifact artifact="org.wildfly.openssl:wildfly-openssl-windows-x86_64" to-location="modules/system/layers/base/org/wildfly/openssl/main/lib" extract="true">
<filter pattern="*.dll" include="true"/>
<filter pattern="META-INF*" include="false" />
<filter pattern="*.*" include="false"/>
<filter pattern="win-x86_64/*.exp" include="false" />
<filter pattern="win-x86_64/*.lib" include="false" />
</copy-artifact>
</tasks>
24 changes: 0 additions & 24 deletions elytron/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -361,30 +361,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-linux-x86_64</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-linux-s390x</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-macosx-x86_64</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-windows-x86_64</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
Expand Down
27 changes: 4 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,8 @@
<version.org.wildfly.installation-manager.installation-manager-api>1.1.1.Final</version.org.wildfly.installation-manager.installation-manager-api>
<version.org.wildfly.launcher>1.0.2.Final</version.org.wildfly.launcher>
<version.org.wildfly.legacy.test>10.0.2.Final</version.org.wildfly.legacy.test>
<version.org.wildfly.openssl>2.2.5.Final</version.org.wildfly.openssl>
<version.org.wildfly.openssl.natives>2.2.2.Final</version.org.wildfly.openssl.natives>
<version.org.wildfly.openssl.wildfly-openssl-linux-x86_64>2.2.2.SP01</version.org.wildfly.openssl.wildfly-openssl-linux-x86_64>
<version.org.wildfly.openssl.wildfly-openssl-linux-s390x>2.2.2.SP01</version.org.wildfly.openssl.wildfly-openssl-linux-s390x>
<version.org.wildfly.openssl.wildfly-openssl-macosx-x86_64>${version.org.wildfly.openssl.natives}</version.org.wildfly.openssl.wildfly-openssl-macosx-x86_64>
<version.org.wildfly.openssl.wildfly-openssl-windows-x86_64>${version.org.wildfly.openssl.natives}</version.org.wildfly.openssl.wildfly-openssl-windows-x86_64>
<version.org.wildfly.openssl>2.3.0.Alpha2</version.org.wildfly.openssl>
<version.org.wildfly.openssl.natives>2.3.0.Alpha3</version.org.wildfly.openssl.natives>
<version.org.wildfly.security.elytron>2.7.1.Final</version.org.wildfly.security.elytron>
<version.org.wildfly.security.elytron-web>4.1.2.Final</version.org.wildfly.security.elytron-web>
<version.org.wildfly.security.jakarta.elytron-ee>3.2.0.Final</version.org.wildfly.security.jakarta.elytron-ee>
Expand Down Expand Up @@ -1761,23 +1757,8 @@
</dependency>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-linux-x86_64</artifactId>
<version>${version.org.wildfly.openssl.wildfly-openssl-linux-x86_64}</version>
</dependency>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-linux-s390x</artifactId>
<version>${version.org.wildfly.openssl.wildfly-openssl-linux-s390x}</version>
</dependency>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-macosx-x86_64</artifactId>
<version>${version.org.wildfly.openssl.wildfly-openssl-macosx-x86_64}</version>
</dependency>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-windows-x86_64</artifactId>
<version>${version.org.wildfly.openssl.wildfly-openssl-windows-x86_64}</version>
<artifactId>wildfly-openssl-all</artifactId>
<version>${version.org.wildfly.openssl.natives}</version>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
Expand Down
24 changes: 2 additions & 22 deletions testsuite/elytron/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,26 +85,6 @@
<artifactId>wildfly-openssl-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-linux-x86_64</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-linux-s390x</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-macosx-x86_64</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-windows-x86_64</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-auth</artifactId>
Expand Down Expand Up @@ -427,7 +407,7 @@
<feature-packs>
<feature-pack>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<version>${project.version}</version>
<!-- Specifically include patching -->
<included-packages>
Expand Down Expand Up @@ -467,7 +447,7 @@
<feature-packs>
<feature-pack>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<version>${project.version}</version>
<!-- Specifically include patching -->
<included-packages>
Expand Down
Loading