GUACAMOLE-2139: Automatically set Guacamole.API_VERSION.

This commit is contained in:
Michael Jumper committed 2025-12-24 13:17:06 -08:00
1 parent 10f606c418
commit 451f5aad9d
3 files changed
+53 -3

No files matched your search

+51 -1
View File
@@ -39,6 +39,11 @@
<properties> <properties>
<!--
The directory receiving the result of filtering applied to all files beneath src/main/webapp-templates.
-->
<generated.webapp.dir>${project.build.directory}/generated-resources/webapp-templates</generated.webapp.dir>
<!-- <!--
The location where temporary files should be stored for communicating The location where temporary files should be stored for communicating
between karma and firefox. The default location, /tmp, does not work between karma and firefox. The default location, /tmp, does not work
@@ -73,12 +78,55 @@
<scm> <scm>
<url>https://github.com/apache/guacamole-client</url> <url>https://github.com/apache/guacamole-client</url>
<connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection> <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
</scm> </scm>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<!-- Filter any resources beneath src/main/webapp-templates -->
<execution>
<id>filter-webapp-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${generated.webapp.dir}</outputDirectory>
<resources>
<resource>
<directory>src/main/webapp-templates</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
<!-- Include all other resources verbatim -->
<execution>
<id>copy-webapp-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${generated.webapp.dir}</outputDirectory>
<resources>
<resource>
<directory>src/main/webapp</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<!-- Assemble JS files into single .zip --> <!-- Assemble JS files into single .zip -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
@@ -111,6 +159,8 @@
<charset>UTF-8</charset> <charset>UTF-8</charset>
<jsEngine>CLOSURE</jsEngine> <jsEngine>CLOSURE</jsEngine>
<webappSourceDir>${generated.webapp.dir}</webappSourceDir>
<jsSourceDir>/</jsSourceDir> <jsSourceDir>/</jsSourceDir>
<jsTargetDir>/</jsTargetDir> <jsTargetDir>/</jsTargetDir>
<jsFinalFile>all.js</jsFinalFile> <jsFinalFile>all.js</jsFinalFile>
@@ -27,4 +27,4 @@ var Guacamole = Guacamole || {};
* *
* @type {!string} * @type {!string}
*/ */
Guacamole.API_VERSION = "1.6.0"; Guacamole.API_VERSION = "${project.version}";
+1 -1
View File
@@ -25,7 +25,7 @@
</formats> </formats>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>src/main/webapp/modules/</directory> <directory>${generated.webapp.dir}/modules/</directory>
<includes> <includes>
<include>*.js</include> <include>*.js</include>
</includes> </includes>