Migrate Spring Apps to Azure Container Apps

Author: dingmeng-xue

articles/java/.openpublishing.redirection.java.json

@@ -183,7 +183,11 @@
             "redirect_url": "/azure/developer/java/migration/index"
         },
         {
-            "source_path": "migration/migrate-spring-boot-to-azure-container-apps.md",
+            "source_path": "migration/migrate-spring-boot-to-azure-spring-apps.md",
+            "redirect_url": "/azure/developer/java/migration/index"
+        },
+        {
+            "source_path": "migration/migrate-spring-cloud-to-azure-spring-apps.md",
             "redirect_url": "/azure/developer/java/migration/index"
         },
         {

articles/java/identity/deploy-spring-boot-to-azure-spring-apps.md

@@ -71,5 +71,4 @@ This article assumes that you completed one of the following articles using only
 
 For more information and other deployment options, see the following articles:
 
-- [Quickstart: Deploy your first application to Azure Spring Apps](/azure/spring-apps/enterprise/quickstart?tabs=Azure-portal%2CAzure-portal-maven-plugin-ent%2CConsumption-workload&pivots=sc-enterprise)
-- [Spring Boot to Azure Spring Apps](../migration/migrate-spring-boot-to-azure-spring-apps.md)
+- [Quickstart: Deploy your first application to Azure Spring Apps](/azure/spring-apps/enterprise/quickstart?tabs=Azure-portal%2CAzure-portal-maven-plugin-ent%2CConsumption-workload&pivots=sc-enterprise)

articles/java/index.yml

@@ -99,9 +99,9 @@ conceptualContent:
 
     - title: Migrate to Azure
       links:
-        - text: Spring to Azure Spring Apps
+        - text: Spring to Azure Container Apps
           itemType: how-to-guide
-          url: migration/migrate-spring-boot-to-azure-spring-apps.md
+          url: migration/migrate-spring-boot-to-azure-container-apps.md
         - text: Tomcat to Azure App Service
           itemType: how-to-guide
           url: migration/migrate-tomcat-to-tomcat-app-service.md

articles/java/java-zone-pivot-groups.yml

@@ -1,14 +1,5 @@
 # YamlMime:ZonePivotGroups
 groups:
-# Owner: karler
-- id: spring-cloud-tier-selection
-  title: Azure Spring Apps tier
-  prompt: Select an Azure Spring Apps tier
-  pivots:
-  - id: sc-standard-tier
-    title: Standard tier
-  - id: sc-enterprise-tier
-    title: Enterprise tier
 # Owner: v-yeyonghui
 - id: passwordless-mysql
   title: Azure Database for MySQL use passwordless connection

articles/java/migration/includes/configure-persistent-storage-azure-container-apps.md

@@ -0,0 +1,9 @@
+---
+author: KarlErickson
+ms.author: karler
+ms.date: 4/15/2020
+---
+
+### Configure persistent storage
+
+If any part of your application reads or writes to the local file system, you'll need to configure persistent storage to replace the local file system. You can specify the path to mount in the container through the app settings and align it with the path your app is using. For more information, see [Use storage mounts in Azure Container Apps](/azure/container-apps/storage-mounts).

articles/java/migration/includes/configure-persistent-storage-azure-spring-apps.md

@@ -0,0 +1,19 @@
+---
+author: KarlErickson
+ms.author: karler
+ms.date: 5/26/2020
+---
+
+#### Determine whether and how the file system is used
+
+Find any instances where your services write to and/or read from the local file system. Identify where short-term/temporary files are written and read and where long-lived files are written and read.
+
+Azure Container Apps offer several types of storage. Ephemeral storage can read and write temporary data and be available to a running container or replica. Azure File provides permanent storage and can be shared across multiple containers. For more information, see [Use storage mounts in Azure Container Apps](/azure/container-apps/storage-mounts)
+
+##### Read-only static content
+
+If your application currently serves static content, you need an alternate location for it. You may wish to consider moving static content to Azure Blob Storage and adding Azure CDN for lightning-fast downloads globally. For more information, see [Static website hosting in Azure Storage](/azure/storage/blobs/storage-blob-static-website) and [Quickstart: Integrate an Azure storage account with Azure CDN](/azure/cdn/cdn-create-a-storage-account-with-cdn).
+
+##### Dynamically published static content
+
+If your application supports static content, whether uploaded or generated by the application itself, that remains unchanged after its creation, you can integrate Azure Blob Storage and Azure CDN. Additionally, you can use an Azure Function to manage uploads and trigger CDN refreshes when necessary. We've provided a sample implementation for your use at [Uploading and CDN-preloading static content with Azure Functions](https://github.com/Azure-Samples/functions-java-push-static-contents-to-cdn).

articles/java/migration/includes/determine-whether-and-how-the-file-system-is-used-azure-container-apps.md

@@ -4,4 +4,4 @@ ms.author: edburns
 ms.date: 1/21/2020
 ---
 
-If your application contains any code with dependencies on the host OS, then you'll need to refactor it to remove those dependencies. For example, you may need to replace any use of `/` or `\` in file system paths with [`File.Separator`](https://docs.oracle.com/javase/8/docs/api/java/io/File.html#separator) or [`Paths.get`](https://docs.oracle.com/javase/8/docs/api/java/nio/file/Paths.html#get-java.lang.String-java.lang.String...-).
+If your application contains any code with dependencies on the host OS, then you need to refactor it to remove those dependencies. For example, you may need to replace any use of `/` or `\` in file system paths with [`File.Separator`](https://docs.oracle.com/javase/8/docs/api/java/io/File.html#separator) or [`Paths.get`](https://docs.oracle.com/javase/8/docs/api/java/nio/file/Paths.html#get-java.lang.String-java.lang.String...-) if your application is running on Windows.

articles/java/migration/includes/determine-whether-and-how-the-file-system-is-used-azure-spring-apps.md

@@ -0,0 +1,11 @@
+---
+author: KarlErickson
+ms.author: karler
+ms.date: 7/21/2020
+---
+
+#### Determine whether your application relies on scheduled jobs
+
+Ephemeral application such as Unix cron jobs or short-live applications based on Spring Batch framework should run as a job on Azure Container Apps. For details, see [Jobs in Azure Container Apps](/azure/container-apps/jobs). If your application is a long-running application and executes tasks regularly using a scheduling framework such as Quartz or Spring Batch, Azure Container Apps can host that application. However, the application must handle scaling appropriately to avoid race conditions where the same application instances are executed more than once per scheduled period during scale-out or rolling upgrade.
+
+Inventory any scheduled tasks running on the production servers, inside or outside your application code.

articles/java/migration/includes/determine-whether-your-application-contains-os-specific-code-no-title.md

@@ -0,0 +1,11 @@
+---
+author: KarlErickson
+ms.author: karler
+ms.date: 4/15/2020
+---
+
+### Ensure console logging and configure diagnostic settings
+
+Configure your logging to ensure that all output is routed to the console rather than to files.
+
+Once an application is deployed to Azure Container Apps, you can configure the logging options within your Container Apps environment to define one or more destinations of the logs. These destinations can include Azure Monitor Log Analytics, Azure Event hub, or even other third-party monitoring solutions. Additionally, you have the option to disable log data and view logs only at runtime. For detailed configuration instruction, see [Log storage and monitoring options in Azure Container Apps](/azure/container-apps/log-options).

articles/java/migration/includes/determine-whether-your-application-relies-on-scheduled-jobs-azure-container-apps.md

@@ -22,7 +22,7 @@ Spring Boot applications using commercial brokers typically contain dependencies
 ```json
     dependencies {
       ...
-      compile("com.ibm.mq:com.ibm.mq.allclient:9.0.4.0")
+      compile("com.ibm.mq:com.ibm.mq.allclient:9.4.0.5")
       ...
     }
 ```

articles/java/migration/includes/determine-whether-your-application-relies-on-scheduled-jobs-azure-spring-apps.md

@@ -11,13 +11,14 @@ On PaaS environments, no application is guaranteed to be running exactly once at
 * The application must be relocated to a physical host due to failure or system update.
 * The application is being updated.
 
-In any of these cases, the original instance will remain running until the new instance has finished starting up. This has the following potentially significant implications for your application:
+In any of these cases, the original instance remains running until the new instance has finished starting up. This pattern can have the following potentially significant implications for your application:
 
 * No [singleton](https://en.wikipedia.org/wiki/Singleton_pattern) can be guaranteed to be truly single.
-* Any data that has not been persisted to outside storage will likely be lost far sooner than it would on a single physical server or VM.
+* Any data not persisted to outside storage will likely be lost sooner than it would be on a single physical server or VM.
 
-Before migrating to Azure Spring Apps, ensure that your code does not contain local state that must not be lost or duplicated. If local state exists, change the code to store that state outside the application. Cloud-ready applications typically store application state in locations such as the following:
+Before migrating to Azure Container Apps, ensure that your code doesn't contain local state that must not be lost or duplicated. If local state exists, change the code to store that state outside the application. Cloud-ready applications typically store application state in locations such as the following options:
 
 * [Azure Cache for Redis](/azure/azure-cache-for-redis/cache-java-get-started)
 * [Azure Cosmos DB](/azure/cosmos-db/create-sql-api-java)
 * Another external database, such as [Azure SQL](/azure/azure-sql/azure-sql-iaas-vs-paas-what-is-overview), [Azure Database for MySQL](/azure/mysql/overview), or [Azure Database for PostgreSQL](/azure/postgresql/overview).
+* [Azure Storage](/azure/storage/blobs), used for storing unstructured data or even serialized objects.

articles/java/migration/includes/ensure-console-logging-and-configure-diagnostic-settings-azure-container-apps.md

@@ -0,0 +1,13 @@
+---
+author: KarlErickson
+ms.author: karler
+ms.date: 4/15/2020
+---
+
+#### Identify log aggregation solutions
+
+Identify any log aggregation solutions in use by the applications you're migrating. You need to configure diagnostic settings in migration to make logged events available for consumption. For more information, see [Ensure console logging and configure diagnostic settings](#ensure-console-logging-and-configure-diagnostic-settings) section.
+
+#### Identify application performance management (APM) agents
+
+Identify any application performance management agents used by your applications. Azure Containers Apps doesn't offer built-in support for APM integration. You need to prepare your container image or integrate APM tool directly into your code. If the application doesn't use a supported APM, consider using Application Insights. For more information, see the [Migration](#configure-application-performance-management-apm-integrations) section.

articles/java/migration/includes/ensure-console-logging-and-configure-diagnostic-settings-azure-spring-apps.md

@@ -16,7 +16,7 @@ In Maven projects, the Spring Boot version is typically found in the `<parent>`
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.10</version>
+        <version>3.3.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 ```
@@ -27,8 +27,8 @@ In Gradle projects, the Spring Boot version will typically be found in the `plug
 
 ```gradle
 plugins {
-  id 'org.springframework.boot' version '2.7.10'
-  id 'io.spring.dependency-management' version '1.0.15.RELEASE'
+  id 'org.springframework.boot' version '3.3.3'
+  id 'io.spring.dependency-management' version '1.1.6'
   id 'java'
 }
 ```

articles/java/migration/includes/identify-external-caches-azure-spring-apps.md renamed to articles/java/migration/includes/identify-external-caches-azure-container-apps.md

@@ -8,7 +8,7 @@ ms.date: 09/09/2024
 
 #### Inventory passwords and secure strings
 
-Check all properties and configuration files and all environment variables on the production deployment(s) for any secret strings and passwords. In a Spring Cloud application, you can typically find such strings in the *application.properties* or *application.yml* file in individual services or in the Spring Cloud Config repository.
+Check all properties and configuration files and all environment variables on the production deployments for any secret strings and passwords. In a Spring Cloud application, you can typically find such strings in the *application.properties* or *application.yml* file in individual services or in the Spring Cloud Config repository.
 
 [!INCLUDE [inventory-certificates-h4](inventory-certificates-h4.md)]
 
@@ -18,13 +18,11 @@ If you use Spring Cloud Vault to store and access secrets, identify the backing
 
 #### Locate the configuration server source
 
-If your application uses a [Spring Cloud Config server](https://docs.spring.io/spring-cloud-config/docs/current/reference/html/#_spring_cloud_config_server), identify where the configuration is stored. You'll typically find this setting in the *bootstrap.yml* or *bootstrap.properties* file, or sometimes in the *application.yml* or *application.properties* file. The setting will look like the following example:
+If your application uses a [Spring Cloud Config server](https://docs.spring.io/spring-cloud-config/docs/current/reference/html/#_spring_cloud_config_server), identify where the configuration is stored. You typically find this setting in the *bootstrap.yml* or *bootstrap.properties* file, or sometimes in the *application.yml* or *application.properties* file. The setting looks like the following example:
 
 ```properties
 spring.cloud.config.server.git.uri: file://${user.home}/spring-cloud-config-repo
 ```
 
 While git is most commonly used as Spring Cloud Config's backing datastore, as shown earlier, one of the other possible backends may be in use. Consult the [Spring Cloud Config documentation](https://docs.spring.io/spring-cloud-config/docs/current/reference/html/#_environment_repository) for information on other backends, such as [Relational Database (JDBC)](https://docs.spring.io/spring-cloud-config/docs/current/reference/html/#_jdbc_backend), [SVN](https://docs.spring.io/spring-cloud-config/docs/current/reference/html/#_version_control_backend_filesystem_use), and [the local file system](https://docs.spring.io/spring-cloud-config/docs/current/reference/html/#_file_system_backend).
 
-> [!NOTE]
-> If your configuration server data is stored on premises, such as GitHub Enterprise, you'll need to make it available to Azure Spring Apps via a Git repository.

articles/java/migration/includes/identify-jms-brokers-in-spring.md

@@ -6,11 +6,7 @@ ms.date: 2/12/2020
 
 #### Databases
 
-For any SQL database, identify the connection string.
-
-For a Spring Boot application, connection strings typically appear in configuration files. 
-
-Here's an example from an *application.properties* file:
+For a Spring Boot application, connection strings typically appear in configuration files when it depends on an external database.  Here's an example from an *application.properties* file:
 
 ```properties
 spring.datasource.url=jdbc:mysql://localhost:3306/mysql_db