Skip to content

Commit 9e3ab48

Browse files
authored
[GEODE-10518] blocks-2.0.0 : Update documentation for Jakarta EE 10 and Java 17 (#7953)
* docs: Update documentation for Jakarta EE 10 and Java 17 - Update Java version format from 1.8.0_121 to 17.0.16 - Update all Geode module versions from 1.0.0 to 2.0.0 - Replace javax.transaction-api with jakarta.transaction-api 2.0.1 - Update dependency versions (slf4j 2.0.17, log4j 2.17.2, jgroups 3.6.20, fastutil 8.5.8) - Update config.yml: min_java_version='17', min_java_update='16' - Fix Java version template expressions across 20+ documentation files - Update WebLogic HTTP session management guide for Jakarta EE 10 - Update installation guides with Java 17 requirements Breaking Changes: - Minimum Java version now Java 17.0.16 (was Java 8u121) - Jakarta EE 10 required (was Java EE 8) - All javax.* packages replaced with jakarta.* Testing: - Verified peer-to-peer and client-server configurations - Documentation builds successfully - All quality checks passed (spotlessCheck, rat, checkPom, pmdMain) * docs: Address review feedback - fix version consistency and consolidate tc Server deprecation notes - Fix Tomcat version inconsistency: Changed CATALINA_HOME path from 10.1.49 to 10.1.30 to match example text - Consolidate duplicate tc Server removal messages into single Note for clarity - Improve documentation consistency and readability * Fix log file path to be consistent with server path
1 parent 87e5642 commit 9e3ab48

22 files changed

+196
-175
lines changed

geode-book/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ public_host: localhost
2121
sections:
2222
- repository:
2323
name: geode-docs
24-
directory: docs/guide/115
24+
directory: docs/guide/20
2525
subnav_template: geode-subnav
2626

2727
template_variables:
2828
product_name_long: Apache Geode
2929
product_name: Geode
3030
product_name_lowercase: geode
31-
product_version: '1.15'
32-
product_version_nodot: '115'
33-
product_version_old_minor: '1.14'
34-
product_version_geode: '1.15'
35-
min_java_version: '8'
36-
min_java_update: '121'
31+
product_version: '2.0'
32+
product_version_nodot: '20'
33+
product_version_old_minor: '1.15'
34+
product_version_geode: '2.0'
35+
min_java_version: '17'
36+
min_java_update: '16'
3737
support_url: http://geode.apache.org/community
3838
product_url: http://geode.apache.org/
3939
book_title: Apache Geode Documentation

geode-book/master_middleman/source/subnavs/geode-subnav.erb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,26 +2147,6 @@ limitations under the License.
21472147
<li>
21482148
<a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/configuring_non_sticky_sessions.html">Configuring Non-Sticky Sessions</a>
21492149
</li>
2150-
<li class="has_submenu">
2151-
<a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/session_mgmt_tcserver.html">HTTP Session Management Module for Pivotal tc Server</a>
2152-
<ul>
2153-
<li>
2154-
<a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/tc_installing_the_module.html">Installing the HTTP Module for tc Server</a>
2155-
</li>
2156-
<li>
2157-
<a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/tc_setting_up_the_module.html">Setting Up the HTTP Module for tc Server</a>
2158-
</li>
2159-
<li class="has_submenu">
2160-
<a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/tc_changing_gf_default_cfg.html">Changing the Default Geode Configuration in the tc Server Module</a>
2161-
<ul>
2162-
<li>
2163-
<a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/interactive_mode_ref.html">Interactive Configuration Reference for the tc Server Module
2164-
</a>
2165-
</li>
2166-
</ul>
2167-
</li>
2168-
</ul>
2169-
</li>
21702150
<li class="has_submenu">
21712151
<a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/session_mgmt_tomcat.html">HTTP Session Management Module for Tomcat</a>
21722152
<ul>

geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
5858
Process ID: 70919
5959
Uptime: 12 seconds
6060
<%=vars.product_name%> Version: <%=vars.product_version%>
61-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
61+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
6262
Log File: /Users/username/my_geode/locator1/locator1.log
6363
JVM Arguments: -Dgemfire.enable-cluster-configuration=true
6464
-Dgemfire.load-cluster-configuration-from-dir=false
@@ -84,7 +84,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
8484
Process ID: 5627
8585
Uptime: 2 seconds
8686
<%=vars.product_name%> Version: <%=vars.product_version%>
87-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
87+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
8888
Log File: /Users/username/my_geode/server1/server1.log
8989
9090
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
@@ -100,7 +100,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
100100
Process ID: 5634
101101
Uptime: 2 seconds
102102
<%=vars.product_name%> Version: <%=vars.product_version%>
103-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
103+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
104104
Log File: /Users/username/my_geode/server2/server2.log
105105
106106
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
@@ -117,7 +117,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
117117
Process ID: 5637
118118
Uptime: 2 seconds
119119
<%=vars.product_name%> Version: <%=vars.product_version%>
120-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
120+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
121121
Log File: /Users/username/my_geode/server3/server3.log
122122
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334]
123123
-Dgemfire.start-dev-rest-api=false -Dgemfire.use-cluster-configuration=true
@@ -239,7 +239,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
239239
Process ID: 5749
240240
Uptime: 15 seconds
241241
<%=vars.product_name%> Version: <%=vars.product_version%>
242-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
242+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
243243
Log File: /Users/username/new_geode/locator2/locator2.log
244244
245245
JVM Arguments: -Dgemfire.enable-cluster-configuration=true
@@ -276,7 +276,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
276276
Process ID: 5813
277277
Uptime: 4 seconds
278278
<%=vars.product_name%> Version: <%=vars.product_version%>
279-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
279+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
280280
Log File: /Users/username/new_geode/server4/server4.log
281281
282282
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335]
@@ -297,7 +297,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
297297
Process ID: 5954
298298
Uptime: 2 seconds
299299
<%=vars.product_name%> Version: <%=vars.product_version%>
300-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
300+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
301301
Log File: /Users/username/new_geode/server5/server5.log
302302
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335] -Dgemfire.groups=group1
303303
-Dgemfire.start-dev-rest-api=false -Dgemfire.use-cluster-configuration=true

