GF version numbers in the website are generated.

Signed-off-by:Ondro Mihalyi <mihalyi@omnifish.ee>
eclipse-ee4j · Jan 28, 2023 · ca44cc1 · ca44cc1
1 parent 579e2c9
commit ca44cc1
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 59 deletions.
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -34,6 +34,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <glassfish.version.5x>5.1.0</glassfish.version.5x>
+        <glassfish.version.6x>6.2.5</glassfish.version.6x>
+        <glassfish.version.7x>7.0.0</glassfish.version.7x>
+        <glassfish.version.latest>${glassfish.version.7x}</glassfish.version.latest>
     </properties>
 
     <modules>

diff --git a/docs/publish/pom.xml b/docs/publish/pom.xml
@@ -40,14 +40,10 @@
         <!-- the directory where the current snapshot is published -->
         <dir.snap>${site.output.dir}/docs/SNAPSHOT</dir.snap>
         <!-- add a new property for each new release -->
-        <docs.5x.version>5.1.0</docs.5x.version>
-        <docs.5x.dir>${site.output.dir}/docs/${docs.5x.version}</docs.5x.dir>
-        <docs.6x.version>6.2.5</docs.6x.version>
-        <docs.6x.dir>${site.output.dir}/docs/${docs.6x.version}</docs.6x.dir>
-        <docs.7x.version>7.0.0</docs.7x.version>
-        <docs.7x.dir>${site.output.dir}/docs/${docs.7x.version}</docs.7x.dir>
+        <docs.5x.dir>${site.output.dir}/docs/${glassfish.version.5x}</docs.5x.dir>
+        <docs.6x.dir>${site.output.dir}/docs/${glassfish.version.6x}</docs.6x.dir>
+        <docs.7x.dir>${site.output.dir}/docs/${glassfish.version.7x}</docs.7x.dir>
         <!-- the "latest" version; update when a new release is done -->
-        <docs.version>${docs.7x.version}</docs.version>
     </properties>
 
     <!--
@@ -134,7 +130,7 @@
                                         <artifactItem>
                                             <groupId>org.glassfish.docs</groupId>
                                             <artifactId>distribution</artifactId>
-                                            <version>${docs.7x.version}</version>
+                                            <version>${glassfish.version.7x}</version>
                                             <outputDirectory>
                                                 ${docs.7x.dir}
                                             </outputDirectory>
@@ -161,7 +157,7 @@
                                         <artifactItem>
                                             <groupId>org.glassfish.docs</groupId>
                                             <artifactId>distribution</artifactId>
-                                            <version>${docs.6x.version}</version>
+                                            <version>${glassfish.version.6x}</version>
                                             <outputDirectory>
                                                 ${docs.6x.dir}
                                             </outputDirectory>
@@ -188,7 +184,7 @@
                                         <artifactItem>
                                             <groupId>org.glassfish.docs</groupId>
                                             <artifactId>distribution</artifactId>
-                                            <version>${docs.5x.version}</version>
+                                            <version>${glassfish.version.5x}</version>
                                             <outputDirectory>
                                                 ${docs.5x.dir}
                                             </outputDirectory>
@@ -200,7 +196,7 @@
                                 Add additional execution blocks here as
                                 new releases are made, using the above
                                 as a template.  Don't forget to update
-                                the docs.version property.
+                                the glassfish.version.latest property.
                             -->
                         </executions>
                     </plugin>
@@ -227,7 +223,7 @@
                                           />
                                         <symlink
                                           link="${site.output.dir}/docs/latest"
-                                          resource="${docs.version}"/>
+                                          resource="${glassfish.version.latest}"/>
                                     </target>
                                 </configuration>
                             </execution>

diff --git a/docs/website/pom.xml b/docs/website/pom.xml
@@ -47,5 +47,11 @@
                 </configuration>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 </project>
diff --git a/docs/website/src/main/resources/docs/README.md b/docs/website/src/main/resources/docs/README.md
@@ -1,7 +1,7 @@
 
 # Eclipse GlassFish Documentation and User Guides
 
-## <a name="current">Current Release - 7.0.0</a>
+## <a name="current">Current Release - ${glassfish.version.latest}</a>
 
 * [Add On Component Development Guide](latest/add-on-component-development-guide.html)
   ([pdf](latest/add-on-component-development-guide.pdf))
@@ -36,7 +36,7 @@
 * [Upgrade Guide](latest/upgrade-guide.html)
   ([pdf](latest/upgrade-guide.pdf))
 
-## <a name="development">Development Version</a>
+## <a name="development">Development Version - ${project.version}</a>
 
 * [Add On Component Development Guide](SNAPSHOT/add-on-component-development-guide.html)
   ([pdf](SNAPSHOT/add-on-component-development-guide.pdf))
