Skip to content

Commit 04e084a

Browse files
authored
Merge branch 'dev' into dependabot/maven/org.apache.commons-commons-lang3-3.18.0
2 parents b4092ab + 15ba13d commit 04e084a

11 files changed

Lines changed: 70 additions & 6972 deletions

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,3 +278,6 @@ pkg/
278278
local.settings.json
279279
bin/
280280
obj/
281+
282+
# Certificate files (downloaded dynamically)
283+
confluent_cloud_cacert.pem

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# AZURE FUNCTIONS TEAM
1010
# For all file changes, github would automatically include the following people in the PRs.
1111
#
12-
* @vrdmr @gavin-aguiar @hallvictoria @ahmedmuhsin @swapnil-nagar
12+
* @vrdmr @gavin-aguiar @hallvictoria @ahmedmuhsin @swapnil-nagar @TsuyoshiUshio

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![Azure Functions Logo](https://raw.githubusercontent.com/Azure/azure-functions-cli/master/src/Azure.Functions.Cli/npm/assets/azure-functions-logo-color-raster.png)
1+
![Azure Functions Logo](https://raw.githubusercontent.com/Azure/azure-functions-cli/refs/heads/main/eng/res/functions.png)
22

33
|Branch|Status|
44
|---|---|
@@ -145,4 +145,3 @@ All Java types are represented by `Type` interface, which may be one of the foll
145145

146146
For the generic type behaviors (including compile-time validation and runtime type erasure) in Java, please refer to *[Generics in the Java Programming Language
147147
](https://www.cs.rice.edu/~cork/312/Readings/GenericsTutorial.pdf)*.
148-

emulatedtests/confluent_cloud_cacert.pem

Lines changed: 0 additions & 3466 deletions
This file was deleted.

endtoendtests/confluent_cloud_cacert.pem

Lines changed: 0 additions & 3466 deletions
This file was deleted.

eng/ci/templates/java-versions.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
variables:
2+
# Linux JDK Versions
3+
JDK8_LINUX_VERSION: '442'
4+
JDK8_LINUX_BUILD: '06'
5+
JDK11_LINUX_VERSION: '11.0.26'
6+
JDK17_LINUX_VERSION: '17.0.14'
7+
JDK21_LINUX_VERSION: '21.0.6'
8+
JDK25_LINUX_VERSION: '25.0.0'
9+
10+
# Windows JDK Versions
11+
JDK8_WINDOWS_VERSION: '442'
12+
JDK8_WINDOWS_BUILD: '06'
13+
JDK11_WINDOWS_VERSION: '11.0.26'
14+
JDK17_WINDOWS_VERSION: '17.0.14'
15+
JDK21_WINDOWS_VERSION: '21.0.6'
16+
JDK25_WINDOWS_VERSION: '25.0.0'

eng/ci/templates/jobs/run-emulated-tests-linux.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,36 @@ jobs:
1313
os: linux
1414

1515
variables:
16-
${{ if contains(variables['Build.SourceBranch'], '/tags/' ) }}:
17-
isTagTemp: true
18-
isTag: $[variables.isTagTemp]
19-
ApplicationInsightAgentVersion: 3.5.4
16+
- template: ../java-versions.yml
17+
- ${{ if contains(variables['Build.SourceBranch'], '/tags/' ) }}:
18+
- name: isTagTemp
19+
value: true
20+
- name: isTag
21+
value: $[variables.isTagTemp]
2022

2123
strategy:
2224
maxParallel: 4
2325
matrix:
2426
open-jdk-8-linux:
25-
JDK_DOWNLOAD_LINK: 'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u442b06.tar.gz'
26-
JAVA_VERSION: 'OpenJDK8U-jdk_x64_linux_hotspot_8u442b06'
27-
JDK_PATH: 'jdk8u442-b06'
27+
JDK_DOWNLOAD_LINK: 'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u$(JDK8_LINUX_VERSION)-b$(JDK8_LINUX_BUILD)/OpenJDK8U-jdk_x64_linux_hotspot_8u$(JDK8_LINUX_VERSION)b$(JDK8_LINUX_BUILD).tar.gz'
28+
JAVA_VERSION: 'OpenJDK8U-jdk_x64_linux_hotspot_8u$(JDK8_LINUX_VERSION)b$(JDK8_LINUX_BUILD)'
2829
JAVA_VERSION_SPEC: '8'
2930
microsoft-open-jdk-11-linux:
30-
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-11.0.26-linux-x64.tar.gz'
31-
JAVA_VERSION: 'microsoft-jdk-11.0.26-linux-x64'
32-
JDK_PATH: 'jdk-11.0.26+4'
31+
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-$(JDK11_LINUX_VERSION)-linux-x64.tar.gz'
32+
JAVA_VERSION: 'microsoft-jdk-$(JDK11_LINUX_VERSION)-linux-x64'
3333
JAVA_VERSION_SPEC: '11'
3434
microsoft-open-jdk-17-linux:
35-
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-17.0.14-linux-x64.tar.gz'
36-
JAVA_VERSION: 'microsoft-jdk-17.0.14-linux-x64'
37-
JDK_PATH: 'jdk-17.0.14+7'
35+
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-$(JDK17_LINUX_VERSION)-linux-x64.tar.gz'
36+
JAVA_VERSION: 'microsoft-jdk-$(JDK17_LINUX_VERSION)-linux-x64'
3837
JAVA_VERSION_SPEC: '17'
3938
microsoft-open-jdk-21-linux:
40-
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-21.0.6-linux-x64.tar.gz'
41-
JAVA_VERSION: 'microsoft-jdk-21.0.6-linux-x64'
42-
JDK_PATH: 'jdk-21.0.6+7'
39+
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-$(JDK21_LINUX_VERSION)-linux-x64.tar.gz'
40+
JAVA_VERSION: 'microsoft-jdk-$(JDK21_LINUX_VERSION)-linux-x64'
4341
JAVA_VERSION_SPEC: '21'
42+
microsoft-open-jdk-25-linux:
43+
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-$(JDK25_LINUX_VERSION)-linux-x64.tar.gz'
44+
JAVA_VERSION: 'microsoft-jdk-$(JDK25_LINUX_VERSION)-linux-x64'
45+
JAVA_VERSION_SPEC: '25'
4446

4547
steps:
4648
- task: NuGetToolInstaller@1
@@ -94,10 +96,12 @@ jobs:
9496
.\package-pipeline.ps1 -buildNumber $buildNumber
9597
displayName: 'Executing build script'
9698
- pwsh: |
99+
# Download Mozilla CA certificate bundle
100+
Invoke-WebRequest -Uri "https://curl.se/ca/cacert.pem" -OutFile "./emulatedtests/confluent_cloud_cacert.pem"
97101
cd ./emulatedtests
98102
mvn clean package `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
99103
Copy-Item "confluent_cloud_cacert.pem" "./target/azure-functions/azure-functions-java-emulatedtests"
100-
displayName: 'Package Java for E2E'
104+
displayName: 'Download CA Bundle & Package Java for Emulated Tests'
101105
- pwsh: |
102106
.\setup-tests-pipeline.ps1
103107
displayName: 'Setup test environment -- Install the Core Tools'

eng/ci/templates/jobs/run-emulated-tests-windows.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,36 @@ jobs:
1313
os: windows
1414

1515
variables:
16-
${{ if contains(variables['Build.SourceBranch'], '/tags/' ) }}:
17-
isTagTemp: true
18-
isTag: $[variables.isTagTemp]
19-
ApplicationInsightAgentVersion: 3.5.4
16+
- template: ../java-versions.yml
17+
- ${{ if contains(variables['Build.SourceBranch'], '/tags/' ) }}:
18+
- name: isTagTemp
19+
value: true
20+
- name: isTag
21+
value: $[variables.isTagTemp]
2022

2123
strategy:
2224
maxParallel: 4
2325
matrix:
2426
open-jdk-8-windows:
25-
JDK_DOWNLOAD_LINK: 'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_windows_hotspot_8u442b06.zip'
26-
JAVA_VERSION: 'OpenJDK8U-jdk_x64_windows_hotspot_8u442b06'
27-
JDK_PATH: 'jdk8u442-b06'
27+
JDK_DOWNLOAD_LINK: 'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u$(JDK8_WINDOWS_VERSION)-b$(JDK8_WINDOWS_BUILD)/OpenJDK8U-jdk_x64_windows_hotspot_8u$(JDK8_WINDOWS_VERSION)b$(JDK8_WINDOWS_BUILD).zip'
28+
JAVA_VERSION: 'OpenJDK8U-jdk_x64_windows_hotspot_8u$(JDK8_WINDOWS_VERSION)b$(JDK8_WINDOWS_BUILD)'
2829
JAVA_VERSION_SPEC: '8'
2930
microsoft-open-jdk-11-windows:
30-
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-11.0.26-windows-x64.zip'
31-
JAVA_VERSION: 'microsoft-jdk-11.0.26-windows-x64'
32-
JDK_PATH: 'jdk-11.0.26+4'
31+
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-$(JDK11_WINDOWS_VERSION)-windows-x64.zip'
32+
JAVA_VERSION: 'microsoft-jdk-$(JDK11_WINDOWS_VERSION)-windows-x64'
3333
JAVA_VERSION_SPEC: '11'
3434
microsoft-open-jdk-17-windows:
35-
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-17.0.14-windows-x64.zip'
36-
JAVA_VERSION: 'microsoft-jdk-17.0.14-windows-x64'
37-
JDK_PATH: 'jdk-17.0.14+7'
35+
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-$(JDK17_WINDOWS_VERSION)-windows-x64.zip'
36+
JAVA_VERSION: 'microsoft-jdk-$(JDK17_WINDOWS_VERSION)-windows-x64'
3837
JAVA_VERSION_SPEC: '17'
3938
microsoft-open-jdk-21-windows:
40-
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-21.0.6-windows-x64.zip'
41-
JAVA_VERSION: 'microsoft-jdk-21.0.6-windows-x64'
42-
JDK_PATH: 'jdk-21.0.6+7'
39+
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-$(JDK21_WINDOWS_VERSION)-windows-x64.zip'
40+
JAVA_VERSION: 'microsoft-jdk-$(JDK21_WINDOWS_VERSION)-windows-x64'
4341
JAVA_VERSION_SPEC: '21'
42+
microsoft-open-jdk-25-windows:
43+
JDK_DOWNLOAD_LINK: 'https://aka.ms/download-jdk/microsoft-jdk-$(JDK25_WINDOWS_VERSION)-windows-x64.zip'
44+
JAVA_VERSION: 'microsoft-jdk-$(JDK25_WINDOWS_VERSION)-windows-x64'
45+
JAVA_VERSION_SPEC: '25'
4446

4547
steps:
4648
- task: NuGetToolInstaller@1
@@ -89,10 +91,12 @@ jobs:
8991
.\package-pipeline.ps1 -buildNumber $buildNumber
9092
displayName: 'Executing build script'
9193
- pwsh: |
94+
# Download Mozilla CA certificate bundle
95+
Invoke-WebRequest -Uri "https://curl.se/ca/cacert.pem" -OutFile "./emulatedtests/confluent_cloud_cacert.pem"
9296
cd ./emulatedtests
9397
mvn clean package `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
9498
Copy-Item "confluent_cloud_cacert.pem" "./target/azure-functions/azure-functions-java-emulatedtests"
95-
displayName: 'Package Java for E2E'
99+
displayName: 'Download CA Bundle & Package Java for Emulated Tests'
96100
- pwsh: |
97101
.\setup-tests-pipeline.ps1
98102
displayName: 'Setup test environment -- Install the Core Tools'

eng/ci/templates/official/jobs/run-e2e-tests-linux.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,12 @@ jobs:
9494
func --version
9595
displayName: 'Setup Core Tools - Linux'
9696
- pwsh: |
97+
# Download Mozilla CA certificate bundle
98+
Invoke-WebRequest -Uri "https://curl.se/ca/cacert.pem" -OutFile "./endtoendtests/confluent_cloud_cacert.pem"
9799
cd ./endtoendtests
98100
mvn clean package `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
99101
Copy-Item "confluent_cloud_cacert.pem" "./target/azure-functions/azure-functions-java-endtoendtests"
100-
displayName: 'Package Java for E2E'
102+
displayName: 'Download CA Bundle & Package Java for E2E'
101103
- task: DotNetCoreCLI@2
102104
retryCountOnTaskFailure: 3
103105
inputs:

eng/ci/templates/official/jobs/run-e2e-tests-windows.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@ jobs:
7979
func --version
8080
displayName: 'Setup Core Tools - Windows'
8181
- pwsh: |
82+
# Download Mozilla CA certificate bundle
83+
Invoke-WebRequest -Uri "https://curl.se/ca/cacert.pem" -OutFile "./endtoendtests/confluent_cloud_cacert.pem"
8284
cd ./endtoendtests
8385
mvn clean package `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
8486
Copy-Item "confluent_cloud_cacert.pem" "./target/azure-functions/azure-functions-java-endtoendtests"
85-
displayName: 'Package Java for E2E'
87+
displayName: 'Download CA Bundle & Package Java for E2E'
8688
- task: DotNetCoreCLI@2
8789
retryCountOnTaskFailure: 3
8890
inputs:

0 commit comments

Comments
 (0)