geode-docs/configuring/running/running_the_cacheserver.html.md.erb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,11 @@ If successful, the output provides information as in this sample:
147147
% gfsh status server --dir=server4
148148
Server in /home/username/server4 on 192.0.2.0[40404] as server4 is currently online.
149149
Process ID: 49008
150-
Uptime: 2 minutes 4 seconds
151-
<%=vars.product_name %> Version: <%=vars.product_version %>
152-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
153-
Log File: /home/username/server4/server4.log
154-
JVM Arguments:
155-
...
150+
Uptime: 2 seconds
151+
<%=vars.product_name%> Version: <%=vars.product_version%>
152+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
153+
Log File: /Users/username/my_geode/server1/server1.log
154+
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334]
156155
```
157156

158157
## <a id="running_the_cacheserver__section_0E4DDED6AB784B0CAFBAD538B227F487" class="no-quick-link"></a>Stop Server

geode-docs/configuring/running/running_the_locator.html.md.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Locator in /home/user/locator1 on ubuntu.local[10334] as locator1 is currently o
203203
Process ID: 2359
204204
Uptime: 17 minutes 3 seconds
205205
GemFire Version: 8.0.0
206-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
206+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
207207
Log File: /home/user/locator1/locator1.log
208208
JVM Arguments: -Dgemfire.enable-cluster-configuration=true -Dgemfire.load-cluster-configuration-from-dir=false
209209
-Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true -Dsun.rmi.dgc.server.gcInterval=9223372036854775806

geode-docs/getting_started/15_minute_quickstart_gfsh.html.md.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ The *locator* is a <%=vars.product_name%> process that tells new, connecting mem
5454
Process ID: 3529
5555
Uptime: 18 seconds
5656
<%=vars.product_name%> Version: <%=vars.product_version%>
57-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
57+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
5858
Log File: /home/username/my_geode/locator1/locator1.log
5959
JVM Arguments: -Dgemfire.enable-cluster-configuration=true -Dgemfire.load-cluster-configuration-from-dir=false
6060
-Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
6161
-Dsun.rmi.dgc.server.gcInterval=9223372036854775806
62-
Class-Path: /home/username/Apache_Geode_Linux/lib/geode-core-1.0.0.jar:
62+
Class-Path: /home/username/Apache_Geode_Linux/lib/geode-core-2.0.0.jar:
6363
/home/username/Apache_Geode_Linux/lib/geode-dependencies.jar
6464
6565
Successfully connected to: JMX Manager [host=10.118.33.169, port=1099]
@@ -413,12 +413,12 @@ In this step you restart the cache servers in parallel. Because the data is pers
413413
Process ID: 3402
414414
Uptime: 1 minute 46 seconds
415415
<%=vars.product_name%> Version: <%=vars.product_version%>
416-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
416+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
417417
Log File: /home/username/my_geode/server1/server1.log
418418
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.use-cluster-configuration=true
419419
-XX:OnOutOfMemoryError=kill -KILL %p -Dgemfire.launcher.registerSignalHandlers=true
420420
-Djava.awt.headless=true -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
421-
Class-Path: /home/username/Apache_Geode_Linux/lib/geode-core-1.0.0.jar:
421+
Class-Path: /home/username/Apache_Geode_Linux/lib/geode-core-2.0.0.jar:
422422
/home/username/Apache_Geode_Linux/lib/geode-dependencies.jar
423423
```
424424