@@ -71,37 +71,37 @@
 * [Upgrade Guide](SNAPSHOT/upgrade-guide.html)
   ([pdf](SNAPSHOT/upgrade-guide.pdf))
 
-## <a name="5.1.0">5.1.0 Release</a>
+## <a name="${glassfish.version.5x}">${glassfish.version.5x} Release</a>
 
-* [Add On Component Development Guide](5.1.0/add-on-component-development-guide/toc.html)
-  ([pdf](5.1.0/add-on-component-development-guide.pdf))
-* [Administration Guide](5.1.0/administration-guide/toc.html)
-  ([pdf](5.1.0/administration-guide.pdf))
-* [Application Deployment Guide](5.1.0/application-deployment-guide/toc.html)
-  ([pdf](5.1.0/application-deployment-guide.pdf))
-* [Application Development Guide](5.1.0/application-development-guide/toc.html)
-  ([pdf](5.1.0/application-development-guide.pdf))
-* [Deployment Planning Guide](5.1.0/deployment-planning-guide/toc.html)
-  ([pdf](5.1.0/deployment-planning-guide.pdf))
-* [Embedded Server Guide](5.1.0/embedded-server-guide/toc.html)
-  ([pdf](5.1.0/embedded-server-guide.pdf))
-* [Error Messages Reference](5.1.0/error-messages-reference/toc.html)
-  ([pdf](5.1.0/error-messages-reference.pdf))
-* [High Availability Administration Guide](5.1.0/ha-administration-guide/toc.html)
-  ([pdf](5.1.0/ha-administration-guide.pdf))
-* [Installation Guide](5.1.0/installation-guide/toc.html)
-  ([pdf](5.1.0/installation-guide.pdf))
-* [Performance Tuning Guide](5.1.0/performance-tuning-guide/toc.html)
-  ([pdf](5.1.0/performance-tuning-guide.pdf))
-* [Quick Start Guide](5.1.0/quick-start-guide/toc.html)
-  ([pdf](5.1.0/quick-start-guide.pdf))
-* [Reference Manual](5.1.0/reference-manual/toc.html)
-  ([pdf](5.1.0/reference-manual.pdf))
-* [Release Notes](5.1.0/release-notes/toc.html)
-  ([pdf](5.1.0/release-notes.pdf))
-* [Security Guide](5.1.0/security-guide/toc.html)
-  ([pdf](5.1.0/security-guide.pdf))
-* [Troubleshooting Guide](5.1.0/troubleshooting-guide/toc.html)
-  ([pdf](5.1.0/troubleshooting-guide.pdf))
-* [Upgrade Guide](5.1.0/upgrade-guide/toc.html)
-  ([pdf](5.1.0/upgrade-guide.pdf))
+* [Add On Component Development Guide](${glassfish.version.5x}/add-on-component-development-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/add-on-component-development-guide.pdf))
+* [Administration Guide](${glassfish.version.5x}/administration-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/administration-guide.pdf))
+* [Application Deployment Guide](${glassfish.version.5x}/application-deployment-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/application-deployment-guide.pdf))
+* [Application Development Guide](${glassfish.version.5x}/application-development-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/application-development-guide.pdf))
+* [Deployment Planning Guide](${glassfish.version.5x}/deployment-planning-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/deployment-planning-guide.pdf))
+* [Embedded Server Guide](${glassfish.version.5x}/embedded-server-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/embedded-server-guide.pdf))
+* [Error Messages Reference](${glassfish.version.5x}/error-messages-reference/toc.html)
+  ([pdf](${glassfish.version.5x}/error-messages-reference.pdf))
+* [High Availability Administration Guide](${glassfish.version.5x}/ha-administration-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/ha-administration-guide.pdf))
+* [Installation Guide](${glassfish.version.5x}/installation-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/installation-guide.pdf))
+* [Performance Tuning Guide](${glassfish.version.5x}/performance-tuning-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/performance-tuning-guide.pdf))
+* [Quick Start Guide](${glassfish.version.5x}/quick-start-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/quick-start-guide.pdf))
+* [Reference Manual](${glassfish.version.5x}/reference-manual/toc.html)
+  ([pdf](${glassfish.version.5x}/reference-manual.pdf))
+* [Release Notes](${glassfish.version.5x}/release-notes/toc.html)
+  ([pdf](${glassfish.version.5x}/release-notes.pdf))
+* [Security Guide](${glassfish.version.5x}/security-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/security-guide.pdf))
+* [Troubleshooting Guide](${glassfish.version.5x}/troubleshooting-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/troubleshooting-guide.pdf))
+* [Upgrade Guide](${glassfish.version.5x}/upgrade-guide/toc.html)
+  ([pdf](${glassfish.version.5x}/upgrade-guide.pdf))
diff --git a/docs/website/src/main/resources/documentation.md b/docs/website/src/main/resources/documentation.md
@@ -16,9 +16,9 @@
 
 ## Eclipse GlassFish Documentation and User Guides
 
