Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions js/libs/keycloak-js/assembly.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>dist</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/target</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>keycloak-*.tgz</include>
</includes>
</fileSet>
</fileSets>
</assembly>
Comment on lines +1 to +16

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed, we should rather just attach keycloak-js-999.0.0-SNAPSHOT.tgz as it is already created by npm pack.

The format of the tgz file is explicit to support installation with npm and other package managers. For example with the new format one can do npm install keycloak-js-999.0.0-SNAPSHOT.tgz.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, there should be no reason to re-pack this in another archive, as it is already an archive.

46 changes: 45 additions & 1 deletion js/libs/keycloak-js/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
<skip>false</skip>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -71,6 +71,50 @@
<installDirectory>../..</installDirectory>
</configuration>
</plugin>
<plugin>
<groupId>ca.szc.maven</groupId>
<artifactId>jsonpath-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<id>update-version</id>
<phase>process-resources</phase>
<goals>
<goal>modify</goal>
</goals>
<configuration>
<file>${basedir}/package.json</file>
<modifications>
<modification>
<expression>$.version</expression>
<value>${project.version}</value>
</modification>
</modifications>
</configuration>
</execution>
</executions>
</plugin>
Comment on lines +75 to +96

@stianst stianst Sep 15, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to rather align the way the version is set in package.json with how we're doing it already in community, which is with set-version.sh script.

This also takes care of setting versions in Maven files, containers, docs, and makes sure admin client/console uses the correct versions.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this should be re-used if possible. Also because I believe the lockfile needs an update as well.

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>${project.basedir}/assembly.xml
<file>target/keycloak-js-${project.version}.tgz</file>
<type>tar.gz</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>