Skip to content

Commit df65bd4

Browse files
mnriemmnriem
authored
Fixes #551 - Fix 'Deploy to a deployment slot' example (#552)
1 parent 79c9c12 commit df65bd4

File tree

4 files changed

+35
-39
lines changed

4 files changed

+35
-39
lines changed

‎appservice/create-plan/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ using the command line below:
2626

2727
<!-- workflow.skip() -->
2828
```shell
29-
export APPSERVICE_PLAN=joaz-asp
29+
export APPSERVICE_PLAN=joazasp
3030
```
3131

3232
<!-- workflow.run()
3333
3434
if [[ -z $APPSERVICE_PLAN ]]; then
35-
export APPSERVICE_PLAN=joaz-asp-$RANDOM
35+
export APPSERVICE_PLAN=joazasp-$RANDOM
3636
fi
3737
3838
-->

‎appservice/deploy-to-deployment-slot/pom.xml‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@
22

33
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<groupId>examples.azure.appservice</groupId>
7-
<artifactId>project</artifactId>
8-
<version>1-SNAPSHOT</version>
9-
</parent>
5+
<groupId>examples.azure.appservice</groupId>
106
<artifactId>appservice-deploy-to-deployment-slot</artifactId>
7+
<version>1-SNAPSHOT</version>
118
<packaging>war</packaging>
12-
<name>Azure App Service :: Deploy to a deployment slot</name>
9+
<name>Deploy to a deployment slot</name>
1310
<build>
1411
<plugins>
1512
<plugin>
1613
<groupId>com.microsoft.azure</groupId>
1714
<artifactId>azure-webapp-maven-plugin</artifactId>
15+
<version>2.12.0</version>
1816
<configuration>
1917
<schemaVersion>v2</schemaVersion>
2018
<appName>${appName}</appName>
@@ -24,8 +22,8 @@
2422
</deploymentSlot>
2523
<runtime>
2624
<os>linux</os>
27-
<javaVersion>${java.version}</javaVersion>
28-
<webContainer>${webContainer}</webContainer>
25+
<javaVersion>Java 17</javaVersion>
26+
<webContainer>Tomcat 10.0</webContainer>
2927
</runtime>
3028
<deployment>
3129
<resources>
@@ -39,20 +37,20 @@
3937
</deployment>
4038
</configuration>
4139
</plugin>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-war-plugin</artifactId>
43+
<version>3.4.0</version>
44+
<configuration>
45+
<failOnMissingWebXml>false</failOnMissingWebXml>
46+
</configuration>
47+
</plugin>
4248
</plugins>
4349
</build>
44-
<dependencies>
45-
<dependency>
46-
<groupId>javax</groupId>
47-
<artifactId>javaee-web-api</artifactId>
48-
<scope>provided</scope>
49-
</dependency>
50-
</dependencies>
5150
<properties>
52-
<appName>appservice-tomcat-helloworld-${example.postfix}</appName>
53-
<appServicePlan>appservice-plan</appServicePlan>
51+
<appName>helloworld</appName>
52+
<appServicePlan>joazasp</appServicePlan>
5453
<deploymentSlotName>staging</deploymentSlotName>
55-
<webContainer>tomcat 8.5</webContainer>
5654
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5755
</properties>
5856
</project>

‎appservice/tomcat-helloworld/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This example assumes you have previously completed the following examples:
3636
Setup the application name environment variable using the command line below:
3737

3838
```shell
39-
export APPSERVICE_TOMCAT_HELLOWORLD=appservice-tomcat-helloworld-$RANDOM
39+
export APPSERVICE_TOMCAT_HELLOWORLD=joazasp-tomcat-helloworld-$RANDOM
4040
```
4141

4242
To deploy the example use the following Maven command line:

‎appservice/tomcat-helloworld/pom.xml‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,25 @@
22

33
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<groupId>examples.azure.appservice</groupId>
7-
<artifactId>project</artifactId>
8-
<version>1-SNAPSHOT</version>
9-
</parent>
5+
<groupId>examples.azure.appservice</groupId>
106
<artifactId>appservice-tomcat-helloworld</artifactId>
7+
<version>1-SNAPSHOT</version>
118
<packaging>war</packaging>
12-
<name>Azure App Service :: Deploy a web application on a managed Tomcat</name>
9+
<name>Deploy a web application on a managed Tomcat</name>
1310
<build>
1411
<plugins>
1512
<plugin>
1613
<groupId>com.microsoft.azure</groupId>
1714
<artifactId>azure-webapp-maven-plugin</artifactId>
15+
<version>2.12.0</version>
1816
<configuration>
1917
<schemaVersion>v2</schemaVersion>
2018
<appName>${appName}</appName>
2119
<appServicePlanName>${appServicePlan}</appServicePlanName>
2220
<runtime>
2321
<os>linux</os>
24-
<javaVersion>${java.version}</javaVersion>
25-
<webContainer>${webContainer}</webContainer>
22+
<javaVersion>Java 17</javaVersion>
23+
<webContainer>Tomcat 10.0</webContainer>
2624
</runtime>
2725
<deployment>
2826
<resources>
@@ -36,19 +34,19 @@
3634
</deployment>
3735
</configuration>
3836
</plugin>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-war-plugin</artifactId>
40+
<version>3.4.0</version>
41+
<configuration>
42+
<failOnMissingWebXml>false</failOnMissingWebXml>
43+
</configuration>
44+
</plugin>
3945
</plugins>
4046
</build>
41-
<dependencies>
42-
<dependency>
43-
<groupId>javax</groupId>
44-
<artifactId>javaee-web-api</artifactId>
45-
<scope>provided</scope>
46-
</dependency>
47-
</dependencies>
4847
<properties>
49-
<appName>appservice-tomcat-helloworld-${example.postfix}</appName>
50-
<appServicePlan>appservice-plan</appServicePlan>
51-
<webContainer>tomcat 8.5</webContainer>
48+
<appName>helloworld</appName>
49+
<appServicePlan>jaozasp</appServicePlan>
5250
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5351
</properties>
5452
</project>

0 commit comments

Comments
 (0)