Skip to content

Commit

Permalink
Move community resources to separate directory
Browse files Browse the repository at this point in the history
Also removed copying of locales directory from pom.xml (relict of keycloak#24316)

Fixes: keycloak#26236

Signed-off-by: Hynek Mlnarik <[email protected]>
  • Loading branch information
hmlnarik committed Jan 19, 2024
1 parent 62020ff commit 17d0e7d
Show file tree
Hide file tree
Showing 38 changed files with 57 additions and 28 deletions.
35 changes: 35 additions & 0 deletions js/apps/account-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,41 @@
<name>Keycloak Account UI</name>
<description>The user inferface to manage an account on the Keycloak server.</description>

<profiles>
<profile>
<id>withTranslations</id>
<activation>
<property>
<name>!skipCommunityTranslations</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>maven-resources-community</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<resources>
<resource>
Expand Down
50 changes: 22 additions & 28 deletions js/apps/admin-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,6 @@
<description>The user inferface to administrate the Keycloak server.</description>

<profiles>
<profile>
<id>withoutTranslations</id>
<activation>
<property>
<name>skipCommunityTranslations</name>
</property>
</activation>
<build>
<resources>
<resource>
<directory>dist</directory>
<targetPath>theme/keycloak.v2/admin/resources</targetPath>
<includes>
<include>locales/en/**</include>
</includes>
</resource>
</resources>
</build>
</profile>
<profile>
<id>withTranslations</id>
<activation>
Expand All @@ -44,15 +25,28 @@
</property>
</activation>
<build>
<resources>
<resource>
<directory>dist</directory>
<targetPath>theme/keycloak.v2/admin/resources</targetPath>
<includes>
<include>locales/**</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>maven-resources-community</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
Expand Down

0 comments on commit 17d0e7d

Please sign in to comment.