Merge pull request #1789 from microsoft/endgame-september

Release september
microsoft · Sep 30, 2021 · ce76dc3 · ce76dc3
2 parents 7ca4584 + 775ec40
commit ce76dc3
Showing 162 changed files with 5,398 additions and 2,309 deletions.
diff --git a/azure-functions-maven-plugin/CHANGELOG.md b/azure-functions-maven-plugin/CHANGELOG.md
@@ -22,6 +22,11 @@ All notable changes to the "Maven Plugin for Azure Function" will be documented
   - [1.2.1](#121)
   - [1.2.0](#120)
 
+## 1.14.0
+- Support default value for region/pricing tier/javaVersion [#1755](https://github.com/microsoft/azure-maven-plugins/pull/1761)
+- Support username and password in proxy [#1677](https://github.com/microsoft/azure-maven-plugins/pull/1677)
+- Fix warning message of `illegal reflective access from groovy` [#1763](https://github.com/microsoft/azure-maven-plugins/pull/1763)
+
 ## 1.13.0
 - Support skip function extensions installation [#1616](https://github.com/microsoft/azure-maven-plugins/issues/1616) (Thanks @sschmeck)
 

diff --git a/azure-functions-maven-plugin/pom.xml b/azure-functions-maven-plugin/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-maven-plugins</artifactId>
-        <version>1.14.0-SNAPSHOT</version>
+        <version>1.14.0</version>
     </parent>
 
     <artifactId>azure-functions-maven-plugin</artifactId>
-    <version>1.14.0-SNAPSHOT</version>
+    <version>1.14.0</version>
     <packaging>maven-plugin</packaging>
     <name>Maven Plugin for Azure Functions</name>
     <description>Maven Plugin for Azure Functions</description>
@@ -52,22 +52,17 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>io.projectreactor.netty</groupId>
+            <artifactId>reactor-netty</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>logging-interceptor</artifactId>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-core-http-netty</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp-urlconnection</artifactId>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
@@ -173,6 +168,12 @@
             <artifactId>azure-eventhubs-eph</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure</artifactId>
+            <version>1.41.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jacoco</groupId>
             <artifactId>org.jacoco.agent</artifactId>
@@ -275,6 +276,56 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <!-- https://mvnrepository.com/artifact/org.codehaus.mojo/aspectj-maven-plugin -->
+                <!-- http://www.quabr.com/62976155/aspectj-maven-plugin-1-11-missing-tools-jar-issue-with-jdk-11 -->
+                <groupId>com.nickwongdev</groupId>
+                <artifactId>aspectj-maven-plugin</artifactId>
+                <configuration>
+                    <showWeaveInfo>false</showWeaveInfo>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <Xlint>ignore</Xlint>
+                    <complianceLevel>1.8</complianceLevel>
+                    <encoding>UTF-8</encoding>
+                    <verbose>false</verbose>
+                    <outxml>true</outxml>
+                    <forceAjcCompile>true</forceAjcCompile>
+                    <sources/><!-- this is important!-->
+                    <aspectLibraries>
+                        <aspectLibrary>
+                            <groupId>com.microsoft.azure</groupId>
+                            <artifactId>azure-toolkit-common-lib</artifactId>
+                        </aspectLibrary>
+                    </aspectLibraries>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>compile-with-aspectj</id>
+                        <phase>process-classes</phase>
+                        <configuration>
+                            <weaveDirectories>
+                                <weaveDirectory>${project.build.directory}/classes</weaveDirectory>
+                            </weaveDirectories>
+                        </configuration>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-compile-with-aspectj</id>
+                        <phase>process-test-classes</phase>
+                        <configuration>
+                            <weaveDirectories>
+                                <weaveDirectory>${project.build.directory}/test-classes</weaveDirectory>
+                            </weaveDirectories>
+                        </configuration>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
@@ -304,7 +355,6 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>

diff --git a/azure-functions-maven-plugin/src/it/3-eventhub-trigger/cleanup.groovy b/azure-functions-maven-plugin/src/it/3-eventhub-trigger/cleanup.groovy
diff --git a/azure-functions-maven-plugin/src/it/3-eventhub-trigger/pom.xml b/azure-functions-maven-plugin/src/it/3-eventhub-trigger/pom.xml
diff --git a/azure-functions-maven-plugin/src/it/3-eventhub-trigger/setup.groovy b/azure-functions-maven-plugin/src/it/3-eventhub-trigger/setup.groovy
diff --git a/...ugin/src/it/3-eventhub-trigger/src/main/java/com/microsoft/azure/EventHubTriggerJava.java b/...ugin/src/it/3-eventhub-trigger/src/main/java/com/microsoft/azure/EventHubTriggerJava.java
diff --git a/...s-maven-plugin/src/main/java/com/microsoft/azure/maven/function/AbstractFunctionMojo.java b/...s-maven-plugin/src/main/java/com/microsoft/azure/maven/function/AbstractFunctionMojo.java
@@ -6,9 +6,9 @@
 package com.microsoft.azure.maven.function;
 
 import com.microsoft.azure.maven.AbstractAppServiceMojo;
-import com.microsoft.azure.toolkit.lib.appservice.service.IFunctionApp;
 import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import com.microsoft.azure.toolkit.lib.legacy.function.configurations.RuntimeConfiguration;
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugins.annotations.Parameter;
 
@@ -44,6 +44,7 @@ public abstract class AbstractFunctionMojo extends AbstractAppServiceMojo {
      *     <li>P3V2</li>
      * </ul>
      */
+    @Getter
     @Parameter(property = "functions.pricingTier")
     protected String pricingTier;
 
@@ -64,7 +65,7 @@ public abstract class AbstractFunctionMojo extends AbstractAppServiceMojo {
     /**
      * App Service region, which will only be used to create App Service at the first time.
      */
-    @Parameter(property = "functions.region", defaultValue = "westeurope")
+    @Parameter(property = "functions.region")
     protected String region;
 
     @Parameter(property = "functions.runtime")
@@ -79,6 +80,9 @@ public abstract class AbstractFunctionMojo extends AbstractAppServiceMojo {
     @Parameter(property = "functions.disableAppInsights", defaultValue = "false")
     protected boolean disableAppInsights;
 
+    @Getter
+    protected ConfigParser parser = new ConfigParser(this);
+
     //endregion
 
     //region Getter
@@ -108,10 +112,6 @@ public boolean isDisableAppInsights() {
         return disableAppInsights;
     }
 
-    public IFunctionApp getFunctionApp() {
-        return getOrCreateAzureAppServiceClient().functionApp(getResourceGroup(), getAppName());
-    }
-
     public RuntimeConfiguration getRuntimeConfiguration() {
         return runtime;
     }