Skip to content

Commit f1c1363

Browse files
authored
Merge pull request #248013 from moarychan/moary/fix/minor-bugs
Fix minor bugs
2 parents 4fa900f + 4b20d51 commit f1c1363

12 files changed

+27
-32
lines changed

articles/spring-apps/includes/quickstart-deploy-web-app/deploy-consumption-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Use the following steps to clone and run the app locally.
3434
3. Use the following command to run the sample application:
3535

3636
```bash
37-
java -jar web/target/simple-todo-web-0.0.1-SNAPSHOT.jar
37+
java -jar web/target/simple-todo-web-0.0.2-SNAPSHOT.jar
3838
```
3939

4040
4. Go to `http://localhost:8080` in your browser to access the application.

articles/spring-apps/includes/quickstart-deploy-web-app/deploy-enterprise-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Use the following steps to clone and run the app locally.
3434
3. Use the following command to run the sample application by using Maven:
3535

3636
```bash
37-
java -jar web/target/simple-todo-web-0.0.1-SNAPSHOT.jar
37+
java -jar web/target/simple-todo-web-0.0.2-SNAPSHOT.jar
3838
```
3939

4040
4. Go to `http://localhost:8080` in your browser to access the application.

articles/spring-apps/includes/quickstart-deploy-web-app/deploy-standard-plan.md

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Although you use the Azure portal in later steps, you must use the Bash command
3737
1. Use the following command to run the sample application by using Maven:
3838

3939
```bash
40-
java -jar web/target/simple-todo-web-0.0.1-SNAPSHOT.jar
40+
java -jar web/target/simple-todo-web-0.0.2-SNAPSHOT.jar
4141
```
4242

4343
1. Go to `http://localhost:8080` in your browser to access the application.
@@ -165,6 +165,12 @@ Use the following steps to connect your service instances:
165165
azd auth login
166166
```
167167

168+
1. Use the following command to enable the Azure Spring Apps feature:
169+
170+
```bash
171+
azd config set alpha.springapp on
172+
```
173+
168174
1. Run the following command to provision the template's infrastructure to Azure:
169175

170176
```bash
@@ -176,28 +182,6 @@ Use the following steps to connect your service instances:
176182
- **Please select an Azure Subscription to use**: Use arrows to move, type to filter, then press <kbd>ENTER</kbd>.
177183
- **Please select an Azure location to use**: Use arrows to move, type to filter, then press <kbd>ENTER</kbd>.
178184

179-
> [!NOTE]
180-
> You can use this template only with the following Azure locations:
181-
>
182-
> - Australia East
183-
> - Brazil South
184-
> - Canada Central
185-
> - Central US
186-
> - East Asia
187-
> - East US
188-
> - East US 2
189-
> - Germany West Central
190-
> - Japan East
191-
> - Korea Central
192-
> - North Central US
193-
> - North Europe
194-
> - South Central US
195-
> - UK South
196-
> - West Europe
197-
> - West US
198-
>
199-
> If you attempt to use the template with an unsupported region, the provision step fails.
200-
201185
---
202186

203187
## 4. Deploy the app to Azure Spring Apps

articles/spring-apps/includes/quickstart/deploy-app-with-enterprise-plan.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,13 @@ Use the following steps to build and deploy your app:
195195
1. Accept the name for the app in the **Name** field. **Name** refers to the configuration, not the app name. You don't usually need to change it.
196196
1. In the **Artifact** textbox, select **Maven:demo(Java 17)**.
197197
1. In the **Subscription** textbox, verify that your subscription is correct.
198-
1. In the **Spring Apps** textbox, select the instance of Azure Spring Apps that you created in the [Create an Azure Spring Apps instance](#32-create-an-azure-spring-apps-instance) section.
198+
1. In the **Spring Apps** textbox, select the instance of Azure Spring Apps that you created.
199199
1. In the **App** textbox, select the plus sign (**+**) to create a new app.
200200

201201
:::image type="content" source="../../media/quickstart/intellij-create-new-app.png" alt-text="Screenshot of the IntelliJ IDEA that shows the Deploy Azure Spring Apps dialog box." lightbox="../../media/quickstart/intellij-create-new-app.png":::
202202

203203
1. In the **App name:** textbox under **App Basics**, enter *demo*, and then select **More settings**.
204-
1. Select the **Enable** button next to **Public endpoint**. The button changes to **Disable \<to be enabled\>**.
205-
1. Select **OK**.
204+
1. Select the **Enable** button next to **Public endpoint**. The button changes to **Disable \<to be enabled\>**. Then, select **OK**.
206205

207206
:::image type="content" source="../../media/quickstart/intellij-more-settings.png" alt-text="Screenshot of IntelliJ IDEA Create app dialog box with public endpoint Disable button highlighted." lightbox="../../media/quickstart/intellij-more-settings.png":::
208207

@@ -214,9 +213,9 @@ Use the following steps to build and deploy your app:
214213

215214
:::image type="content" source="../../media/quickstart/intellij-maven-goal-command-line.png" alt-text="Screenshot of IntelliJ IDEA Select Maven Goal dialog box with Command Line value highlighted." lightbox="../../media/quickstart/intellij-maven-goal-command-line.png":::
216215

217-
1. To start the deployment, select the **Run** button at the bottom of the **Deploy to Azure** dialog box. The plug-in runs the command `mvn package -DskipTests` on the `demo` app and deploys the *.jar* file generated by the `package` command.
216+
1. To start the deployment, select the **Run** button at the bottom of the **Deploy to Azure** dialog box. The plug-in runs the Maven command `package -DskipTests` on the `demo` app and deploys the *.jar* file generated by the `package` command.
218217

219-
Deploying the application can take a few minutes.
218+
Deploying the application can take a few minutes, the public URL of the application can be seen in the output console log.
220219

221220
## [Visual Studio Code](#tab/visual-studio-code)
222221

articles/spring-apps/includes/quickstart/deploy-app-with-standard-consumption-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Azure Spring Apps creates an empty welcome application and provides its URL in t
161161

162162
:::image type="content" source="../../media/quickstart/app-welcome-page.png" alt-text="Screenshot of the welcome page for a Spring app in an Azure Spring Apps instance." lightbox="../../media/quickstart/app-welcome-page.png":::
163163

164-
### 3.5.2. Create an app with dedicated workload profile
164+
### 3.5.2. (Optional) Create an app with dedicated workload profile
165165

166166
Dedicated workload profiles support running apps with customized hardware and increased cost predictability.
167167

articles/spring-apps/includes/quickstart/generate-spring-project.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,15 @@ Use the following steps to create the project:
3939
}
4040
}
4141
```
42+
43+
1. Use the following [Maven](https://maven.apache.org/what-is-maven.html) command to build the project:
44+
45+
```azurecli-interactive
46+
./mvnw clean package
47+
```
48+
49+
1. Run the sample project locally by using the following command:
50+
51+
```azurecli-interactive
52+
./mvnw spring-boot:run
53+
```

articles/spring-apps/includes/quickstart/prepare-spring-project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ Use the following steps to prepare the project:
3636

3737
1. Run the sample project locally by using the following command:
3838

39-
```bash
39+
```azurecli-interactive
4040
./mvnw spring-boot:run
4141
```
4.74 KB
Loading
50.7 KB
Loading
2.53 KB
Loading

0 commit comments

Comments
 (0)