geode-docs/getting_started/installation/install_standalone.html.md.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Build from source or use the TAR distribution to install <%=vars.product_name_lo
2424
1. Set the JAVA\_HOME environment variable.
2525
2626
``` pre
27-
JAVA_HOME=/usr/java/jdk1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
27+
JAVA_HOME=/usr/java/jdk-<%=vars.min_java_version%>.0.<%=vars.min_java_update%>
2828
export JAVA_HOME
2929
```
3030
@@ -54,7 +54,7 @@ Build from source or use the TAR distribution to install <%=vars.product_name_lo
5454
1. Set the JAVA\_HOME environment variable. For example:
5555
5656
``` pre
57-
$ set JAVA_HOME="C:\Program Files\Java\jdk1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>"
57+
$ set JAVA_HOME="C:\Program Files\Java\jdk-<%=vars.min_java_version%>.0.<%=vars.min_java_update%>"
5858
```
5959
6060
2. Install Gradle, version 2.3 or a more recent version.
@@ -91,14 +91,14 @@ Build from source or use the TAR distribution to install <%=vars.product_name_lo
9191
3. Set the JAVA\_HOME environment variable. On Linux/Unix platforms:
9292
9393
``` pre
94-
JAVA_HOME=/usr/java/jdk1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
94+
JAVA_HOME=/usr/java/jdk-<%=vars.min_java_version%>.0.<%=vars.min_java_update%>
9595
export JAVA_HOME
9696
```
9797
9898
On Windows platforms:
9999
100100
``` pre
101-
set JAVA_HOME="C:\Program Files\Java\jdk1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>"
101+
set JAVA_HOME="C:\Program Files\Java\jdk-<%=vars.min_java_version%>.0.<%=vars.min_java_update%>"
102102
```
103103
104104
4. Add the <%=vars.product_name%> scripts to your PATH environment variable. On Linux/Unix platforms:
115 KB
Loading

geode-docs/managing/management/jmx_manager_operations.html.md.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ is currently online.
5757
Process ID: 27144
5858
Uptime: 5 seconds
5959
<%=vars.product_name%> Version: <%=vars.product_version%>
60-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
60+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
6161
Log File: /Users/username/apache-geode/locator1/locator1.log
6262
JVM Arguments: -Dgemfire.enable-cluster-configuration=true
6363
-Dgemfire.load-cluster-configuration-from-dir=false

geode-docs/tools_modules/gfsh/tour_of_gfsh.html.md.erb

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ as locator1 is currently online.
6161
Process ID: 67666
6262
Uptime: 6 seconds
6363
<%=vars.product_name%> Version: <%=vars.product_version%>
64-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
64+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
6565
Log File: /home/username/gfsh_tutorial/locator1.log
6666
JVM Arguments: -Dgemfire.enable-cluster-configuration=true
6767
-Dgemfire.load-cluster-configuration-from-dir=false
@@ -180,16 +180,12 @@ Starting a <%=vars.product_name%> Server in /home/username/gfsh_tutorial/server1
180180
...
181181
Server in /home/username/gfsh_tutorial/server1 on 192.0.2.0[40404] as server1
182182
is currently online.
183-
Process ID: 68375
184-
Uptime: 4 seconds
183+
Process ID: 49601
184+
Uptime: 2 seconds
185185
<%=vars.product_name%> Version: <%=vars.product_version%>
186-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
187-
Log File: /home/username//gfsh_tutorial/server1/server1.log
188-
JVM Arguments: -Dgemfire.locators=localhost[10334]
189-
-Dgemfire.use-cluster-configuration=true -Dgemfire.start-dev-rest-api=false
190-
-XX:OnOutOfMemoryError=kill -KILL %p
191-
-Dgemfire.launcher.registerSignalHandlers=true
192-
-Djava.awt.headless=true -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
186+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
187+
Log File: /home/username/gfsh_tutorial/server1/server1.log
188+
JVM Arguments: -Dgemfire.enable-cluster-configuration=true
193189
Class-Path: /home/username/geode/geode-assembly/build/install/apache-geode/lib
194190
/geode-core-1.2.0.jar:/home/username/geode/geode-assembly/build/install
195191
/apache-geode/lib/geode-dependencies.jar
@@ -299,7 +295,7 @@ server2 is currently online.
299295
Process ID: 68423
300296
Uptime: 4 seconds
301297
<%=vars.product_name%> Version: <%=vars.product_version%>
302-
Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
298+
Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
303299
Log File: /home/username/gfsh_tutorial/server2/server2.log
304300
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334]
305301
-Dgemfire.use-cluster-configuration=true -Dgemfire.start-dev-rest-api=false

0 commit comments

Comments
 (0)