Skip to content

Commit c860ca6

Browse files
ASzcssilvert
ASzc
authored and
ssilvert
committed
KEYCLOAK-5843 Add custom license processing plugin to avoid directory symlinks (keycloak#4723)
Symlinks are frequently unavailable on Windows (must be on NTFS and user must have SeCreateSymbolicLinkPrivilege). Removing the symlinks for licenses/common/ should enable the build to function mostly normally on Windows. The individual license files will be incorrect, but that shouldn't matter for local builds. Release builds are done on *nix. The plugin rolls several different plugin executions into one. The common files are distributed using a resource jar, used by and unpacked by the plugin.
1 parent a8bcdfb commit c860ca6

File tree

33 files changed

+417
-368
lines changed

33 files changed

+417
-368
lines changed

‎distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
<fileSet>
5353
<directory>src/main/resources/licenses/${product.slot}</directory>
5454
<outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
55+
<excludes>
56+
<exclude>licenses.xml</exclude>
57+
</excludes>
5558
</fileSet>
5659
<fileSet>
5760
<directory>target/licenses</directory>

‎distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -90,35 +90,9 @@
9090
</execution>
9191
</executions>
9292
</plugin>
93-
<!-- License Data -->
9493
<plugin>
95-
<artifactId>maven-resources-plugin</artifactId>
96-
<executions>
97-
<execution>
98-
<id>licenses-copy-common</id>
99-
<phase>process-resources</phase>
100-
</execution>
101-
</executions>
102-
</plugin>
103-
<plugin>
104-
<groupId>org.codehaus.gmaven</groupId>
105-
<artifactId>groovy-maven-plugin</artifactId>
106-
<executions>
107-
<execution>
108-
<id>licenses-append-product</id>
109-
<phase>process-resources</phase>
110-
</execution>
111-
</executions>
112-
</plugin>
113-
<plugin>
114-
<groupId>org.codehaus.mojo</groupId>
115-
<artifactId>xml-maven-plugin</artifactId>
116-
<executions>
117-
<execution>
118-
<id>licenses-generate-html</id>
119-
<phase>process-resources</phase>
120-
</execution>
121-
</executions>
94+
<groupId>org.keycloak</groupId>
95+
<artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
12296
</plugin>
12397
</plugins>
12498
</build>

‎distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/common‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎distribution/adapters/fuse-adapter-zip/assembly.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
<fileSet>
3737
<directory>src/main/resources/licenses/${product.slot}</directory>
3838
<outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
39+
<excludes>
40+
<exclude>licenses.xml</exclude>
41+
</excludes>
3942
</fileSet>
4043
<fileSet>
4144
<directory>target/licenses</directory>

‎distribution/adapters/fuse-adapter-zip/pom.xml‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -168,35 +168,9 @@
168168
</execution>
169169
</executions>
170170
</plugin>
171-
<!-- License Data -->
172171
<plugin>
173-
<artifactId>maven-resources-plugin</artifactId>
174-
<executions>
175-
<execution>
176-
<id>licenses-copy-common</id>
177-
<phase>process-resources</phase>
178-
</execution>
179-
</executions>
180-
</plugin>
181-
<plugin>
182-
<groupId>org.codehaus.gmaven</groupId>
183-
<artifactId>groovy-maven-plugin</artifactId>
184-
<executions>
185-
<execution>
186-
<id>licenses-append-product</id>
187-
<phase>process-resources</phase>
188-
</execution>
189-
</executions>
190-
</plugin>
191-
<plugin>
192-
<groupId>org.codehaus.mojo</groupId>
193-
<artifactId>xml-maven-plugin</artifactId>
194-
<executions>
195-
<execution>
196-
<id>licenses-generate-html</id>
197-
<phase>process-resources</phase>
198-
</execution>
199-
</executions>
172+
<groupId>org.keycloak</groupId>
173+
<artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
200174
</plugin>
201175
</plugins>
202176
</build>

‎distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/common‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎distribution/adapters/js-adapter-zip/assembly.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
<fileSet>
4040
<directory>src/main/resources/licenses/${product.slot}</directory>
4141
<outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
42+
<excludes>
43+
<exclude>licenses.xml</exclude>
44+
</excludes>
4245
</fileSet>
4346
<fileSet>
4447
<directory>target/licenses</directory>

‎distribution/adapters/js-adapter-zip/pom.xml‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -83,35 +83,9 @@
8383
</execution>
8484
</executions>
8585
</plugin>
86-
<!-- License Data -->
8786
<plugin>
88-
<artifactId>maven-resources-plugin</artifactId>
89-
<executions>
90-
<execution>
91-
<id>licenses-copy-common</id>
92-
<phase>process-resources</phase>
93-
</execution>
94-
</executions>
95-
</plugin>
96-
<plugin>
97-
<groupId>org.codehaus.gmaven</groupId>
98-
<artifactId>groovy-maven-plugin</artifactId>
99-
<executions>
100-
<execution>
101-
<id>licenses-append-product</id>
102-
<phase>process-resources</phase>
103-
</execution>
104-
</executions>
105-
</plugin>
106-
<plugin>
107-
<groupId>org.codehaus.mojo</groupId>
108-
<artifactId>xml-maven-plugin</artifactId>
109-
<executions>
110-
<execution>
111-
<id>licenses-generate-html</id>
112-
<phase>process-resources</phase>
113-
</execution>
114-
</executions>
87+
<groupId>org.keycloak</groupId>
88+
<artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
11589
</plugin>
11690
</plugins>
11791
</build>

‎distribution/adapters/js-adapter-zip/src/main/resources/licenses/common‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎distribution/adapters/wildfly-adapter/assembly.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
<fileSet>
7171
<directory>src/main/resources/licenses/${product.slot}</directory>
7272
<outputDirectory>docs/licenses-${product.slot}-adapter</outputDirectory>
73+
<excludes>
74+
<exclude>licenses.xml</exclude>
75+
</excludes>
7376
</fileSet>
7477
<fileSet>
7578
<directory>target/licenses</directory>

0 commit comments

Comments
 (0)