BAEL-5246: pom cleanup (#4620)
* BAEL-5246: round 1 of pom cleanup - upto "jersey" project * BAEL-5246: Initial pass for pom cleanup - upto spring-cloud * BAEL-5246: pom cleanup upto testing-modules/junit5 * BAEL-5246: pom cleanup - upto xstream * BAEL-5246: pom cleanup - last round (before review)
This commit is contained in:
committed by
Grzegorz Piwowarek
parent
0ec8fffeed
commit
cddf858c05
@@ -1,8 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<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">
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>azure</artifactId>
|
||||
<version>0.1</version>
|
||||
@@ -17,11 +16,6 @@
|
||||
<relativePath>../parent-boot-2</relativePath>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<azure.containerRegistry>baeldungadr</azure.containerRegistry>
|
||||
<docker.image.prefix>${azure.containerRegistry}.azurecr.io</docker.image.prefix>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
@@ -42,12 +36,13 @@
|
||||
<dependency>
|
||||
<groupId>com.h2database</groupId>
|
||||
<artifactId>h2</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>5.1.6</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
@@ -61,7 +56,7 @@
|
||||
<plugin>
|
||||
<groupId>com.spotify</groupId>
|
||||
<artifactId>docker-maven-plugin</artifactId>
|
||||
<version>1.1.0</version>
|
||||
<version>{docker-maven-plugin.version}</version>
|
||||
<configuration>
|
||||
<imageName>${docker.image.prefix}/${project.artifactId}</imageName>
|
||||
<registryUrl>https://${docker.image.prefix}</registryUrl>
|
||||
@@ -79,7 +74,7 @@
|
||||
<plugin>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-webapp-maven-plugin</artifactId>
|
||||
<version>1.1.0</version>
|
||||
<version>${azure-webapp-maven-plugin.version}</version>
|
||||
<configuration>
|
||||
<authentication>
|
||||
<serverId>azure-auth</serverId>
|
||||
@@ -87,45 +82,52 @@
|
||||
<resourceGroup>baeldung-group</resourceGroup>
|
||||
<appName>baeldung-webapp</appName>
|
||||
<appServicePlanName>baeldung-plan</appServicePlanName>
|
||||
<javaVersion>1.8</javaVersion>
|
||||
<!--<javaWebContainer>tomcat 8.5</javaWebContainer>-->
|
||||
<!--<region>japanwest</region>-->
|
||||
<!--<containerSettings>-->
|
||||
<!--<imageName>${docker.image.prefix}/${project.artifactId}</imageName>-->
|
||||
<!--<registryUrl>https://${docker.image.prefix}</registryUrl>-->
|
||||
<!--<serverId>${azure.containerRegistry}</serverId>-->
|
||||
<!--</containerSettings>-->
|
||||
<javaVersion>{java.version}</javaVersion>
|
||||
<!--<javaWebContainer>tomcat 8.5</javaWebContainer> -->
|
||||
<!--<region>japanwest</region> -->
|
||||
<!--<containerSettings> -->
|
||||
<!--<imageName>${docker.image.prefix}/${project.artifactId}</imageName> -->
|
||||
<!--<registryUrl>https://${docker.image.prefix}</registryUrl> -->
|
||||
<!--<serverId>${azure.containerRegistry}</serverId> -->
|
||||
<!--</containerSettings> -->
|
||||
<appSettings>
|
||||
<property>
|
||||
<name>spring.datasource.url</name>
|
||||
<value>jdbc:h2:file:~/test</value>
|
||||
<!--<value>jdbc:mysql://127.0.0.1:55738/localdb</value>-->
|
||||
<!--<value>jdbc:mysql://127.0.0.1:55738/localdb</value> -->
|
||||
</property>
|
||||
<property>
|
||||
<name>spring.datasource.username</name>
|
||||
<value>sa</value>
|
||||
<!--<value>azure</value>-->
|
||||
<!--<value>azure</value> -->
|
||||
</property>
|
||||
<property>
|
||||
<name>spring.datasource.password</name>
|
||||
<value></value>
|
||||
<!--<value>replace-with-your-password</value>-->
|
||||
<!--<value>replace-with-your-password</value> -->
|
||||
</property>
|
||||
</appSettings>
|
||||
<!--<deploymentType>ftp</deploymentType>-->
|
||||
<!--<resources>-->
|
||||
<!--<resource>-->
|
||||
<!--<directory>${project.basedir}/target</directory>-->
|
||||
<!--<targetPath>webapps</targetPath>-->
|
||||
<!--<includes>-->
|
||||
<!--<include>*.war</include>-->
|
||||
<!--</includes>-->
|
||||
<!--</resource>-->
|
||||
<!--</resources>-->
|
||||
<!--<deploymentType>ftp</deploymentType> -->
|
||||
<!--<resources> -->
|
||||
<!--<resource> -->
|
||||
<!--<directory>${project.basedir}/target</directory> -->
|
||||
<!--<targetPath>webapps</targetPath> -->
|
||||
<!--<includes> -->
|
||||
<!--<include>*.war</include> -->
|
||||
<!--</includes> -->
|
||||
<!--</resource> -->
|
||||
<!--</resources> -->
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<properties>
|
||||
<azure.containerRegistry>baeldungadr</azure.containerRegistry>
|
||||
<docker.image.prefix>${azure.containerRegistry}.azurecr.io</docker.image.prefix>
|
||||
<docker-maven-plugin.version>1.1.0</docker-maven-plugin.version>
|
||||
<azure-webapp-maven-plugin.version>1.1.0</azure-webapp-maven-plugin.version>
|
||||
<java.version>1.8</java.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user