libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Tidy up SAML Adapter Galleon Feature Pack build

Browse source 
Signed-off-by: Peter Skopek <pskopek@redhat.com>
This commit is contained in:
Peter Skopek 2023-08-30 15:24:09 +02:00 committed by Alexander Schwartz
parent ec08a7bb73
commit bca5fe8051
5 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
View file

@ -140,11 +140,6 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wildfly.core</groupId> <groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test-framework</artifactId> <artifactId>wildfly-subsystem-test-framework</artifactId>

5
adapters/saml/wildfly/wildfly-subsystem/pom.xml
View file

@ -86,11 +86,6 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wildfly.core</groupId> <groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test-framework</artifactId> <artifactId>wildfly-subsystem-test-framework</artifactId>

6
distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml
View file

@ -32,8 +32,6 @@
<properties> <properties>
<feature-pack.resources.directory>${basedir}/../../saml-adapters/wildfly-adapter/wildfly-jakarta-modules/src/main/resources</feature-pack.resources.directory> <feature-pack.resources.directory>${basedir}/../../saml-adapters/wildfly-adapter/wildfly-jakarta-modules/src/main/resources</feature-pack.resources.directory>
<version.org.wildfly.galleon-plugins>6.4.0.Final</version.org.wildfly.galleon-plugins>
<version.org.wildfly.maven.plugins.licenses-plugin>2.3.1.Final</version.org.wildfly.maven.plugins.licenses-plugin>
<license.directory>${project.build.directory}/resources/packages/docs.licenses/content/docs/licenses</license.directory> <license.directory>${project.build.directory}/resources/packages/docs.licenses/content/docs/licenses</license.directory>
</properties> </properties>
<dependencies> <dependencies>
@ -217,7 +215,7 @@
<plugin> <plugin>
<groupId>org.wildfly.galleon-plugins</groupId> <groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-galleon-maven-plugin</artifactId> <artifactId>wildfly-galleon-maven-plugin</artifactId>
<version>${version.org.wildfly.galleon-plugins}</version> <version>${org.wildfly.galleon-plugins.version}</version>
<dependencies> <dependencies>
<!-- <!--
feature-spec-gen uses wildfly-embedded to generate the feature specs, hence the designated feature-spec-gen uses wildfly-embedded to generate the feature specs, hence the designated
@ -254,7 +252,7 @@
<plugin> <plugin>
<groupId>org.wildfly.maven.plugins</groupId> <groupId>org.wildfly.maven.plugins</groupId>
<artifactId>licenses-plugin</artifactId> <artifactId>licenses-plugin</artifactId>
<version>${version.org.wildfly.maven.plugins.licenses-plugin}</version> <version>${org.wildfly.maven.plugins.licenses-plugin.version}</version>
<inherited>false</inherited> <inherited>false</inherited>
<executions> <executions>
<execution> <execution>

1
distribution/galleon-feature-packs/saml-adapter-galleon-pack/wildfly-feature-pack-build-eap.xml
View file

@ -26,7 +26,6 @@
</dependencies> </dependencies>
<default-packages> <default-packages>
<package name="modules.all"/> <package name="modules.all"/>
<package name="licenses"/>
</default-packages> </default-packages>
<generate-feature-specs> <generate-feature-specs>
<extensions> <extensions>

3
pom.xml
View file

@ -49,7 +49,7 @@
<project.build-time>${timestamp}</project.build-time> <project.build-time>${timestamp}</project.build-time>
<!-- Upstream WildFly Versions --> <!-- Upstream WildFly Versions -->
<upstream.wildfly.version>27.0.1.Final</upstream.wildfly.version> <upstream.wildfly.version>29.0.0.Final</upstream.wildfly.version>
<upstream.wildfly.build-tools.version>1.2.13.Final</upstream.wildfly.build-tools.version> <upstream.wildfly.build-tools.version>1.2.13.Final</upstream.wildfly.build-tools.version>
<upstream.wildfly.core.version>21.1.0.Final</upstream.wildfly.core.version> <upstream.wildfly.core.version>21.1.0.Final</upstream.wildfly.core.version>
@ -206,6 +206,7 @@
<!-- WildFly Galleon Build related properties --> <!-- WildFly Galleon Build related properties -->
<org.wildfly.galleon-plugins.version>6.4.2.Final</org.wildfly.galleon-plugins.version> <org.wildfly.galleon-plugins.version>6.4.2.Final</org.wildfly.galleon-plugins.version>
<org.jboss.galleon.version>5.1.0.Final</org.jboss.galleon.version> <org.jboss.galleon.version>5.1.0.Final</org.jboss.galleon.version>
<org.wildfly.maven.plugins.licenses-plugin.version>2.3.1.Final</org.wildfly.maven.plugins.licenses-plugin.version>
<!-- Galleon --> <!-- Galleon -->
<galleon.fork.embedded>true</galleon.fork.embedded> <galleon.fork.embedded>true</galleon.fork.embedded>