Revert changes that block themes being loaded from custom providers
Closes #13401
This commit is contained in:
parent
18dea27499
commit
333a4c900f
3 changed files with 26 additions and 4 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
@ -174,7 +174,9 @@ jobs:
|
|||
- name: Update maven settings
|
||||
if: ${{ github.event_name != 'pull_request' || matrix.server != 'undertow-map-hot-rod' || env.GIT_HOTROD_RELEVANT_DIFF != 0 }}
|
||||
run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/
|
||||
|
||||
- name: Prepare test providers
|
||||
if: ${{ matrix.server == 'quarkus' || matrix.server == 'quarkus-map' }}
|
||||
run: ./mvnw clean install -nsu -B -e -f testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers -Pauth-server-quarkus
|
||||
- name: Run base tests
|
||||
if: ${{ github.event_name != 'pull_request' || matrix.server != 'undertow-map-hot-rod' || env.GIT_HOTROD_RELEVANT_DIFF != 0 }}
|
||||
run: |
|
||||
|
|
|
@ -576,9 +576,7 @@ class KeycloakProcessor {
|
|||
}
|
||||
}
|
||||
|
||||
if (!providers.isEmpty()) {
|
||||
factories.put(spi, providers);
|
||||
}
|
||||
factories.put(spi, providers);
|
||||
}
|
||||
|
||||
return factories;
|
||||
|
|
|
@ -115,4 +115,26 @@
|
|||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>auth-server-quarkus</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<configuration>
|
||||
<excludes>
|
||||
<!-- For quarkus we don't want the test provider installed to avoid false positives -->
|
||||
<!-- Themes from providers are automatically registered -->
|
||||
<excludes>**/TestThemeResourceProvider**</excludes>
|
||||
<excludes>**/org.keycloak.theme.ThemeResourceProviderFactory</excludes>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
Loading…
Reference in a new issue