libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

KEYCLOAK-18597 Product distribution ZIP does not include rh-sso-7.5 folder

Browse source
This commit is contained in:
Peter Skopek 2021-07-29 09:21:58 +02:00 committed by Stian Thorgersen
parent afb0b16e43
commit 3ed20e2878
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
distribution/server-dist/pom.xml
View file

@ -81,7 +81,6 @@
</dependencies> </dependencies>
<build> <build>
<finalName>${server.output.dir.prefix}-${server.output.dir.version}</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.jboss.galleon</groupId> <groupId>org.jboss.galleon</groupId>
@ -94,7 +93,7 @@
</goals> </goals>
<phase>compile</phase> <phase>compile</phase>
<configuration> <configuration>
<install-dir>${basedir}/target/${project.build.finalName}</install-dir> <install-dir>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}</install-dir>
<record-state>false</record-state> <record-state>false</record-state>
<log-time>${galleon.log.time}</log-time> <log-time>${galleon.log.time}</log-time>
<offline>${galleon.offline}</offline> <offline>${galleon.offline}</offline>
@ -167,7 +166,7 @@
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-server-feature-pack</artifactId> <artifactId>keycloak-server-feature-pack</artifactId>
<type>zip</type> <type>zip</type>
<outputDirectory>${basedir}/target/${project.build.finalName}/docs</outputDirectory> <outputDirectory>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs</outputDirectory>
<includes>content/docs/licenses-${product.slot}/**</includes> <includes>content/docs/licenses-${product.slot}/**</includes>
<fileMappers> <fileMappers>
<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper> <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
@ -196,21 +195,21 @@
<excludeDefaultDirectories>true</excludeDefaultDirectories> <excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets> <filesets>
<fileset> <fileset>
<directory>${basedir}/target/${project.build.finalName}</directory> <directory>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}</directory>
<includes> <includes>
<include>README.txt</include> <include>README.txt</include>
<include>copyright.txt</include> <include>copyright.txt</include>
</includes> </includes>
</fileset> </fileset>
<fileset> <fileset>
<directory>${basedir}/target/${project.build.finalName}/welcome-content</directory> <directory>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/welcome-content</directory>
<excludes> <excludes>
<exclude>robots.txt</exclude> <exclude>robots.txt</exclude>
<exclude>index.html</exclude> <exclude>index.html</exclude>
</excludes> </excludes>
</fileset> </fileset>
<fileset> <fileset>
<directory>${basedir}/target/${project.build.finalName}/modules/system/layers/keycloak/org/jboss/as/product</directory> <directory>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/modules/system/layers/keycloak/org/jboss/as/product</directory>
<excludes> <excludes>
<exclude>${product.slot}/**/*</exclude> <exclude>${product.slot}/**/*</exclude>
</excludes> </excludes>
@ -301,6 +300,9 @@
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<finalName>keycloak-${project.version}</finalName>
</build>
</profile> </profile>
<profile> <profile>
<id>product</id> <id>product</id>

5
pom.xml
View file

@ -1895,6 +1895,7 @@
<apache.httpcomponents.httpcore.fuse.version>4.4.4</apache.httpcomponents.httpcore.fuse.version> <apache.httpcomponents.httpcore.fuse.version>4.4.4</apache.httpcomponents.httpcore.fuse.version>
<ee.maven.groupId>org.wildfly</ee.maven.groupId> <ee.maven.groupId>org.wildfly</ee.maven.groupId>
<ee.maven.version>${wildfly.version}</ee.maven.version> <ee.maven.version>${wildfly.version}</ee.maven.version>
<product.filename.version>${project.version}</product.filename.version>
</properties> </properties>
<modules> <modules>
<module>quarkus</module> <module>quarkus</module>
@ -1920,6 +1921,10 @@
<product.default-profile>product</product.default-profile> <product.default-profile>product</product.default-profile>
<ee.maven.groupId>org.jboss.eap</ee.maven.groupId> <ee.maven.groupId>org.jboss.eap</ee.maven.groupId>
<ee.maven.version>${eap.version}</ee.maven.version> <ee.maven.version>${eap.version}</ee.maven.version>
<!-- Properties that drive the names of various directories produced by and used in the build -->
<server.output.dir.prefix>${product.name}</server.output.dir.prefix>
<!-- Version suffix that is appended to directories. Default is the maven GAV version but this can be edited to use a short form version -->
<server.output.dir.version>${product.filename.version}</server.output.dir.version>
</properties> </properties>
<build> <build>
<plugins> <plugins>