Skip to content

Commit 6b75bb1

Browse files
pragnagopapragnagopa
authored
Update library (#237)
* Update library
1 parent 0de01b9 commit 6b75bb1

File tree

3 files changed

+162
-166
lines changed

3 files changed

+162
-166
lines changed

‎endtoendtests/pom.xml‎

Lines changed: 155 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -1,166 +1,167 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
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">
4-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
56

6-
<groupId>com.microsoft.azure.functions.endtoendtests</groupId>
7-
<artifactId>azure-functions-java-endtoendtests</artifactId>
8-
<version>1.0-SNAPSHOT</version>
9-
<packaging>jar</packaging>
7+
<groupId>com.microsoft.azure.functions.endtoendtests</groupId>
8+
<artifactId>azure-functions-java-endtoendtests</artifactId>
9+
<version>1.0-SNAPSHOT</version>
10+
<packaging>jar</packaging>
1011

11-
<name>Azure Java Functions E2E Tests</name>
12+
<name>Azure Java Functions E2E Tests</name>
1213

13-
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<maven.compiler.source>1.8</maven.compiler.source>
16-
<maven.compiler.target>1.8</maven.compiler.target>
17-
<azure.functions.maven.plugin.version>1.2.0-SNAPSHOT</azure.functions.maven.plugin.version>
18-
<azure.functions.java.library.version>1.0.0-beta-7-SNAPSHOT</azure.functions.java.library.version>
19-
<functionAppName>azure-functions-java-endtoendtests</functionAppName>
20-
<functionAppRegion>westus</functionAppRegion>
21-
<functionResourceGroup>java-functions-group</functionResourceGroup>
22-
<stagingDirectory>${project.build.directory}/azure-functions/${functionAppName}</stagingDirectory>
23-
<allowTelemetry>false</allowTelemetry>
24-
</properties>
14+
<properties>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
<maven.compiler.source>1.8</maven.compiler.source>
17+
<maven.compiler.target>1.8</maven.compiler.target>
18+
<azure.functions.maven.plugin.version>1.2.0-SNAPSHOT</azure.functions.maven.plugin.version>
19+
<azure.functions.java.library.version>1.2.0</azure.functions.java.library.version>
20+
<functionAppName>azure-functions-java-endtoendtests</functionAppName>
21+
<functionAppRegion>westus</functionAppRegion>
22+
<functionResourceGroup>java-functions-group</functionResourceGroup>
23+
<stagingDirectory>${project.build.directory}/azure-functions/${functionAppName}</stagingDirectory>
24+
<allowTelemetry>false</allowTelemetry>
25+
</properties>
2526

26-
<repositories>
27-
<repository>
28-
<id>maven.snapshots</id>
29-
<name>Maven Central Snapshot Repository</name>
30-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
31-
<releases>
32-
<enabled>false</enabled>
33-
</releases>
34-
<snapshots>
35-
<enabled>true</enabled>
36-
</snapshots>
37-
</repository>
38-
</repositories>
27+
<repositories>
28+
<repository>
29+
<id>maven.snapshots</id>
30+
<name>Maven Central Snapshot Repository</name>
31+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
32+
<releases>
33+
<enabled>false</enabled>
34+
</releases>
35+
<snapshots>
36+
<enabled>true</enabled>
37+
</snapshots>
38+
</repository>
39+
</repositories>
3940

40-
<pluginRepositories>
41-
<pluginRepository>
42-
<id>maven.snapshots</id>
43-
<name>Maven Central Snapshot Repository</name>
44-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
45-
<releases>
46-
<enabled>false</enabled>
47-
</releases>
48-
<snapshots>
49-
<enabled>true</enabled>
50-
</snapshots>
51-
</pluginRepository>
52-
</pluginRepositories>
41+
<pluginRepositories>
42+
<pluginRepository>
43+
<id>maven.snapshots</id>
44+
<name>Maven Central Snapshot Repository</name>
45+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
46+
<releases>
47+
<enabled>false</enabled>
48+
</releases>
49+
<snapshots>
50+
<enabled>true</enabled>
51+
</snapshots>
52+
</pluginRepository>
53+
</pluginRepositories>
5354

54-
<dependencyManagement>
55-
<dependencies>
56-
<dependency>
57-
<groupId>com.microsoft.azure.functions</groupId>
58-
<artifactId>azure-functions-java-library</artifactId>
59-
<version>${azure.functions.java.library.version}</version>
60-
</dependency>
61-
</dependencies>
62-
</dependencyManagement>
55+
<dependencyManagement>
56+
<dependencies>
57+
<dependency>
58+
<groupId>com.microsoft.azure.functions</groupId>
59+
<artifactId>azure-functions-java-library</artifactId>
60+
<version>${azure.functions.java.library.version}</version>
61+
</dependency>
62+
</dependencies>
63+
</dependencyManagement>
6364

64-
<dependencies>
65-
<dependency>
66-
<groupId>com.microsoft.azure.functions</groupId>
67-
<artifactId>azure-functions-java-library</artifactId>
68-
</dependency>
69-
</dependencies>
65+
<dependencies>
66+
<dependency>
67+
<groupId>com.microsoft.azure.functions</groupId>
68+
<artifactId>azure-functions-java-library</artifactId>
69+
</dependency>
70+
</dependencies>
7071

71-
<build>
72-
<pluginManagement>
73-
<plugins>
74-
<plugin>
75-
<groupId>com.microsoft.azure</groupId>
76-
<artifactId>azure-functions-maven-plugin</artifactId>
77-
<version>${azure.functions.maven.plugin.version}</version>
78-
</plugin>
79-
<plugin>
80-
<groupId>org.apache.maven.plugins</groupId>
81-
<artifactId>maven-resources-plugin</artifactId>
82-
<version>3.1.0</version>
83-
</plugin>
84-
<plugin>
85-
<groupId>org.apache.maven.plugins</groupId>
86-
<artifactId>maven-dependency-plugin</artifactId>
87-
<version>3.1.1</version>
88-
</plugin>
89-
</plugins>
90-
</pluginManagement>
72+
<build>
73+
<pluginManagement>
74+
<plugins>
75+
<plugin>
76+
<groupId>com.microsoft.azure</groupId>
77+
<artifactId>azure-functions-maven-plugin</artifactId>
78+
<version>${azure.functions.maven.plugin.version}</version>
79+
</plugin>
80+
<plugin>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-resources-plugin</artifactId>
83+
<version>3.1.0</version>
84+
</plugin>
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-dependency-plugin</artifactId>
88+
<version>3.1.1</version>
89+
</plugin>
90+
</plugins>
91+
</pluginManagement>
9192

92-
<plugins>
93-
<plugin>
94-
<groupId>com.microsoft.azure</groupId>
95-
<artifactId>azure-functions-maven-plugin</artifactId>
96-
<configuration>
97-
<resourceGroup>${functionResourceGroup}</resourceGroup>
98-
<appName>${functionAppName}</appName>
99-
<region>${functionAppRegion}</region>
100-
<appSettings>
101-
<property>
102-
<name>FUNCTIONS_EXTENSION_VERSION</name>
103-
<value>beta</value>
104-
</property>
105-
</appSettings>
106-
</configuration>
107-
<executions>
108-
<execution>
109-
<id>package-functions</id>
110-
<goals>
111-
<goal>package</goal>
112-
</goals>
113-
</execution>
114-
</executions>
115-
</plugin>
116-
<plugin>
117-
<groupId>org.apache.maven.plugins</groupId>
118-
<artifactId>maven-resources-plugin</artifactId>
119-
<executions>
120-
<execution>
121-
<id>copy-resources</id>
122-
<phase>package</phase>
123-
<goals>
124-
<goal>copy-resources</goal>
125-
</goals>
126-
<configuration>
127-
<overwrite>true</overwrite>
128-
<outputDirectory>${stagingDirectory}</outputDirectory>
129-
<resources>
130-
<resource>
131-
<directory>${project.basedir}</directory>
132-
<includes>
133-
<include>host.json</include>
134-
<include>local.settings.json</include>
135-
</includes>
136-
</resource>
137-
</resources>
138-
</configuration>
139-
</execution>
140-
</executions>
141-
</plugin>
142-
<plugin>
143-
<groupId>org.apache.maven.plugins</groupId>
144-
<artifactId>maven-dependency-plugin</artifactId>
145-
<executions>
146-
<execution>
147-
<id>copy-dependencies</id>
148-
<phase>prepare-package</phase>
149-
<goals>
150-
<goal>copy-dependencies</goal>
151-
</goals>
152-
<configuration>
153-
<outputDirectory>${stagingDirectory}/lib</outputDirectory>
154-
<overWriteReleases>false</overWriteReleases>
155-
<overWriteSnapshots>false</overWriteSnapshots>
156-
<overWriteIfNewer>true</overWriteIfNewer>
157-
<includeScope>runtime</includeScope>
158-
<excludeArtifactIds>azure-functions-java-library</excludeArtifactIds>
159-
</configuration>
160-
</execution>
161-
</executions>
162-
</plugin>
163-
</plugins>
164-
</build>
93+
<plugins>
94+
<plugin>
95+
<groupId>com.microsoft.azure</groupId>
96+
<artifactId>azure-functions-maven-plugin</artifactId>
97+
<configuration>
98+
<resourceGroup>${functionResourceGroup}</resourceGroup>
99+
<appName>${functionAppName}</appName>
100+
<region>${functionAppRegion}</region>
101+
<appSettings>
102+
<property>
103+
<name>FUNCTIONS_EXTENSION_VERSION</name>
104+
<value>beta</value>
105+
</property>
106+
</appSettings>
107+
</configuration>
108+
<executions>
109+
<execution>
110+
<id>package-functions</id>
111+
<goals>
112+
<goal>package</goal>
113+
</goals>
114+
</execution>
115+
</executions>
116+
</plugin>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-resources-plugin</artifactId>
120+
<executions>
121+
<execution>
122+
<id>copy-resources</id>
123+
<phase>package</phase>
124+
<goals>
125+
<goal>copy-resources</goal>
126+
</goals>
127+
<configuration>
128+
<overwrite>true</overwrite>
129+
<outputDirectory>${stagingDirectory}</outputDirectory>
130+
<resources>
131+
<resource>
132+
<directory>${project.basedir}</directory>
133+
<includes>
134+
<include>host.json</include>
135+
<include>local.settings.json</include>
136+
</includes>
137+
</resource>
138+
</resources>
139+
</configuration>
140+
</execution>
141+
</executions>
142+
</plugin>
143+
<plugin>
144+
<groupId>org.apache.maven.plugins</groupId>
145+
<artifactId>maven-dependency-plugin</artifactId>
146+
<executions>
147+
<execution>
148+
<id>copy-dependencies</id>
149+
<phase>prepare-package</phase>
150+
<goals>
151+
<goal>copy-dependencies</goal>
152+
</goals>
153+
<configuration>
154+
<outputDirectory>${stagingDirectory}/lib</outputDirectory>
155+
<overWriteReleases>false</overWriteReleases>
156+
<overWriteSnapshots>false</overWriteSnapshots>
157+
<overWriteIfNewer>true</overWriteIfNewer>
158+
<includeScope>runtime</includeScope>
159+
<excludeArtifactIds>azure-functions-java-library</excludeArtifactIds>
160+
</configuration>
161+
</execution>
162+
</executions>
163+
</plugin>
164+
</plugins>
165+
</build>
165166

166167
</project>

‎pom.xml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.microsoft.azure.functions</groupId>
66
<artifactId>azure-functions-java-worker</artifactId>
7-
<version>1.2.0-beta01-SNAPSHOT</version>
7+
<version>1.2.0</version>
88
<packaging>jar</packaging>
99
<parent>
1010
<groupId>com.microsoft.maven</groupId>
@@ -13,7 +13,7 @@
1313
</parent>
1414

1515
<name>Azure Functions Java Worker</name>
16-
<description>This package contains the Java runtime environment for Microsoft Azure functions host.</description>
16+
<description>This package contains the Java Language Worker used by Azure functions host to execute java functions</description>
1717
<url>https://azure.microsoft.com/en-us/services/functions</url>
1818
<organization>
1919
<name>Microsoft Azure</name>
@@ -22,7 +22,7 @@
2222

2323
<properties>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25-
<azure.functions.java.library.version>1.0.0-beta-7-SNAPSHOT</azure.functions.java.library.version>
25+
<azure.functions.java.library.version>1.2.0</azure.functions.java.library.version>
2626
</properties>
2727

2828
<licenses>
@@ -40,12 +40,7 @@
4040
<tag>HEAD</tag>
4141
</scm>
4242

43-
<developers>
44-
<developer>
45-
<id>junyi</id>
46-
<name>Junyi Yi</name>
47-
<email>[email protected]</email>
48-
</developer>
43+
<developers>
4944
<developer>
5045
<id>pgopa</id>
5146
<name>Pragna Gopa</name>
@@ -64,7 +59,7 @@
6459
<snapshots>
6560
<enabled>true</enabled>
6661
</snapshots>
67-
</repository>
62+
</repository>
6863
</repositories>
6964

7065
<dependencies>
@@ -102,7 +97,7 @@
10297
<groupId>commons-cli</groupId>
10398
<artifactId>commons-cli</artifactId>
10499
<version>1.4</version>
105-
</dependency>
100+
</dependency>
106101
<dependency>
107102
<groupId>javax.annotation</groupId>
108103
<artifactId>javax.annotation-api</artifactId>

‎tools/AzureFunctionsJavaWorker.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>Microsoft.Azure.Functions.JavaWorker</id>
55
<title>Microsoft Azure Functions Java Worker</title>
66
<tags>java azure-functions azure</tags>
7-
<version>1.2.0-beta01-SNAPSHOT$version$</version>
7+
<version>1.2.0$version$</version>
88
<authors>Microsoft</authors>
99
<owners>Microsoft</owners>
1010
<projectUrl>https://github.com/Azure/azure-functions-java-worker</projectUrl>

0 commit comments

Comments
 (0)