Merge sync-b4969fb7 into main

.github/dependabot.yml

@@ -5,3 +5,7 @@ updates:
     schedule:
       interval: 'weekly'
     open-pull-requests-limit: 10
+    groups:
+      docusaurus:
+        patterns:
+          - '@docusaurus/*'

docs/production/azure.mdx

@@ -7,7 +7,14 @@ last_update:
 
 # <i class="fa fa-cloud-upload"></i> Microsoft Azureへのデプロイ
 
+<<<<<<< HEAD
 [Microsoft Azure](https://azure.microsoft.com/overview/?WT.mc_id=online-jhipster-judubois)は、クラウドでJHipsterアプリケーションを実行するための優れたソリューションです。
+=======
+- The easiest way is to use [JHipster Azure Container Apps](https://github.com/Azure/generator-jhipster-azure-container-apps) to create and deploy your project from end to end. JHipster Azure Container Apps is designed to streamline your full-stack Spring application development, leveraging the robust infrastructure of [Azure Container Apps](https://learn.microsoft.com/azure/container-apps/java-overview) to bring your projects to life with unprecedented ease and efficiency.
+- If you are using Spring Boot, [Azure Container Apps](https://azure.microsoft.com/products/container-apps) offers full support for JHipster applications with built-in Java capabilities. You can read more on the [Quickstart](https://learn.microsoft.com/azure/container-apps/java-get-started).
+- You can also try [Azure App Service](https://azure.microsoft.com/services/app-service/?WT.mc_id=online-jhipster-judubois) to deploy your monoliths.
+- As with any Docker and Kubernetes cloud provider, you can use the JHipster Docker and Kubernetes support to deploy your Docker images to Microsoft Azure. Follow our [Docker Compose documentation](/docker-compose) and our [Kubernetes documentation](/kubernetes) for more information on these options.
+>>>>>>> upstream/main
 
 - 最も簡単な方法は、[JHipster Azure Spring Apps](https://github.com/Azure/generator-jhipster-azure-spring-apps)を使用して、プロジェクトをエンドツーエンドで作成してデプロイすることです。 JHipster Azure Spring Appsは、フルスタックのSpringアプリケーション開発を合理化するように設計されており、Azure Spring Appsの堅牢なインフラストラクチャを活用して、これまでにない容易さと効率性でプロジェクトを実現します。
 - Spring Bootマイクロサービスを使用している場合、[Azure Spring Apps](https://azure.microsoft.com/services/spring-apps/?WT.mc_id=online-jhipster-judubois) はJHipsterアプリケーションを完全にサポートします。[Quickstart](https://learn.microsoft.com/azure/spring-apps/quickstart-deploy-microservice-apps)で詳細を読むことができます。
@@ -31,6 +38,7 @@ NubesGenを使用してJHipsterアプリケーションをデプロイするに
 
 [start.jhipster.tech/generate-azure-application](https://start.jhipster.tech/generate-azure-application)経由で、Azure Spring Appsへの組み込みのazdデプロイメントを備えた、新しいJHipsterアプリケーションの作成もできます。デプロイメントテンプレートの恩恵により、`azd up` という1つの簡単なコマンドでデプロイできるオープンソースのツールキット Azure Development CLI を活用します。
 
+<<<<<<< HEAD
 <div class="thumbnail no-margin-bottom">
     <div class="video-container">
         <iframe width="420" height="315" src="https://www.youtube.com/embed/AmxPv_5Bs_k?si=HeDmf113Uld0bCbS&amp;start=33" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
@@ -42,3 +50,8 @@ NubesGenを使用してJHipsterアプリケーションをデプロイするに
         <p>2023年9月26日 公開</p>
     </div>
 </div>
+=======
+You can also create a new JHipster application with built-in azd deployment to Azure Containers Apps via [start.jhipster.tech/generate-azure-application](https://start.jhipster.tech/generate-azure-application). This will leverage the [Azure Development CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/?WT.mc_id=java-0000-sakriema), an open-source toolkit that benefits from deployment templates and lets you deploy with one simple command: 'azd up'.
+
+Published on 21 Nov. 2024
+>>>>>>> upstream/main

docs/releases/2024-12-23-jhipster-release-8.8.0.mdx

@@ -0,0 +1,106 @@
+---
+title: Release 8.8.0
+slug: /2024/12/23/jhipster-release-8.8.0.html
+displayed_sidebar: docsSidebar
+sidebar_class_name: hidden
+---
+
+# JHipster release v8.8.0
+
+This is a minor release for JHipster v8.
+
+It includes [535 closed issues and pull requests on the main branch](https://github.com/jhipster/generator-jhipster/issues?q=is:closed+milestone:8.8.0) after the [8.7.3 release](/2024/11/01/jhipster-release-8.7.3.html).
+
+## What's new?
+
+* Upgrade to Spring Boot 3.4 ([#27963](https://github.com/jhipster/generator-jhipster/pull/27963) and [#28249](https://github.com/jhipster/generator-jhipster/pull/28249))
+* Fix Couchbase for Spring Boot 3 ([#27972](https://github.com/jhipster/generator-jhipster/pull/27972))
+* Upgrade to Gradle 8.12 ([#28259](https://github.com/jhipster/generator-jhipster/pull/28259))
+* Upgrade to Angular 19 ([#28114](https://github.com/jhipster/generator-jhipster/pull/28114))
+* Add experimental esbuild support for Angular ([#28003](https://github.com/jhipster/generator-jhipster/pull/28003))
+* Upgrade to React Router 7 ([#27985](https://github.com/jhipster/generator-jhipster/pull/27985))
+* Upgrade to Node 22.12.0 ([#28080](https://github.com/jhipster/generator-jhipster/pull/28080))
+* Fix language prompts ([#28035](https://github.com/jhipster/generator-jhipster/pull/28035))
+* Improve CSRF Token Handling for SPA ([#27908](https://github.com/jhipster/generator-jhipster/pull/27908))
+* Add blueprint support to testing helpers ([#27768](https://github.com/jhipster/generator-jhipster/pull/27768))
+* Use generics in Angular generator ([#27550](https://github.com/jhipster/generator-jhipster/pull/27550))
+* Upgrade to TypeScript 5.7.2 ([#28213](https://github.com/jhipster/generator-jhipster/pull/28213))
+
+## Closed tickets and merged pull requests
+
+See the [8.8.0 release notes on GitHub](https://github.com/jhipster/generator-jhipster/releases/tag/v8.8.0) for more details.
+
+As always, **[you can view all closed tickets and merged pull requests](https://github.com/jhipster/generator-jhipster/issues?q=is:closed+milestone:8.8.0)**.
+
+## How to install
+
+To install JHipster v8.8.0:
+
+```
+npm install -g generator-jhipster@8.8.0
+```
+
+It is also available using the JHipster Docker image, as it is automatically built from our source code.
+
+- [JHipster Online](https://start.jhipster.tech)
+- [JHipster Devbox](https://github.com/jhipster/jhipster-devbox)
+
+## How to upgrade
+
+**Automatic upgrade**
+
+For an automatic upgrade, use the [JHipster upgrade sub-generator](/upgrading-an-application/) on an existing application:
+
+Upgrade your version of JHipster:
+
+```
+npm update -g generator-jhipster
+```
+
+And then run the upgrade sub-generator:
+
+```
+jhipster upgrade
+```
+
+You can also use the [migrate blueprint](https://github.com/jhipster/generator-jhipster-migrate) for more advanced upgrade features.
+
+```
+npm i -g generator-jhipster-migrate
+jhipster-migrate
+```
+
+**Manual upgrades**
+
+For a manual upgrade, first upgrade your version of JHipster with:
+
+```
+npm update -g generator-jhipster
+```
+
+If you have an existing project, it will still use the JHipster version with which it was generated.
+To upgrade your project, you must first delete its `node_modules` folder and then run:
+
+```
+jhipster
+```
+
+Since JHipster 8.0, this command will update your project and all its entities.
+
+You can also update your entities one-by-one by running again the entity sub-generator, for example if your entity is named _Foo_, use:
+
+```
+jhipster entity Foo --single-entity
+```
+
+## Help and bugs
+
+If you find any issue with this release, don't hesitate to:
+
+- Add a bug to our [bug tracker](https://github.com/jhipster/generator-jhipster/issues?state=open)
+- Post a question on [Stack Overflow](http://stackoverflow.com/tags/jhipster/info)
+- Create a new discussion on [GitHub](https://github.com/jhipster/generator-jhipster/discussions)
+
+If the issue you have is an urgent bug or security issue, please:
+
+- Contact [@jhipster](https://twitter.com/jhipster) on Twitter

docusaurus.config.ts

@@ -40,13 +40,22 @@ const config: Config = {
   // useful metadata like html lang. For example, if your site is Chinese, you
   // may want to replace "en" with "zh-Hans".
   i18n: {
+<<<<<<< HEAD
     defaultLocale: 'ja',
     locales: ['ja', 'en'],
+=======
+    defaultLocale: 'en',
+    locales: ['en', 'jp'],
+>>>>>>> upstream/main
     localeConfigs: {
       en: {
         label: 'English',
       },
+<<<<<<< HEAD
       ja: {
+=======
+      jp: {
+>>>>>>> upstream/main
         label: '日本語',        
       },
     },