-* [Current release (7.0.0)](docs#current)
-* [Development version](docs#development)
-* [5.1.0 release](docs#5.1.0)
+* [Current release (${glassfish.version.latest})](docs#current)
+* [Development version (${project.version})](docs#development)
+* [${glassfish.version.5x} release](docs#${glassfish.version.5x})
 
 ## Eclipse Open MQ Documentation
 

diff --git a/docs/website/src/main/resources/download.md b/docs/website/src/main/resources/download.md
@@ -6,17 +6,17 @@ Eclipse GlassFish 7.0.0 is a final release, containing final [Jakarta EE 10](htt
 
 Download GlassFish Server:
 
-* [Eclipse GlassFish 7.0.0, Jakarta EE Platform, 10](https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0.zip)
-* [Eclipse GlassFish 7.0.0, Jakarta EE Web Profile, 10](https://download.eclipse.org/ee4j/glassfish/web-7.0.0.zip)
+* [Eclipse GlassFish ${glassfish.version.7x}, Jakarta EE Platform, 10](https://download.eclipse.org/ee4j/glassfish/glassfish-${glassfish.version.7x}.zip)
+* [Eclipse GlassFish ${glassfish.version.7x}, Jakarta EE Web Profile, 10](https://download.eclipse.org/ee4j/glassfish/web-${glassfish.version.7x}.zip)
 
 Download GlassFish Embedded:
 
-* [Eclipse GlassFish Embedded 7.0.0, Jakarta EE Platform, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-all/7.0.0/jar)
-* [Eclipse GlassFish Embedded 7.0.0, Jakarta EE Web Profile, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-web/7.0.0/jar)
+* [Eclipse GlassFish Embedded ${glassfish.version.7x}, Jakarta EE Platform, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-all/${glassfish.version.7x}/jar)
+* [Eclipse GlassFish Embedded ${glassfish.version.7x}, Jakarta EE Web Profile, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-web/${glassfish.version.7x}/jar)
 
 More details:
 
-* [Eclipse GlassFish 7.0.0 Release Notes](https://github.com/eclipse-ee4j/glassfish/releases/tag/7.0.0)
+* [Eclipse GlassFish ${glassfish.version.7x} Release Notes](https://github.com/eclipse-ee4j/glassfish/releases/tag/${glassfish.version.7x})
 * [Jakarte EE Platform Specification Project](https://eclipse-ee4j.github.io/jakartaee-platform/) for more info about Jakarta EE 10
 
 ### All Eclipse GlassFish 7.x Downloads
@@ -37,8 +37,8 @@ GlassFish 6.2.5 updates and reenables a lot of tests that were disabled in previ
 
 For more details on Jakarta EE 9.1, please see the [Jakarte EE Platform Specification Project](https://eclipse-ee4j.github.io/jakartaee-platform/).
 
-* [Eclipse GlassFish 6.2.5, Jakarta EE Platform, 9.1](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/glassfish-6.2.5.zip)
-* [Eclipse GlassFish 6.2.5, Jakarta EE Web Profile, 9.1](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/web-6.2.5.zip)
+* [Eclipse GlassFish ${glassfish.version.6x}, Jakarta EE Platform, 9.1](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/glassfish-${glassfish.version.6x}.zip)
+* [Eclipse GlassFish ${glassfish.version.6x}, Jakarta EE Web Profile, 9.1](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/web-${glassfish.version.6x}.zip)
 
 ### All Eclipse GlassFish 6.x Downloads
 
@@ -50,8 +50,8 @@ Download all GlassFish 6.x releases at the [Eclipse GlassFish 6.x Downloads](dow
 
 The latest stable releases of Eclipse GlassFish 5.1. This version is compatible with Jakarta EE 8 Specification.
 
-* [Eclipse GlassFish 5.1.0 - Jakarta EE Platform, 8](https://www.eclipse.org/downloads/download.php?file=/glassfish/glassfish-5.1.0.zip)
-* [Eclipse GlassFish 5.1.0 - Jakarta EE Web Profile, 8](https://www.eclipse.org/downloads/download.php?file=/glassfish/web-5.1.0.zip)
+* [Eclipse GlassFish ${glassfish.version.5x} - Jakarta EE Platform, 8](https://www.eclipse.org/downloads/download.php?file=/glassfish/glassfish-${glassfish.version.5x}.zip)
+* [Eclipse GlassFish ${glassfish.version.5x} - Jakarta EE Web Profile, 8](https://www.eclipse.org/downloads/download.php?file=/glassfish/web-${glassfish.version.5x}.zip)
 
 
 ----