Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed escaping of properties for azure-functions-http archetype #21635

Merged
merged 1 commit into from
Nov 23, 2021
Merged

Fixed escaping of properties for azure-functions-http archetype #21635

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions ...sions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
Expand All @@ -24,15 +24,15 @@
<functionAppRegion>${appRegion}</functionAppRegion>
<functionResourceGroup>${resourceGroup}</functionResourceGroup>
<function>${function}</function>
<stagingDirectory>${project.build.directory}/azure-functions/${functionAppName}</stagingDirectory>
<stagingDirectory>\${project.build.directory}/azure-functions/\${functionAppName}</stagingDirectory>
<quarkus.package.type>uber-jar</quarkus.package.type>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>${quarkus.platform.artifact-id}</artifactId>
<version>${quarkus.platform.version}</version>
<groupId>\${quarkus.platform.group-id}</groupId>
<artifactId>\${quarkus.platform.artifact-id}</artifactId>
<version>\${quarkus.platform.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -79,7 +79,7 @@
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus-plugin.version}</version>
<version>\${quarkus-plugin.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -90,15 +90,15 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin.version}</version>
<version>\${compiler-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<version>\${surefire-plugin.version}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home>
<maven.home>\${maven.home}</maven.home>
</systemPropertyVariables>
</configuration>
</plugin>
Expand All @@ -107,11 +107,11 @@
<plugin>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-functions-maven-plugin</artifactId>
<version>${azure.functions.maven.plugin.version}</version>
<version>\${azure.functions.maven.plugin.version}</version>
<configuration>
<resourceGroup>${functionResourceGroup}</resourceGroup>
<appName>${functionAppName}</appName>
<region>${functionAppRegion}</region>
<resourceGroup>\${functionResourceGroup}</resourceGroup>
<appName>\${functionAppName}</appName>
<region>\${functionAppRegion}</region>
<runtime>
<!-- runtime os, could be windows, linux or docker-->
<os>windows</os>
Expand All @@ -132,7 +132,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${resources-plugin.version}</version>
<version>\${resources-plugin.version}</version>
<executions>
<!-- add azure required json files
to Azure staging directory -->
Expand All @@ -144,10 +144,10 @@
</goals>
<configuration>
<overwrite>true</overwrite>
<outputDirectory>${stagingDirectory}</outputDirectory>
<outputDirectory>\${stagingDirectory}</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/azure-config</directory>
<directory>\${project.basedir}/azure-config</directory>
<includes>
<include>host.json</include>
<include>local.settings.json</include>
Expand All @@ -165,10 +165,10 @@
</goals>
<configuration>
<overwrite>true</overwrite>
<outputDirectory>${stagingDirectory}/${function}</outputDirectory>
<outputDirectory>\${stagingDirectory}/\${function}</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/azure-config</directory>
<directory>\${project.basedir}/azure-config</directory>
<filtering>true</filtering>
<includes>
<include>function.json</include>
Expand All @@ -192,8 +192,8 @@
<goal>copy</goal>
</goals>
<configuration>
<sourceFile>${project.build.directory}/${project.artifactId}-${project.version}-runner.jar</sourceFile>
<destinationFile>${stagingDirectory}/${project.artifactId}-${project.version}.jar</destinationFile>
<sourceFile>\${project.build.directory}/\${project.artifactId}-\${project.version}-runner.jar</sourceFile>
<destinationFile>\${stagingDirectory}/\${project.artifactId}-\${project.version}.jar</destinationFile>
</configuration>
</execution>
</executions>
Expand Down