From 2fa875cb23a8907262dd6ef9f1fc97ea5ede3e08 Mon Sep 17 00:00:00 2001 From: navaneethsnair1 Date: Mon, 16 Oct 2023 15:22:38 +0530 Subject: [PATCH 01/46] styling edits were made to improve javadocs part --- .../src/sass/javadoc-extended-stylesheet.scss | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/content/antora_ui/src/sass/javadoc-extended-stylesheet.scss b/src/main/content/antora_ui/src/sass/javadoc-extended-stylesheet.scss index 1274eba6ec..3b403861c8 100644 --- a/src/main/content/antora_ui/src/sass/javadoc-extended-stylesheet.scss +++ b/src/main/content/antora_ui/src/sass/javadoc-extended-stylesheet.scss @@ -18,7 +18,7 @@ * appended to the end of the combined file. */ -body { + body { background-color:white; font-family: Asap, 'DejaVu Sans', Arial, Helvetica, sans-serif; } @@ -121,11 +121,15 @@ ul.navList li{ } /* doesn't seem to pick up this on focus */ -.clickableNavListTab, ul.navList li:focus{ +ul.navList li:focus{ background-color: #D6D9E4; color: #253441; } +.clickableNavListTab{ + color:#bb7a2a; +} + .clickableNavListTab:hover{ cursor: pointer; } @@ -159,6 +163,10 @@ ul.blockList ul.blockList ul.blockList li.blockList h3 { background-color:#C8CCD8; } +ul.blockList ul.blockList li.blockList h3{ + margin:0 0; +} + .contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { padding:10px 0px; } @@ -209,17 +217,28 @@ ul.blockList ul.blockList ul.blockList li.blockList h3 { .usesSummary caption span { background-color:#D6D9E4; font-family: BunueloLight, Arial Narrow, Helvetica, Arial; - font-size: 35px; + font-size: 20px; + margin-top: 10px; height: auto; } +.memberSummary caption span{ + font-size: 16px; +} + + + .memberSummary caption span.activeTableTab span, .packagesSummary caption span.activeTableTab span { background-color:#D6D9E4; height: auto; + padding-left: 30px; + padding-right: 30px; } .memberSummary caption span.tableTab span, .packagesSummary caption span.tableTab span { height: auto; + padding-left: 30px; + padding-right: 30px; } .overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd, @@ -399,4 +418,8 @@ label { .header { margin: 0; +} + +div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4{ + margin-top:-10px; } \ No newline at end of file From fa766390825316c1f507c82b490e8529ef537c8e Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Tue, 24 Oct 2023 08:42:55 -0500 Subject: [PATCH 02/46] add text to lang config files --- src/main/content/_i18n/en.yml | 23 ++++++++++++------- src/main/content/_i18n/ja.yml | 37 +++++++++++++++++++++++------- src/main/content/_i18n/zh-Hans.yml | 37 +++++++++++++++++++++++------- src/main/content/start.html | 26 +++++++++++++-------- 4 files changed, 89 insertions(+), 34 deletions(-) diff --git a/src/main/content/_i18n/en.yml b/src/main/content/_i18n/en.yml index b9bf8c36fd..4ea02b1222 100644 --- a/src/main/content/_i18n/en.yml +++ b/src/main/content/_i18n/en.yml @@ -96,14 +96,21 @@ start: instruction: Unzip it and run this command, or refer to the included README. guide_link: For more help, visit our got_it: Got it! - get_OL_section_title: Add to an existing application - get_OL_section_text: Get Open Liberty using these commands for Maven, Gradle, or Docker. - container_section_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Want to customize your image resources? - container_section_link: Check out our docs. - find_out: Find out - how_to_use_maven: how to use Maven with Open Liberty. - how_to_use_gradle: how to use Gradle with Open Liberty. - how_to_use_docker: how to use Docker with Open Liberty. + add_to_existing_app: + title: Add to an existing application + sect_heading: Open Liberty provides build plugins for Maven and Gradle that simplify the installation and operational control of the Liberty runtime and servers. + container_section_text: Want to customize your image resources? + container_section_link: Check out our docs. + maven_guide_text: Ready to get started using Maven with Open Liberty? + gradle_guide_text: Ready to get started using Gradle with Open Liberty? + docker_guide_text: Ready to start using containers with Open Liberty? + try_guide_link: Try the guide. + maven_docs_text: Looking for information about Open Liberty Maven configuration, goals, and more? Check out the + gradle_docs_text: Looking for information about Open Liberty Gradle configuration, tasks, and more? Check out the + docker_docs_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Looking to customize your image resources? + maven_docs_link: Liberty Maven plugin documentation on GitHub. + gradle_docs_link: Liberty Gradle plugin documentation on GitHub + docker_docs_link: Check out our docs. ide_tools: section_title: Develop with Liberty Tools section_text1: 'Liberty Tools is a set of intuitive developer tools for the Eclipse IDE, Visual Studio Code, and IntelliJ IDEA development environments. diff --git a/src/main/content/_i18n/ja.yml b/src/main/content/_i18n/ja.yml index 737d32a337..2e6a7d9a36 100644 --- a/src/main/content/_i18n/ja.yml +++ b/src/main/content/_i18n/ja.yml @@ -97,14 +97,35 @@ start: instruction: Unzip it and run this command, or refer to the included README. guide_link: For more help, visit our got_it: Got it! - get_OL_section_title: Add to an existing application - get_OL_section_text: Get Open Liberty using these commands for Maven, Gradle, or Docker. - container_section_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Want to customize your image resources? - container_section_link: Check out our docs. - find_out: Find out - how_to_use_maven: how to use Maven with Open Liberty. - how_to_use_gradle: how to use Gradle with Open Liberty. - how_to_use_docker: how to use Docker with Open Liberty. + add_to_existing_app: + title: Add to an existing application + sect_heading: Open Liberty provides build plugins for Maven and Gradle that simplify the installation and operational control of the Liberty runtime and servers. + container_section_text: Want to customize your image resources? + container_section_link: Check out our docs. + maven_guide_text: Ready to get started using Maven with Open Liberty? + gradle_guide_text: Ready to get started using Gradle with Open Liberty? + docker_guide_text: Ready to start using containers with Open Liberty? + try_guide_link: Try the guide. + maven_docs_text: Looking for information about Open Liberty Maven configuration, goals, and more? Check out the + gradle_docs_text: Looking for information about Open Liberty Gradle configuration, tasks, and more? Check out the + docker_docs_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Looking to customize your image resources? + maven_docs_link: Liberty Maven plugin documentation on GitHub. + gradle_docs_link: Liberty Gradle plugin documentation on GitHub + docker_docs_link: Check out our docs. + ide_tools: + section_title: Develop with Liberty Tools + section_text1: 'Liberty Tools is a set of intuitive developer tools for the Eclipse IDE, Visual Studio Code, and IntelliJ IDEA development environments. + These tools adopt a Maven/Gradle-centric approach and enable fast, iterative cloud-native Java application development through Liberty dev mode. ' + section_text2: 'Liberty Tools also provides helpful, time-saving features such as code completion, hover descriptions, and configuration diagnostics for Jakarta EE APIs, MicroProfile APIs, and Liberty configuration. + For more information, ' + docs_link: check out the Liberty Tools overview. + eclipse_link: Eclipse IDE + intellij_link: IntelliJ IDEA + vscode_link: Visual Studio Code + section_text3: The classic Eclipse developer tools can be found in + public_dhe_link: 'this repository, ' + section_text4: and you can find + github_link: instructions on how to install the classic tools here. download_package: Download package download_package_section: para: We recommend using the latest release, but beta and development builds are also available for use. Once downloaded, you're ready for lift-off. diff --git a/src/main/content/_i18n/zh-Hans.yml b/src/main/content/_i18n/zh-Hans.yml index d314a51c55..3acfa53ae2 100644 --- a/src/main/content/_i18n/zh-Hans.yml +++ b/src/main/content/_i18n/zh-Hans.yml @@ -97,14 +97,35 @@ start: instruction: Unzip it and run this command, or refer to the included README. guide_link: For more help, visit our got_it: Got it! - get_OL_section_title: Add to an existing application - get_OL_section_text: Get Open Liberty using these commands for Maven, Gradle, or Docker. - container_section_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Want to customize your image resources? - container_section_link: Check out our docs. - find_out: Find out - how_to_use_maven: how to use Maven with Open Liberty. - how_to_use_gradle: how to use Gradle with Open Liberty. - how_to_use_docker: how to use Docker with Open Liberty. + add_to_existing_app: + title: Add to an existing application + sect_heading: Open Liberty provides build plugins for Maven and Gradle that simplify the installation and operational control of the Liberty runtime and servers. + container_section_text: Want to customize your image resources? + container_section_link: Check out our docs. + maven_guide_text: Ready to get started using Maven with Open Liberty? + gradle_guide_text: Ready to get started using Gradle with Open Liberty? + docker_guide_text: Ready to start using containers with Open Liberty? + try_guide_link: Try the guide. + maven_docs_text: Looking for information about Open Liberty Maven configuration, goals, and more? Check out the + gradle_docs_text: Looking for information about Open Liberty Gradle configuration, tasks, and more? Check out the + docker_docs_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Looking to customize your image resources? + maven_docs_link: Liberty Maven plugin documentation on GitHub. + gradle_docs_link: Liberty Gradle plugin documentation on GitHub + docker_docs_link: Check out our docs. + ide_tools: + section_title: Develop with Liberty Tools + section_text1: 'Liberty Tools is a set of intuitive developer tools for the Eclipse IDE, Visual Studio Code, and IntelliJ IDEA development environments. + These tools adopt a Maven/Gradle-centric approach and enable fast, iterative cloud-native Java application development through Liberty dev mode. ' + section_text2: 'Liberty Tools also provides helpful, time-saving features such as code completion, hover descriptions, and configuration diagnostics for Jakarta EE APIs, MicroProfile APIs, and Liberty configuration. + For more information, ' + docs_link: check out the Liberty Tools overview. + eclipse_link: Eclipse IDE + intellij_link: IntelliJ IDEA + vscode_link: Visual Studio Code + section_text3: The classic Eclipse developer tools can be found in + public_dhe_link: 'this repository, ' + section_text4: and you can find + github_link: instructions on how to install the classic tools here. download_package: Download package download_package_section: para: We recommend using the latest release, but beta and development builds are also available for use. Once downloaded, you're ready for lift-off. diff --git a/src/main/content/start.html b/src/main/content/start.html index 4272c9cded..6618e539e5 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -135,8 +135,8 @@

{% t start.generate_project_modal.heading %}

-

{% t start.get_OL_section_title %}

-

{% t start.get_OL_section_text %}

+

{% t start.add_to_existing_app.title %}

+

{% t start.add_to_existing_app.sect_heading %}

@@ -159,17 +159,23 @@

{% t st
+

{% t start.add_to_existing_app.maven_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

Copied to clipboard
<dependency>
    <groupId>io.openliberty</groupId>
    <artifactId>openliberty-runtime</artifactId>
    <version>[19.0.0.9,)</version>
    <type>zip</type>
</dependency>
-

{% t start.find_out %} - {% t start.how_to_use_maven %} +

{% t start.add_to_existing_app.maven_docs_text %} + {% t start.add_to_existing_app.maven_docs_link %}

+

{% t start.add_to_existing_app.gradle_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

Copied to clipboard
@@ -181,22 +187,22 @@

{% t st 
apply plugin: 'liberty'

-

{% t start.find_out %} - {% t start.how_to_use_gradle %} +

{% t start.add_to_existing_app.gradle_docs_text %} + {% t start.add_to_existing_app.gradle_docs_link %}

-

{% t start.container_section_text %} - {% t start.container_section_link %} +

{% t start.add_to_existing_app.docker_guide_text %} + {% t start.add_to_existing_app.try_guide_link %}

Copied to clipboard
FROM icr.io/appcafe/open-liberty
-

{% t start.find_out %} - {% t start.how_to_use_docker %} +

{% t start.add_to_existing_app.docker_docs_text %} + {% t start.add_to_existing_app.docker_docs_link %}

From d617b00edbcc1cd26d97a39ec6aa627a58aa8d6e Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Wed, 25 Oct 2023 08:38:48 -0500 Subject: [PATCH 03/46] small fixes --- src/main/content/_i18n/en.yml | 2 +- src/main/content/start.html | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/content/_i18n/en.yml b/src/main/content/_i18n/en.yml index 4ea02b1222..fa9a2c9578 100644 --- a/src/main/content/_i18n/en.yml +++ b/src/main/content/_i18n/en.yml @@ -109,7 +109,7 @@ start: gradle_docs_text: Looking for information about Open Liberty Gradle configuration, tasks, and more? Check out the docker_docs_text: This instruction pulls a container image with the latest release from the IBM Container Registry. Looking to customize your image resources? maven_docs_link: Liberty Maven plugin documentation on GitHub. - gradle_docs_link: Liberty Gradle plugin documentation on GitHub + gradle_docs_link: Liberty Gradle plugin documentation on GitHub. docker_docs_link: Check out our docs. ide_tools: section_title: Develop with Liberty Tools diff --git a/src/main/content/start.html b/src/main/content/start.html index 6618e539e5..6d646c542d 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -159,23 +159,21 @@

{% t st
-

{% t start.add_to_existing_app.maven_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
<dependency>
    <groupId>io.openliberty</groupId>
    <artifactId>openliberty-runtime</artifactId>
    <version>[19.0.0.9,)</version>
    <type>zip</type>
</dependency>
+

+ {% t start.add_to_existing_app.maven_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

{% t start.add_to_existing_app.maven_docs_text %} - {% t start.add_to_existing_app.maven_docs_link %} + {% t start.add_to_existing_app.maven_docs_link %}

-

{% t start.add_to_existing_app.gradle_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
@@ -187,20 +185,23 @@

{% t st 
apply plugin: 'liberty'

+

{% t start.add_to_existing_app.gradle_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

{% t start.add_to_existing_app.gradle_docs_text %} - {% t start.add_to_existing_app.gradle_docs_link %} + {% t start.add_to_existing_app.gradle_docs_link %}

-

{% t start.add_to_existing_app.docker_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
FROM icr.io/appcafe/open-liberty
+

{% t start.add_to_existing_app.docker_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

{% t start.add_to_existing_app.docker_docs_text %} {% t start.add_to_existing_app.docker_docs_link %}

From 0046f8fd797f8a35393d3e3fa8b5d75a37ed5908 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Thu, 26 Oct 2023 11:15:33 -0500 Subject: [PATCH 04/46] Fix hrefs --- src/main/content/start.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index 6d646c542d..14234592de 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -169,7 +169,7 @@

{% t st {% t start.add_to_existing_app.try_guide_link %}

{% t start.add_to_existing_app.maven_docs_text %} - {% t start.add_to_existing_app.maven_docs_link %} + {% t start.add_to_existing_app.maven_docs_link %}

@@ -189,7 +189,7 @@

{% t st {% t start.add_to_existing_app.try_guide_link %}

{% t start.add_to_existing_app.gradle_docs_text %} - {% t start.add_to_existing_app.gradle_docs_link %} + {% t start.add_to_existing_app.gradle_docs_link %}

@@ -203,7 +203,7 @@

{% t st {% t start.add_to_existing_app.try_guide_link %}

{% t start.add_to_existing_app.docker_docs_text %} - {% t start.add_to_existing_app.docker_docs_link %} + {% t start.add_to_existing_app.docker_docs_link %}

From b3917eacea6510dd8c2c77e63475ccb1a35c36aa Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Mon, 30 Oct 2023 19:31:36 +0530 Subject: [PATCH 05/46] Fixing accessibility in docs --- src/main/content/antora_ui/src/partials/article.hbs | 2 +- src/main/content/antora_ui/src/partials/nav-tree.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/content/antora_ui/src/partials/article.hbs b/src/main/content/antora_ui/src/partials/article.hbs index 2c60b3f1ad..3c538b9369 100644 --- a/src/main/content/antora_ui/src/partials/article.hbs +++ b/src/main/content/antora_ui/src/partials/article.hbs @@ -1,7 +1,7 @@ {{#if (eq page.layout 'config')}} {{/if}} -
+
{{#if (eq page.layout '404')}}

{{{or page.title 'Page Not Found'}}}

diff --git a/src/main/content/antora_ui/src/partials/nav-tree.hbs b/src/main/content/antora_ui/src/partials/nav-tree.hbs index 52c95875dc..f8decf324a 100644 --- a/src/main/content/antora_ui/src/partials/nav-tree.hbs +++ b/src/main/content/antora_ui/src/partials/nav-tree.hbs @@ -11,7 +11,7 @@ {{~#if (eq ./urlType 'internal')}}{{{relativize ./url}}} {{~else}}{{{./url}}}{{~/if}}">{{{./content}}} {{else}} - {{{./content}}} + {{{./content}}} {{/if}} {{/if}} {{> nav-tree navigation=./items level=(increment ../level)}} From 75e16fa0934a56bd1321cb6363dac940de633a44 Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Thu, 26 Oct 2023 11:25:46 +0530 Subject: [PATCH 06/46] Update the homepage --- src/main/content/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/content/index.html b/src/main/content/index.html index c3d082f172..a0001840b8 100644 --- a/src/main/content/index.html +++ b/src/main/content/index.html @@ -80,17 +80,17 @@

{% t home.cloud_native_develop_title %}

{% t home.cloud_native_develop_text2 %}

- {% t global.learnmore %} + {% t global.learnmore %}
-
OpenTracing
-
Health Check
+
Open Telemetry
+
Health
Metrics
-
OpenAPI
+
Open API
Fault Tolerance
JWT
Config
@@ -145,7 +145,7 @@

{% t home.monitor_microservice_develop_title %}

{% t home.monitor_microservice_develop_text %}

- {% t global.learnmore %} + {% t global.learnmore %}
From 5b7833426ea9137327521f5c894c70841f5ed2a0 Mon Sep 17 00:00:00 2001 From: navaneethsnair1 Date: Mon, 30 Oct 2023 17:47:20 +0530 Subject: [PATCH 07/46] accessibility errors in blog page fixed --- src/main/content/blog.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/content/blog.html b/src/main/content/blog.html index 311d750c0c..9052a1191c 100644 --- a/src/main/content/blog.html +++ b/src/main/content/blog.html @@ -57,19 +57,19 @@

{% t blog.featured_tags %}

- Remove tag filter + Remove tag filter {% t blog.no_results_found %} {% t blog.see %} @@ -243,7 +243,7 @@

{%- for tag in post.tags -%} {%- assign tag_name = tag | replace: " ", "_" -%} -

+

{%- t blog.tags.{{tag_name}} -%}

@@ -331,7 +331,7 @@

{%- for tag in post.tags -%} {%- assign tag_name = tag | replace: " ", "_" -%} -

+

{%- t blog.tags.{{tag_name}} -%}

@@ -383,4 +383,4 @@

ufo and clouds
-

+

\ No newline at end of file From 1c4f4d14f11c1ad66ffe9277e42da702e8ad2837 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 20:18:18 +0000 Subject: [PATCH 08/46] Bump browserify-sign from 4.2.1 to 4.2.2 in /src/main/content/antora_ui Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2. - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: browserify-sign dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/main/content/antora_ui/package-lock.json | 63 ++++++++++---------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/src/main/content/antora_ui/package-lock.json b/src/main/content/antora_ui/package-lock.json index d1b505ddb0..fd76e77120 100644 --- a/src/main/content/antora_ui/package-lock.json +++ b/src/main/content/antora_ui/package-lock.json @@ -1478,9 +1478,9 @@ } }, "node_modules/bn.js": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", - "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", "dev": true }, "node_modules/body": { @@ -1738,26 +1738,29 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dev": true, "dependencies": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 4" } }, "node_modules/browserify-sign/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { "inherits": "^2.0.3", @@ -14950,9 +14953,9 @@ } }, "bn.js": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", - "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", "dev": true }, "body": { @@ -15224,26 +15227,26 @@ } }, "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dev": true, "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" }, "dependencies": { "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "requires": { "inherits": "^2.0.3", From d0c8848529413150cfca05604dec0c7220bad497 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Tue, 17 Oct 2023 10:35:33 -0500 Subject: [PATCH 09/46] prevent these changes from going in draft for now --- docker/Dockerfile.prod | 15 --------------- docker/Dockerfile.staging | 15 --------------- scripts/build/docs_part_1.sh | 1 - 3 files changed, 31 deletions(-) diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 2d1497927b..1402266a47 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -38,10 +38,6 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh -RUN mkdir /temp-docs -RUN mv /target/jekyll-webapp/docs /temp-docs -RUN ls /target/jekyll-webapp - # # # @@ -52,18 +48,7 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target -# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be -# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. -# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. -# Maven will encouter a JVM crash because there are too many files related to docs. - -# Part 1: Remove the docs files so Maven does not need to deal with them. -RUN rm -rf /target/jekyll-webapp/docs -# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded -# Part 3: Restore the doc files that were previously removed -RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs -COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging index fd8f2168c0..b61a9d9b93 100644 --- a/docker/Dockerfile.staging +++ b/docker/Dockerfile.staging @@ -35,10 +35,6 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh -RUN mkdir /temp-docs -RUN mv /target/jekyll-webapp/docs /temp-docs -RUN ls /target/jekyll-webapp - # # # @@ -49,18 +45,7 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target -# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be -# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. -# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. -# Maven will encouter a JVM crash because there are too many files related to docs. - -# Part 1: Remove the docs files so Maven does not need to deal with them. -RUN rm -rf /target/jekyll-webapp/docs -# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded -# Part 3: Restore the doc files that were previously removed -RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs -COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/scripts/build/docs_part_1.sh b/scripts/build/docs_part_1.sh index 4fe950a462..115f478aa2 100755 --- a/scripts/build/docs_part_1.sh +++ b/scripts/build/docs_part_1.sh @@ -36,7 +36,6 @@ echo "Moving the Antora docs to the jekyll webapp" timer_start=$(date +%s) mkdir -p target/jekyll-webapp/docs/ cp -r src/main/content/docs/build/site/. target/jekyll-webapp/ -rm -rf src/main/content/docs/build timer_end=$(date +%s) echo "Total execution time for copying Antora docs to webapp: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'" From f0b65d2617c4a2d443c2b1a2b35b0d87d7aa3f7f Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Tue, 17 Oct 2023 09:25:04 -0500 Subject: [PATCH 10/46] realign with draft --- src/main/content/_assets/js/builds.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/content/_assets/js/builds.js b/src/main/content/_assets/js/builds.js index 1b53827dd9..dbe0ffd771 100644 --- a/src/main/content/_assets/js/builds.js +++ b/src/main/content/_assets/js/builds.js @@ -199,6 +199,14 @@ function render_builds(builds, parent) { // update maven and gradle commands to use latest version if (parent.parent().data('builds-id') == 'runtime_releases') { + var latest_version = latest_releases.runtime.version.trim(); + + // check that latest version matches x.x.x.x before updating + var re = /^\d+\.\d\.\d\.\d+/; + if (re.test(latest_version)) { + $('.latest_version').html(latest_version); + } + // get the newest release version // used to only add builds from the last two years to the runtime release table versArr = JSON.parse(JSON.stringify(builds)); From c800ed424be0f2448c5d5bbe99837c6ee3820a45 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Wed, 8 Nov 2023 12:33:27 -0600 Subject: [PATCH 11/46] fix links to documentation --- src/main/content/start.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index 14234592de..a2a1dc5a0c 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -169,7 +169,7 @@

{% t st {% t start.add_to_existing_app.try_guide_link %}

{% t start.add_to_existing_app.maven_docs_text %} - {% t start.add_to_existing_app.maven_docs_link %} + {% t start.add_to_existing_app.maven_docs_link %}

@@ -189,7 +189,7 @@

{% t st {% t start.add_to_existing_app.try_guide_link %}

{% t start.add_to_existing_app.gradle_docs_text %} - {% t start.add_to_existing_app.gradle_docs_link %} + {% t start.add_to_existing_app.gradle_docs_link %}

From d776f33fa5a4a965bac0aa2176acb433aa4b6c47 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Mon, 13 Nov 2023 08:59:34 -0600 Subject: [PATCH 12/46] checkout mismatched files from prod --- docker/Dockerfile.prod | 15 +++++ docker/Dockerfile.staging | 15 +++++ scripts/build/docs_part_1.sh | 1 + src/main/content/_assets/js/builds.js | 15 +---- src/main/content/antora_ui/package-lock.json | 63 ++++++++++---------- 5 files changed, 63 insertions(+), 46 deletions(-) diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 1402266a47..2d1497927b 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -38,6 +38,10 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh +RUN mkdir /temp-docs +RUN mv /target/jekyll-webapp/docs /temp-docs +RUN ls /target/jekyll-webapp + # # # @@ -48,7 +52,18 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target +# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be +# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. +# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. +# Maven will encouter a JVM crash because there are too many files related to docs. + +# Part 1: Remove the docs files so Maven does not need to deal with them. +RUN rm -rf /target/jekyll-webapp/docs +# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded +# Part 3: Restore the doc files that were previously removed +RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs +COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging index b61a9d9b93..fd8f2168c0 100644 --- a/docker/Dockerfile.staging +++ b/docker/Dockerfile.staging @@ -35,6 +35,10 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh +RUN mkdir /temp-docs +RUN mv /target/jekyll-webapp/docs /temp-docs +RUN ls /target/jekyll-webapp + # # # @@ -45,7 +49,18 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target +# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be +# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. +# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. +# Maven will encouter a JVM crash because there are too many files related to docs. + +# Part 1: Remove the docs files so Maven does not need to deal with them. +RUN rm -rf /target/jekyll-webapp/docs +# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded +# Part 3: Restore the doc files that were previously removed +RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs +COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/scripts/build/docs_part_1.sh b/scripts/build/docs_part_1.sh index 115f478aa2..4fe950a462 100755 --- a/scripts/build/docs_part_1.sh +++ b/scripts/build/docs_part_1.sh @@ -36,6 +36,7 @@ echo "Moving the Antora docs to the jekyll webapp" timer_start=$(date +%s) mkdir -p target/jekyll-webapp/docs/ cp -r src/main/content/docs/build/site/. target/jekyll-webapp/ +rm -rf src/main/content/docs/build timer_end=$(date +%s) echo "Total execution time for copying Antora docs to webapp: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'" diff --git a/src/main/content/_assets/js/builds.js b/src/main/content/_assets/js/builds.js index dbe0ffd771..8ebf9a4424 100644 --- a/src/main/content/_assets/js/builds.js +++ b/src/main/content/_assets/js/builds.js @@ -199,14 +199,6 @@ function render_builds(builds, parent) { // update maven and gradle commands to use latest version if (parent.parent().data('builds-id') == 'runtime_releases') { - var latest_version = latest_releases.runtime.version.trim(); - - // check that latest version matches x.x.x.x before updating - var re = /^\d+\.\d\.\d\.\d+/; - if (re.test(latest_version)) { - $('.latest_version').html(latest_version); - } - // get the newest release version // used to only add builds from the last two years to the runtime release table versArr = JSON.parse(JSON.stringify(builds)); @@ -317,7 +309,7 @@ function render_builds(builds, parent) { var verification_column2 = $( '' + // Optional sig file download button - (sig_href ? '' + download_arrow +'PEM' : '' ) + + (sig_href ? '' + download_arrow +'PEM' : '' ) + '' ); @@ -1099,10 +1091,7 @@ function validate_starter_inputs(event) { } } -function displayMessage(message,javaMsg) { - if(!javaMsg){ - javaMsg = false; - } +function displayMessage(message,javaMsg = false) { // Display a message when MP/Jakarta EE Version get changed. var close_icon = $( '\'Close\'' diff --git a/src/main/content/antora_ui/package-lock.json b/src/main/content/antora_ui/package-lock.json index fd76e77120..d1b505ddb0 100644 --- a/src/main/content/antora_ui/package-lock.json +++ b/src/main/content/antora_ui/package-lock.json @@ -1478,9 +1478,9 @@ } }, "node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", + "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==", "dev": true }, "node_modules/body": { @@ -1738,29 +1738,26 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", - "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dev": true, "dependencies": { - "bn.js": "^5.2.1", - "browserify-rsa": "^4.1.0", + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.4", + "elliptic": "^6.5.3", "inherits": "^2.0.4", - "parse-asn1": "^5.1.6", - "readable-stream": "^3.6.2", - "safe-buffer": "^5.2.1" - }, - "engines": { - "node": ">= 4" + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" } }, "node_modules/browserify-sign/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "dependencies": { "inherits": "^2.0.3", @@ -14953,9 +14950,9 @@ } }, "bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", + "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==", "dev": true }, "body": { @@ -15227,26 +15224,26 @@ } }, "browserify-sign": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", - "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dev": true, "requires": { - "bn.js": "^5.2.1", - "browserify-rsa": "^4.1.0", + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.4", + "elliptic": "^6.5.3", "inherits": "^2.0.4", - "parse-asn1": "^5.1.6", - "readable-stream": "^3.6.2", - "safe-buffer": "^5.2.1" + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" }, "dependencies": { "readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "requires": { "inherits": "^2.0.3", From 8fde0a3cbf902506a4f27dac8d166c88ce0c4834 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Mon, 13 Nov 2023 09:01:49 -0600 Subject: [PATCH 13/46] update builds --- src/main/content/_assets/js/builds.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/content/_assets/js/builds.js b/src/main/content/_assets/js/builds.js index 8ebf9a4424..1b53827dd9 100644 --- a/src/main/content/_assets/js/builds.js +++ b/src/main/content/_assets/js/builds.js @@ -309,7 +309,7 @@ function render_builds(builds, parent) { var verification_column2 = $( '' + // Optional sig file download button - (sig_href ? '' + download_arrow +'PEM' : '' ) + + (sig_href ? '' + download_arrow +'PEM' : '' ) + '' ); @@ -1091,7 +1091,10 @@ function validate_starter_inputs(event) { } } -function displayMessage(message,javaMsg = false) { +function displayMessage(message,javaMsg) { + if(!javaMsg){ + javaMsg = false; + } // Display a message when MP/Jakarta EE Version get changed. var close_icon = $( '\'Close\'' From 752a42b63d2f300905481cc82b3328386bd1ce18 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Tue, 24 Oct 2023 08:42:55 -0500 Subject: [PATCH 14/46] add text to lang config files --- src/main/content/start.html | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index a2a1dc5a0c..6ea18c0b50 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -159,21 +159,23 @@

{% t st
+

{% t start.add_to_existing_app.maven_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

Copied to clipboard
<dependency>
    <groupId>io.openliberty</groupId>
    <artifactId>openliberty-runtime</artifactId>
    <version>[19.0.0.9,)</version>
    <type>zip</type>
</dependency>
-

- {% t start.add_to_existing_app.maven_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

{% t start.add_to_existing_app.maven_docs_text %} {% t start.add_to_existing_app.maven_docs_link %}

+

{% t start.add_to_existing_app.gradle_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

Copied to clipboard
@@ -185,25 +187,22 @@

{% t st 
apply plugin: 'liberty'

-

{% t start.add_to_existing_app.gradle_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

{% t start.add_to_existing_app.gradle_docs_text %} {% t start.add_to_existing_app.gradle_docs_link %}

+

{% t start.add_to_existing_app.docker_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

Copied to clipboard
FROM icr.io/appcafe/open-liberty
-

{% t start.add_to_existing_app.docker_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

{% t start.add_to_existing_app.docker_docs_text %} - {% t start.add_to_existing_app.docker_docs_link %} + {% t start.add_to_existing_app.docker_docs_link %}

From 6a84946e9bc875f6c51f0459b76f19cf0bc08edb Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Wed, 25 Oct 2023 08:38:48 -0500 Subject: [PATCH 15/46] small fixes --- src/main/content/start.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index 6ea18c0b50..149fc298f9 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -159,23 +159,21 @@

{% t st
-

{% t start.add_to_existing_app.maven_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
<dependency>
    <groupId>io.openliberty</groupId>
    <artifactId>openliberty-runtime</artifactId>
    <version>[19.0.0.9,)</version>
    <type>zip</type>
</dependency>
+

+ {% t start.add_to_existing_app.maven_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

{% t start.add_to_existing_app.maven_docs_text %} {% t start.add_to_existing_app.maven_docs_link %}

-

{% t start.add_to_existing_app.gradle_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
@@ -187,20 +185,23 @@

{% t st 
apply plugin: 'liberty'

+

{% t start.add_to_existing_app.gradle_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

{% t start.add_to_existing_app.gradle_docs_text %} {% t start.add_to_existing_app.gradle_docs_link %}

-

{% t start.add_to_existing_app.docker_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
FROM icr.io/appcafe/open-liberty
+

{% t start.add_to_existing_app.docker_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

{% t start.add_to_existing_app.docker_docs_text %} {% t start.add_to_existing_app.docker_docs_link %}

From 1b329b120f897cd646e96c1e5c114ea9eea092e8 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Tue, 24 Oct 2023 08:42:55 -0500 Subject: [PATCH 16/46] add text to lang config files --- src/main/content/start.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/content/start.html b/src/main/content/start.html index 149fc298f9..4c1015dec7 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -159,6 +159,9 @@

{% t st
+

{% t start.add_to_existing_app.maven_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

Copied to clipboard
@@ -174,6 +177,9 @@

{% t st

+

{% t start.add_to_existing_app.gradle_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

Copied to clipboard
From 6af02b36fc836497444eb4ab2c21c259b6eaa2a8 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Wed, 25 Oct 2023 08:38:48 -0500 Subject: [PATCH 17/46] small fixes --- src/main/content/start.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index 4c1015dec7..149fc298f9 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -159,9 +159,6 @@

{% t st
-

{% t start.add_to_existing_app.maven_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
@@ -177,9 +174,6 @@

{% t st

-

{% t start.add_to_existing_app.gradle_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
From c0735a59b0febc0cdadd29c664be4e18f6f2b825 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Thu, 9 Nov 2023 10:19:23 -0600 Subject: [PATCH 18/46] change DOM ref to jquery ref --- src/main/content/antora_ui/src/js/05-features.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/content/antora_ui/src/js/05-features.js b/src/main/content/antora_ui/src/js/05-features.js index 76ae28124a..2c106823fb 100644 --- a/src/main/content/antora_ui/src/js/05-features.js +++ b/src/main/content/antora_ui/src/js/05-features.js @@ -91,7 +91,7 @@ function selectTOC() { if (featureToc.length > 0) { var li = featureToc.parent()[0]; var anchor = li.querySelector(".nav-link"); - navigation.activateCurrentPath(li); + navigation.activateCurrentPath($(li)); navigation.scrollItemToMidpoint(anchor); } } From e4e831a23e27d4d48aab0d9912589635a3b3f237 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Mon, 13 Nov 2023 10:17:52 -0600 Subject: [PATCH 19/46] rebasing work --- src/main/content/start.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index 149fc298f9..d673afe43b 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -135,8 +135,8 @@

{% t start.generate_project_modal.heading %}

-

{% t start.add_to_existing_app.title %}

-

{% t start.add_to_existing_app.sect_heading %}

+

{% t start.get_OL_section_title %}

+

{% t start.get_OL_section_text %}

@@ -194,16 +194,16 @@

{% t st

+

{% t start.container_section_text %} + {% t start.container_section_link %} +

Copied to clipboard
FROM icr.io/appcafe/open-liberty
-

{% t start.add_to_existing_app.docker_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

-

{% t start.add_to_existing_app.docker_docs_text %} - {% t start.add_to_existing_app.docker_docs_link %} +

{% t start.find_out %} + {% t start.how_to_use_docker %}

From 5fce9dff638435ed69742b0f499f3e4d94badc5b Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Mon, 13 Nov 2023 10:18:29 -0600 Subject: [PATCH 20/46] update start html --- src/main/content/start.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index d673afe43b..a2a1dc5a0c 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -135,8 +135,8 @@

{% t start.generate_project_modal.heading %}

-

{% t start.get_OL_section_title %}

-

{% t start.get_OL_section_text %}

+

{% t start.add_to_existing_app.title %}

+

{% t start.add_to_existing_app.sect_heading %}

@@ -194,16 +194,16 @@

{% t st

-

{% t start.container_section_text %} - {% t start.container_section_link %} -

Copied to clipboard
FROM icr.io/appcafe/open-liberty
-

{% t start.find_out %} - {% t start.how_to_use_docker %} +

{% t start.add_to_existing_app.docker_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

+

{% t start.add_to_existing_app.docker_docs_text %} + {% t start.add_to_existing_app.docker_docs_link %}

From 4f12cdb158a379b417289e3ffa58be7d258e8028 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Mon, 13 Nov 2023 10:19:22 -0600 Subject: [PATCH 21/46] rebase work --- src/main/content/start.html | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index a2a1dc5a0c..4272c9cded 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -135,8 +135,8 @@

{% t start.generate_project_modal.heading %}

-

{% t start.add_to_existing_app.title %}

-

{% t start.add_to_existing_app.sect_heading %}

+

{% t start.get_OL_section_title %}

+

{% t start.get_OL_section_text %}

@@ -164,12 +164,8 @@

{% t st 
<dependency>
    <groupId>io.openliberty</groupId>
    <artifactId>openliberty-runtime</artifactId>
    <version>[19.0.0.9,)</version>
    <type>zip</type>
</dependency>

-

- {% t start.add_to_existing_app.maven_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

-

{% t start.add_to_existing_app.maven_docs_text %} - {% t start.add_to_existing_app.maven_docs_link %} +

{% t start.find_out %} + {% t start.how_to_use_maven %}

@@ -185,25 +181,22 @@

{% t st 
apply plugin: 'liberty'

-

{% t start.add_to_existing_app.gradle_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

-

{% t start.add_to_existing_app.gradle_docs_text %} - {% t start.add_to_existing_app.gradle_docs_link %} +

{% t start.find_out %} + {% t start.how_to_use_gradle %}

+

{% t start.container_section_text %} + {% t start.container_section_link %} +

Copied to clipboard
FROM icr.io/appcafe/open-liberty
-

{% t start.add_to_existing_app.docker_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

-

{% t start.add_to_existing_app.docker_docs_text %} - {% t start.add_to_existing_app.docker_docs_link %} +

{% t start.find_out %} + {% t start.how_to_use_docker %}

From d3d4ce51ac981ce981a2732662db29031c781d6f Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Mon, 13 Nov 2023 10:21:42 -0600 Subject: [PATCH 22/46] rebase work --- src/main/content/start.html | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index 4272c9cded..a2a1dc5a0c 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -135,8 +135,8 @@

{% t start.generate_project_modal.heading %}

-

{% t start.get_OL_section_title %}

-

{% t start.get_OL_section_text %}

+

{% t start.add_to_existing_app.title %}

+

{% t start.add_to_existing_app.sect_heading %}

@@ -164,8 +164,12 @@

{% t st 
<dependency>
    <groupId>io.openliberty</groupId>
    <artifactId>openliberty-runtime</artifactId>
    <version>[19.0.0.9,)</version>
    <type>zip</type>
</dependency>

-

{% t start.find_out %} - {% t start.how_to_use_maven %} +

+ {% t start.add_to_existing_app.maven_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

+

{% t start.add_to_existing_app.maven_docs_text %} + {% t start.add_to_existing_app.maven_docs_link %}

@@ -181,22 +185,25 @@

{% t st 
apply plugin: 'liberty'

-

{% t start.find_out %} - {% t start.how_to_use_gradle %} +

{% t start.add_to_existing_app.gradle_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

+

{% t start.add_to_existing_app.gradle_docs_text %} + {% t start.add_to_existing_app.gradle_docs_link %}

-

{% t start.container_section_text %} - {% t start.container_section_link %} -

Copied to clipboard
FROM icr.io/appcafe/open-liberty
-

{% t start.find_out %} - {% t start.how_to_use_docker %} +

{% t start.add_to_existing_app.docker_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

+

{% t start.add_to_existing_app.docker_docs_text %} + {% t start.add_to_existing_app.docker_docs_link %}

From 447e3abb4057c2e21ac7c5d7a07cd4f343ca75dd Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Fri, 10 Nov 2023 11:55:41 +0530 Subject: [PATCH 23/46] Cleaned yaml files --- src/main/content/_i18n/en.yml | 10 ---------- src/main/content/_i18n/ja.yml | 15 --------------- src/main/content/_i18n/zh-Hans.yml | 15 --------------- 3 files changed, 40 deletions(-) diff --git a/src/main/content/_i18n/en.yml b/src/main/content/_i18n/en.yml index fa9a2c9578..79cd0cf092 100644 --- a/src/main/content/_i18n/en.yml +++ b/src/main/content/_i18n/en.yml @@ -1,16 +1,11 @@ global: - tagline: English openliberty: Open Liberty ol_logo_subtitile: An IBM Open Source Project - about: About twitter: Twitter - github: GitHub learnmore: Learn more readmore: Read more - follow: Follow and: and and_with: And with - or: or trans_yes: 'Yes' news_and_updates: News & updates openlibertyio: openliberty.io @@ -61,7 +56,6 @@ home: openlibery_opensource_community_title: Open Liberty integrates with the Open Source community openliberty_news: Open Liberty News openliberty_news_text: Check out the latest news on our blog. - link_to_blog_post: View all Open Liberty Blog posts support_title: A crew that supports you support_text1: As a member of the Open Liberty crew, you have the support and expertise of an entire community at your fingertips. Don't forget @@ -99,8 +93,6 @@ start: add_to_existing_app: title: Add to an existing application sect_heading: Open Liberty provides build plugins for Maven and Gradle that simplify the installation and operational control of the Liberty runtime and servers. - container_section_text: Want to customize your image resources? - container_section_link: Check out our docs. maven_guide_text: Ready to get started using Maven with Open Liberty? gradle_guide_text: Ready to get started using Gradle with Open Liberty? docker_guide_text: Ready to start using containers with Open Liberty? @@ -129,7 +121,6 @@ start: download_package_section: para: We recommend using the latest release, but beta and development builds are also available for use. Once downloaded, you're ready for lift-off. releases: Releases - development_builds: Development builds betas: Betas nightly_builds: Nightly Builds table_header: @@ -237,7 +228,6 @@ guides: contents: Contents tags: Tags prerequisites: Prerequisites - copied_to_clipboard: Copied to clipboard back_to_text: Back to text blog: see_all_blog_posts: See all blog posts diff --git a/src/main/content/_i18n/ja.yml b/src/main/content/_i18n/ja.yml index 2e6a7d9a36..de421cd6fc 100644 --- a/src/main/content/_i18n/ja.yml +++ b/src/main/content/_i18n/ja.yml @@ -1,18 +1,12 @@ global: - tagline: English openliberty: Open Liberty ol_logo_subtitile: An IBM Open Source Project - about: About twitter: Twitter - github: GitHub learnmore: Learn more readmore: 詳細はこちら - follow: Follow and: and and_with: And with - or: or trans_yes: 'Yes' - websphere_application_server: WebSphere Application Server news_and_updates: News & updates openlibertyio: openliberty.io stackoverflow: Stack Overflow @@ -62,7 +56,6 @@ home: openlibery_opensource_community_title: Open Liberty integrates with the Open Source community openliberty_news: Open Liberty News openliberty_news_text: Check out the latest news on our blog. - link_to_blog_post: View all Open Liberty Blog posts support_title: A crew that supports you support_text1: As a member of the Open Liberty crew, you have the support and expertise of an entire community at your fingertips. Don't forget @@ -100,8 +93,6 @@ start: add_to_existing_app: title: Add to an existing application sect_heading: Open Liberty provides build plugins for Maven and Gradle that simplify the installation and operational control of the Liberty runtime and servers. - container_section_text: Want to customize your image resources? - container_section_link: Check out our docs. maven_guide_text: Ready to get started using Maven with Open Liberty? gradle_guide_text: Ready to get started using Gradle with Open Liberty? docker_guide_text: Ready to start using containers with Open Liberty? @@ -130,10 +121,8 @@ start: download_package_section: para: We recommend using the latest release, but beta and development builds are also available for use. Once downloaded, you're ready for lift-off. releases: Releases - development_builds: Development builds betas: Betas nightly_builds: Nightly Builds - eclipse_developer_tools: Eclipse developer tools table_header: version: Version package: Package @@ -144,7 +133,6 @@ start: logs: Logs releases_content1: New releases will be announced on the Open Liberty releases_content2: In version 22.0.0.1 and later, to verify the authenticity and integrity of an Open Liberty release package, use the provided signature file (SIG) and - public_key: public key. more_information: For more information, see verify_oio_release_packages: Verifying Open Liberty release packages. beta_content1: Try out new features in our betas and let us know @@ -154,8 +142,6 @@ start: beta_content4: beta blog posts. beta_content5: To verify the authenticity and integrity of an Open Liberty release package, use the provided signature file (SIG) and nightly_builds_content: Nightly builds contain in-development features, have not gone through the full release process and are potentially unstable. - eclipse_developer_tools_content1: We recommend IDE tools based on Eclipse since it gives you an integrated environment right out of the box. - eclipse_developer_tools_content2: Learn how to install the tools here. archive_text1: You can find previous releases in archive_text2: this archive. cow_text: Don't have a cow. @@ -242,7 +228,6 @@ guides: contents: Contents tags: タグ prerequisites: Prerequisites - copied_to_clipboard: Copied to clipboard back_to_text: Back to text blog: see_all_blog_posts: すべてのブログ投稿を表示 diff --git a/src/main/content/_i18n/zh-Hans.yml b/src/main/content/_i18n/zh-Hans.yml index 3acfa53ae2..3b3be6f644 100644 --- a/src/main/content/_i18n/zh-Hans.yml +++ b/src/main/content/_i18n/zh-Hans.yml @@ -1,18 +1,12 @@ global: - tagline: English openliberty: Open Liberty ol_logo_subtitile: IBM 开放式源代码项目 - about: About twitter: Twitter - github: GitHub learnmore: Learn more readmore: 阅读更多 - follow: Follow and: and and_with: And with - or: or trans_yes: 'Yes' - websphere_application_server: WebSphere Application Server news_and_updates: News & updates openlibertyio: openliberty.io stackoverflow: Stack Overflow @@ -62,7 +56,6 @@ home: openlibery_opensource_community_title: Open Liberty integrates with the Open Source community openliberty_news: Open Liberty News openliberty_news_text: Check out the latest news on our blog. - link_to_blog_post: View all Open Liberty Blog posts support_title: A crew that supports you support_text1: As a member of the Open Liberty crew, you have the support and expertise of an entire community at your fingertips. Don't forget @@ -100,8 +93,6 @@ start: add_to_existing_app: title: Add to an existing application sect_heading: Open Liberty provides build plugins for Maven and Gradle that simplify the installation and operational control of the Liberty runtime and servers. - container_section_text: Want to customize your image resources? - container_section_link: Check out our docs. maven_guide_text: Ready to get started using Maven with Open Liberty? gradle_guide_text: Ready to get started using Gradle with Open Liberty? docker_guide_text: Ready to start using containers with Open Liberty? @@ -130,10 +121,8 @@ start: download_package_section: para: We recommend using the latest release, but beta and development builds are also available for use. Once downloaded, you're ready for lift-off. releases: Releases - development_builds: Development builds betas: Betas nightly_builds: Nightly Builds - eclipse_developer_tools: Eclipse developer tools table_header: version: Version package: Package @@ -144,7 +133,6 @@ start: logs: Logs releases_content1: New releases will be announced on the Open Liberty releases_content2: In version 22.0.0.1 and later, to verify the authenticity and integrity of an Open Liberty release package, use the provided signature file (SIG) and - public_key: public key. more_information: For more information, see verify_oio_release_packages: Verifying Open Liberty release packages. beta_content1: Try out new features in our betas and let us know @@ -154,8 +142,6 @@ start: beta_content4: beta blog posts. beta_content5: To verify the authenticity and integrity of an Open Liberty release package, use the provided signature file (SIG) and nightly_builds_content: Nightly builds contain in-development features, have not gone through the full release process and are potentially unstable. - eclipse_developer_tools_content1: We recommend IDE tools based on Eclipse since it gives you an integrated environment right out of the box. - eclipse_developer_tools_content2: Learn how to install the tools here. archive_text1: You can find previous releases in archive_text2: this archive. cow_text: Don't have a cow. @@ -242,7 +228,6 @@ guides: contents: Contents tags: 标签 prerequisites: Prerequisites - copied_to_clipboard: Copied to clipboard back_to_text: Back to text blog: see_all_blog_posts: 查看所有博客帖子 From 69ab272e530e91c2c557dd997b2b71eae18c94b4 Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Thu, 9 Nov 2023 14:32:36 +0530 Subject: [PATCH 24/46] Updated blogs in home --- src/main/content/_assets/css/home.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/content/_assets/css/home.scss b/src/main/content/_assets/css/home.scss index 2e905af9ff..ce3ac76a81 100644 --- a/src/main/content/_assets/css/home.scss +++ b/src/main/content/_assets/css/home.scss @@ -589,6 +589,7 @@ body { } #blog_post { + height: 100%; box-shadow: 0 2px 4px 0 rgba(63, 70, 89, 0.31); border-radius: 3px; padding: 47px 57px; @@ -654,6 +655,8 @@ body { } #blog_link { + position: absolute; + bottom: 20px; display: block; font-size: 16px; font-weight: 500; From 6dee7314944bd806e2ea6206854a5f599869549e Mon Sep 17 00:00:00 2001 From: natalie-bernhard <84740311+natalie-bernhard@users.noreply.github.com> Date: Wed, 15 Nov 2023 14:40:29 -0600 Subject: [PATCH 25/46] Revert "3471 docs toc scrolling" --- src/main/content/antora_ui/src/js/05-features.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/content/antora_ui/src/js/05-features.js b/src/main/content/antora_ui/src/js/05-features.js index 2c106823fb..76ae28124a 100644 --- a/src/main/content/antora_ui/src/js/05-features.js +++ b/src/main/content/antora_ui/src/js/05-features.js @@ -91,7 +91,7 @@ function selectTOC() { if (featureToc.length > 0) { var li = featureToc.parent()[0]; var anchor = li.querySelector(".nav-link"); - navigation.activateCurrentPath($(li)); + navigation.activateCurrentPath(li); navigation.scrollItemToMidpoint(anchor); } } From 802bf4228f0f128706f0e6aae43ef108d88a9a5c Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Fri, 17 Nov 2023 11:09:47 -0600 Subject: [PATCH 26/46] Set node-sass version and fix feature toc jump --- scripts/build/antora_install.sh | 2 +- src/main/content/antora_ui/src/js/05-features.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build/antora_install.sh b/scripts/build/antora_install.sh index 0718f96df6..12881642b2 100755 --- a/scripts/build/antora_install.sh +++ b/scripts/build/antora_install.sh @@ -15,7 +15,7 @@ pushd src/main/content/antora_ui echo "Installing Antora dependencies" npm install -g @antora/site-generator@3.0.1 npm install gulp -g --ignore-scripts -npm install node-sass gulp-sass gulp-dart-sass --save-dev +npm install node-sass@7.0.3 gulp-sass gulp-dart-sass --save-dev npm install gulp sass:convert SOURCEMAPS=true gulp build diff --git a/src/main/content/antora_ui/src/js/05-features.js b/src/main/content/antora_ui/src/js/05-features.js index 76ae28124a..9d3d2c3076 100644 --- a/src/main/content/antora_ui/src/js/05-features.js +++ b/src/main/content/antora_ui/src/js/05-features.js @@ -91,8 +91,8 @@ function selectTOC() { if (featureToc.length > 0) { var li = featureToc.parent()[0]; var anchor = li.querySelector(".nav-link"); - navigation.activateCurrentPath(li); - navigation.scrollItemToMidpoint(anchor); + navigation.activateCurrentPath($(li)); + navigation.scrollItemToMidpoint($(anchor)); } } From 46155f9f0e449086cb3d34103178f6ee957fbac1 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Tue, 17 Oct 2023 09:25:04 -0500 Subject: [PATCH 27/46] realign with draft --- docker/Dockerfile.prod | 15 --------------- docker/Dockerfile.staging | 15 --------------- scripts/build/docs_part_1.sh | 1 - src/main/content/_assets/js/builds.js | 8 ++++++++ 4 files changed, 8 insertions(+), 31 deletions(-) diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 2d1497927b..1402266a47 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -38,10 +38,6 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh -RUN mkdir /temp-docs -RUN mv /target/jekyll-webapp/docs /temp-docs -RUN ls /target/jekyll-webapp - # # # @@ -52,18 +48,7 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target -# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be -# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. -# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. -# Maven will encouter a JVM crash because there are too many files related to docs. - -# Part 1: Remove the docs files so Maven does not need to deal with them. -RUN rm -rf /target/jekyll-webapp/docs -# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded -# Part 3: Restore the doc files that were previously removed -RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs -COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging index fd8f2168c0..b61a9d9b93 100644 --- a/docker/Dockerfile.staging +++ b/docker/Dockerfile.staging @@ -35,10 +35,6 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh -RUN mkdir /temp-docs -RUN mv /target/jekyll-webapp/docs /temp-docs -RUN ls /target/jekyll-webapp - # # # @@ -49,18 +45,7 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target -# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be -# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. -# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. -# Maven will encouter a JVM crash because there are too many files related to docs. - -# Part 1: Remove the docs files so Maven does not need to deal with them. -RUN rm -rf /target/jekyll-webapp/docs -# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded -# Part 3: Restore the doc files that were previously removed -RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs -COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/scripts/build/docs_part_1.sh b/scripts/build/docs_part_1.sh index 4fe950a462..115f478aa2 100755 --- a/scripts/build/docs_part_1.sh +++ b/scripts/build/docs_part_1.sh @@ -36,7 +36,6 @@ echo "Moving the Antora docs to the jekyll webapp" timer_start=$(date +%s) mkdir -p target/jekyll-webapp/docs/ cp -r src/main/content/docs/build/site/. target/jekyll-webapp/ -rm -rf src/main/content/docs/build timer_end=$(date +%s) echo "Total execution time for copying Antora docs to webapp: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'" diff --git a/src/main/content/_assets/js/builds.js b/src/main/content/_assets/js/builds.js index 1b53827dd9..dbe0ffd771 100644 --- a/src/main/content/_assets/js/builds.js +++ b/src/main/content/_assets/js/builds.js @@ -199,6 +199,14 @@ function render_builds(builds, parent) { // update maven and gradle commands to use latest version if (parent.parent().data('builds-id') == 'runtime_releases') { + var latest_version = latest_releases.runtime.version.trim(); + + // check that latest version matches x.x.x.x before updating + var re = /^\d+\.\d\.\d\.\d+/; + if (re.test(latest_version)) { + $('.latest_version').html(latest_version); + } + // get the newest release version // used to only add builds from the last two years to the runtime release table versArr = JSON.parse(JSON.stringify(builds)); From 1235b3c4c546670d255293e7e0ac34d51fc2c91c Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Mon, 20 Nov 2023 09:35:52 -0600 Subject: [PATCH 28/46] remove old changes --- docker/Dockerfile.prod | 15 +++++++++++++++ docker/Dockerfile.staging | 15 +++++++++++++++ scripts/build/docs_part_1.sh | 1 + src/main/content/_assets/js/builds.js | 8 -------- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 1402266a47..2d1497927b 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -38,6 +38,10 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh +RUN mkdir /temp-docs +RUN mv /target/jekyll-webapp/docs /temp-docs +RUN ls /target/jekyll-webapp + # # # @@ -48,7 +52,18 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target +# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be +# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. +# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. +# Maven will encouter a JVM crash because there are too many files related to docs. + +# Part 1: Remove the docs files so Maven does not need to deal with them. +RUN rm -rf /target/jekyll-webapp/docs +# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded +# Part 3: Restore the doc files that were previously removed +RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs +COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging index b61a9d9b93..fd8f2168c0 100644 --- a/docker/Dockerfile.staging +++ b/docker/Dockerfile.staging @@ -35,6 +35,10 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh +RUN mkdir /temp-docs +RUN mv /target/jekyll-webapp/docs /temp-docs +RUN ls /target/jekyll-webapp + # # # @@ -45,7 +49,18 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target +# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be +# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. +# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. +# Maven will encouter a JVM crash because there are too many files related to docs. + +# Part 1: Remove the docs files so Maven does not need to deal with them. +RUN rm -rf /target/jekyll-webapp/docs +# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded +# Part 3: Restore the doc files that were previously removed +RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs +COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/scripts/build/docs_part_1.sh b/scripts/build/docs_part_1.sh index 115f478aa2..4fe950a462 100755 --- a/scripts/build/docs_part_1.sh +++ b/scripts/build/docs_part_1.sh @@ -36,6 +36,7 @@ echo "Moving the Antora docs to the jekyll webapp" timer_start=$(date +%s) mkdir -p target/jekyll-webapp/docs/ cp -r src/main/content/docs/build/site/. target/jekyll-webapp/ +rm -rf src/main/content/docs/build timer_end=$(date +%s) echo "Total execution time for copying Antora docs to webapp: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'" diff --git a/src/main/content/_assets/js/builds.js b/src/main/content/_assets/js/builds.js index dbe0ffd771..1b53827dd9 100644 --- a/src/main/content/_assets/js/builds.js +++ b/src/main/content/_assets/js/builds.js @@ -199,14 +199,6 @@ function render_builds(builds, parent) { // update maven and gradle commands to use latest version if (parent.parent().data('builds-id') == 'runtime_releases') { - var latest_version = latest_releases.runtime.version.trim(); - - // check that latest version matches x.x.x.x before updating - var re = /^\d+\.\d\.\d\.\d+/; - if (re.test(latest_version)) { - $('.latest_version').html(latest_version); - } - // get the newest release version // used to only add builds from the last two years to the runtime release table versArr = JSON.parse(JSON.stringify(builds)); From 3ea6d4351ed5406fa411a4124b1098ef1d56619c Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Mon, 20 Nov 2023 14:55:03 -0600 Subject: [PATCH 29/46] fix overwrite from previous pr --- src/main/content/start.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index a2a1dc5a0c..6bfb454888 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -162,7 +162,7 @@

{% t st
Copied to clipboard
- 
<dependency>
    <groupId>io.openliberty</groupId>
    <artifactId>openliberty-runtime</artifactId>
    <version>[19.0.0.9,)</version>
    <type>zip</type>
</dependency>
+ 
<plugin>
 <groupId>io.openliberty.tools</groupId>
 <artifactId>liberty-maven-plugin</artifactId>
 <version>3.9</version>
</plugin>

{% t start.add_to_existing_app.maven_guide_text %} From e3fa801e9b762c0d45bcd357f0b9e8ebbc8badb7 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Mon, 20 Nov 2023 15:27:23 -0600 Subject: [PATCH 30/46] add indentations --- src/main/content/start.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index 6bfb454888..43e6ebec1e 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -162,7 +162,7 @@

{% t st
Copied to clipboard
- 
<plugin>
 <groupId>io.openliberty.tools</groupId>
 <artifactId>liberty-maven-plugin</artifactId>
 <version>3.9</version>
</plugin>
+ 
<plugin>
    <groupId>io.openliberty.tools</groupId>
    <artifactId>liberty-maven-plugin</artifactId>
    <version>3.9</version>
</plugin>

{% t start.add_to_existing_app.maven_guide_text %} From e578fb6bc9dd3cb5ac26c7f1396c987ccab6c782 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Tue, 17 Oct 2023 10:35:33 -0500 Subject: [PATCH 31/46] prevent these changes from going in draft for now --- docker/Dockerfile.prod | 15 --------------- docker/Dockerfile.staging | 15 --------------- scripts/build/docs_part_1.sh | 1 - 3 files changed, 31 deletions(-) diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 2d1497927b..1402266a47 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -38,10 +38,6 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh -RUN mkdir /temp-docs -RUN mv /target/jekyll-webapp/docs /temp-docs -RUN ls /target/jekyll-webapp - # # # @@ -52,18 +48,7 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target -# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be -# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. -# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. -# Maven will encouter a JVM crash because there are too many files related to docs. - -# Part 1: Remove the docs files so Maven does not need to deal with them. -RUN rm -rf /target/jekyll-webapp/docs -# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded -# Part 3: Restore the doc files that were previously removed -RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs -COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging index fd8f2168c0..b61a9d9b93 100644 --- a/docker/Dockerfile.staging +++ b/docker/Dockerfile.staging @@ -35,10 +35,6 @@ RUN $BUILD_SCRIPTS_DIR/docs_part_2.sh RUN $BUILD_SCRIPTS_DIR/gzip.sh -RUN mkdir /temp-docs -RUN mv /target/jekyll-webapp/docs /temp-docs -RUN ls /target/jekyll-webapp - # # # @@ -49,18 +45,7 @@ COPY .mvn /.mvn COPY pom.xml / COPY --from=docs --chown=1001:0 /src /src COPY --from=docs --chown=1001:0 /target /target -# Maven does not need to know about the large amount of files generated by Antora. The antora files only need to be -# correctly placed on the file system so that the openliberty.io application can serve the files to browsers. -# When the Antora files are placed in the /target directory, this forces Maven to deal with too many files. -# Maven will encouter a JVM crash because there are too many files related to docs. - -# Part 1: Remove the docs files so Maven does not need to deal with them. -RUN rm -rf /target/jekyll-webapp/docs -# Part 2: Build the Java application RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded -# Part 3: Restore the doc files that were previously removed -RUN mkdir target/openliberty-website-1.0-SNAPSHOT/docs -COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0-SNAPSHOT/docs # # diff --git a/scripts/build/docs_part_1.sh b/scripts/build/docs_part_1.sh index 4fe950a462..115f478aa2 100755 --- a/scripts/build/docs_part_1.sh +++ b/scripts/build/docs_part_1.sh @@ -36,7 +36,6 @@ echo "Moving the Antora docs to the jekyll webapp" timer_start=$(date +%s) mkdir -p target/jekyll-webapp/docs/ cp -r src/main/content/docs/build/site/. target/jekyll-webapp/ -rm -rf src/main/content/docs/build timer_end=$(date +%s) echo "Total execution time for copying Antora docs to webapp: '$(date -u --date @$(( $timer_end - $timer_start )) +%H:%M:%S)'" From 4a4a69600e02d0e119fe91919abf363bfcef23e6 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Tue, 17 Oct 2023 09:25:04 -0500 Subject: [PATCH 32/46] realign with draft --- src/main/content/_assets/js/builds.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/content/_assets/js/builds.js b/src/main/content/_assets/js/builds.js index 1b53827dd9..dbe0ffd771 100644 --- a/src/main/content/_assets/js/builds.js +++ b/src/main/content/_assets/js/builds.js @@ -199,6 +199,14 @@ function render_builds(builds, parent) { // update maven and gradle commands to use latest version if (parent.parent().data('builds-id') == 'runtime_releases') { + var latest_version = latest_releases.runtime.version.trim(); + + // check that latest version matches x.x.x.x before updating + var re = /^\d+\.\d\.\d\.\d+/; + if (re.test(latest_version)) { + $('.latest_version').html(latest_version); + } + // get the newest release version // used to only add builds from the last two years to the runtime release table versArr = JSON.parse(JSON.stringify(builds)); From 120c525412f15c708286b6eeab45411aaa92d986 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Tue, 24 Oct 2023 08:42:55 -0500 Subject: [PATCH 33/46] add text to lang config files --- src/main/content/start.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/content/start.html b/src/main/content/start.html index 43e6ebec1e..7179734a74 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -159,6 +159,9 @@

{% t st
+

{% t start.add_to_existing_app.maven_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

Copied to clipboard
@@ -174,6 +177,9 @@

{% t st

+

{% t start.add_to_existing_app.gradle_guide_text %} + {% t start.add_to_existing_app.try_guide_link %} +

Copied to clipboard
From 8bb633e84883823bcda314e525d34e609fcefef2 Mon Sep 17 00:00:00 2001 From: natalie-bernhard Date: Wed, 25 Oct 2023 08:38:48 -0500 Subject: [PATCH 34/46] small fixes --- src/main/content/start.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/content/start.html b/src/main/content/start.html index 7179734a74..43e6ebec1e 100644 --- a/src/main/content/start.html +++ b/src/main/content/start.html @@ -159,9 +159,6 @@

{% t st
-

{% t start.add_to_existing_app.maven_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
@@ -177,9 +174,6 @@

{% t st

-

{% t start.add_to_existing_app.gradle_guide_text %} - {% t start.add_to_existing_app.try_guide_link %} -

Copied to clipboard
From 5aeeea3a076be2c5380c44d7a5970b2bac34086e Mon Sep 17 00:00:00 2001 From: navaneethsnair1 Date: Tue, 14 Nov 2023 14:16:19 +0530 Subject: [PATCH 35/46] Accessibility errors of guides section id addressed --- src/main/content/_assets/js/guide-common.js | 8 +++++++- src/main/content/_includes/end-of-guide.html | 10 +++++----- src/main/content/_layouts/guide-multipane.html | 9 ++++++--- src/main/content/_layouts/guide.html | 4 +++- src/main/content/_layouts/iguide-multipane.html | 2 ++ 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/main/content/_assets/js/guide-common.js b/src/main/content/_assets/js/guide-common.js index 488aea12e2..7bffb6c126 100644 --- a/src/main/content/_assets/js/guide-common.js +++ b/src/main/content/_assets/js/guide-common.js @@ -15,6 +15,12 @@ var threeColumnBreakpoint = 1440; var dep = false; var dep_closed = false; +const preTags = document.querySelectorAll('pre'); +preTags.forEach(preTag => { + preTag.setAttribute('tabindex', '0'); + preTag.setAttribute('role', 'button'); +}); + // update twoColumnBreakpoint for the only single pane guide if (window.location.href.indexOf("cloud-ibm") > -1) { var twoColumnBreakpoint = 1440; @@ -295,7 +301,7 @@ function createEndOfGuideContent() { .find("p") .clone(); whatYouLearned.first().prepend("Nice work! "); // Start every what you learned statement with 'Nice work!' - whatYouLearned.attr("tabindex", "0"); + whatYouLearned.attr("tabindex", "-1"); leftSide.prepend(whatYouLearned); $("#great-work-you-re-done, #great-work-youre-done").parent().remove(); // Remove section from the main guide column. $( diff --git a/src/main/content/_includes/end-of-guide.html b/src/main/content/_includes/end-of-guide.html index 4e1a2450f2..fd59d3b61e 100644 --- a/src/main/content/_includes/end-of-guide.html +++ b/src/main/content/_includes/end-of-guide.html @@ -34,16 +34,16 @@ {% endif %}
-

{% t endofguide.nice_work %} {% t endofguide.where_to_next %}

+

{% t endofguide.nice_work %} {% t endofguide.where_to_next %}

{% t endofguide.what_do_you_think_of_this_guide %}

- Extreme Dislike - Dislike - Like - Extreme Like + Extreme Dislike + Dislike + Like + Extreme Like