Skip to content

Commit c15e928

Browse files
Flanker32Flanker32
authored
Merge pull request #9978 from microsoft/hanli/eap
Upgrade dependencies to support intellij 2025.1 eap
2 parents 2ff8c8a + feb70d2 commit c15e928

File tree

575 files changed

+15400
-4365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

575 files changed

+15400
-4365
lines changed

‎.azure-pipelines/sign-for-dev-release.yml‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
# This pipeline was generated from the classic pipeline "[IntelliJ] sign-for-dev-release" on 2024-01-16 with https://aka.ms/1ESPTMigration (v1.1.0): https://dev.azure.com/mseng/VSJava/_build?definitionId=11383
2-
#
3-
# The following items require attention:
4-
# Variables were exported from the classic pipeline, confirm that `variables` values do not contain private information. If a variable contains private information, follow the guidance on handling secret variables: https://learn.microsoft.com/en-us/azure/devops/pipelines/process/set-secret-variables
5-
# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
6-
# No trigger found, defaulting to 'none'. Update the trigger as needed.
7-
# No name found, setting the default value '$(Date:yyyyMMdd).$(Rev:r)'. This value determines how your pipeline runs are numbered. Update the name as needed: https://learn.microsoft.com/en-us/azure/devops/pipelines/process/run-number?view=azure-devops&tabs=yaml
8-
# The pipeline uses service connection "vscjavaci_codesign", you will need to grant the new pipeline access: https://dev.azure.com/mseng/VSJava/_settings/adminservices?resourceId=d5f51b85-6feb-48f6-a077-37426b5911f4
9-
101
name: $(Date:yyyyMMdd).$(Rev:r)
112
variables:
123
- name: Codeql.Enabled
@@ -55,17 +46,6 @@ extends:
5546
versionSpec: "17"
5647
jdkArchitectureOption: x64
5748
jdkSourceOption: PreInstalled
58-
- task: Bash@3
59-
displayName: Set up environment and resources
60-
inputs:
61-
targetType: inline
62-
script: |-
63-
# Set Environment Variables
64-
export JAVA_HOME=$JAVA_HOME_17_X64
65-
export PATH=$JAVA_HOME/bin:$PATH
66-
67-
echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME"
68-
echo "##vso[task.setvariable variable=PATH]$PATH"
6949
- task: Bash@3
7050
displayName: Build Toolkit Libs@$(TOOLKIT_BRANCH)
7151
inputs:
@@ -95,25 +75,31 @@ extends:
9575
inputs:
9676
targetType: inline
9777
script: |-
98-
# Write your commands here
99-
78+
mvn -v
10079
# ./gradlew buildUtils || exit -1
101-
mvn install -f ./Utils/pom.xml -T 1C -Dcheckstyle.skip=true
80+
mvn clean install -f ./Utils/pom.xml -T 1C -Dcheckstyle.skip=true -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
81+
mvn clean -f ./Utils/pom.xml
10282
- task: Bash@3
103-
displayName: Build IntelliJ
83+
displayName: Build Plugin
10484
inputs:
10585
targetType: inline
10686
script: |
107-
(cd PluginsAndFeatures/azure-toolkit-for-intellij && ./gradlew clean buildPlugin -s -Papplicationinsights.key=$(INTELLIJ_KEY) -PneedPatchVersion=true -Psources=false -Porg.gradle.configureondemand=false -Porg.gradle.daemon=false -Porg.gradle.unsafe.configuration-cache=false -Porg.gradle.caching=false)
87+
(cd PluginsAndFeatures/azure-toolkit-for-intellij && ./gradlew clean buildPlugin -s -Papplicationinsights.key=$(INTELLIJ_KEY) -PneedPatchVersion=true -Psources=false -Porg.gradle.configureondemand=false -Porg.gradle.daemon=false -Porg.gradle.unsafe.configuration-cache=false -Porg.gradle.caching=false)
10888
10989
mkdir -p ./artifacts/intellij/
11090
cp ./PluginsAndFeatures/azure-toolkit-for-intellij/build/distributions/*.zip ./artifacts/intellij/azure-toolkit-for-intellij.zip
11191
unzip ./artifacts/intellij/azure-toolkit-for-intellij.zip -d ./artifacts/intellij/folder
11292
rm ./artifacts/intellij/azure-toolkit-for-intellij.zip
113-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@3
93+
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
11494
displayName: Sign IntelliJ
95+
condition: and(succeeded(), ne(variables['DisableCodeSign'], 'true'))
11596
inputs:
116-
ConnectedServiceName: vscjavaci_codesign
97+
ConnectedServiceName: 'ESRP-Release-Test'
98+
AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
99+
AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
100+
AuthAKVName: 'vscjavaci'
101+
AuthCertName: 'vscjava-esrprelease-auth'
102+
AuthSignCertName: 'VSCJava-CodeSign'
117103
FolderPath: artifacts/intellij/folder
118104
Pattern: azure-intellij-*.jar, azure-toolkit-*.jar, azuretools-core-*.jar,azure-explorer-common-*.jar,hdinsight-node-common-*.jar, azure-sdk-reference-book.jar
119105
signConfigType: inlineSignParams
@@ -138,7 +124,7 @@ extends:
138124
}
139125
]
140126
- task: Bash@3
141-
displayName: Build IntelliJ Package
127+
displayName: Repackage
142128
inputs:
143129
targetType: inline
144130
script: |

‎.azure-pipelines/sign-for-stable-release.yml‎

Lines changed: 19 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
# This pipeline was generated from the classic pipeline "[IntelliJ] sign-for-stable-release" on 2024-01-11 with https://aka.ms/1ESPTMigration (v1.1.0): https://dev.azure.com/mseng/VSJava/_build?definitionId=10780
2-
#
3-
# The following items require attention:
4-
# Variables were exported from the classic pipeline, confirm that `variables` values do not contain private information. If a variable contains private information, follow the guidance on handling secret variables: https://learn.microsoft.com/en-us/azure/devops/pipelines/process/set-secret-variables
5-
# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
6-
# No trigger found, defaulting to 'none'. Update the trigger as needed.
7-
# No name found, setting the default value '$(Date:yyyyMMdd).$(Rev:r)'. This value determines how your pipeline runs are numbered. Update the name as needed: https://learn.microsoft.com/en-us/azure/devops/pipelines/process/run-number?view=azure-devops&tabs=yaml
8-
# The pipeline uses service connection "vscjavaci_codesign", you will need to grant the new pipeline access: https://dev.azure.com/mseng/VSJava/_settings/adminservices?resourceId=d5f51b85-6feb-48f6-a077-37426b5911f4
9-
101
name: $(Date:yyyyMMdd).$(Rev:r)
112
variables:
123
- name: Codeql.Enabled
@@ -36,7 +27,7 @@ extends:
3627
customBuildTags:
3728
- MigrationTooling-mseng-VSJava-10780-Tool
3829
stages:
39-
- stage: Build
30+
- stage: Stage
4031
jobs:
4132
- job: Job_1
4233
displayName: Build and Sign Azure Plugin for IntelliJ
@@ -49,56 +40,44 @@ extends:
4940
steps:
5041
- checkout: self
5142
fetchTags: false
52-
- script: |
53-
CUSTOM_BRANCH=$(BRANCH)
54-
if [[ -n ${CUSTOM_BRANCH} ]]; then
55-
git fetch origin $(BRANCH)
56-
git checkout $(BRANCH)
57-
else
58-
echo "no need to switch branch"
59-
fi
60-
displayName: switch to $(BRANCH)
6143
- task: JavaToolInstaller@0
6244
displayName: Use Java 17
6345
inputs:
6446
versionSpec: "17"
6547
jdkArchitectureOption: x64
6648
jdkSourceOption: PreInstalled
67-
- task: Bash@3
68-
displayName: Set up environment and resources
69-
inputs:
70-
targetType: inline
71-
script: |-
72-
# Set Environment Variables
73-
export JAVA_HOME=$JAVA_HOME_17_X64
74-
export PATH=$JAVA_HOME/bin:$PATH
75-
76-
echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME"
77-
echo "##vso[task.setvariable variable=PATH]$PATH"
7849
- task: Bash@3
7950
displayName: Build Utils
8051
inputs:
8152
targetType: inline
8253
script: |-
83-
# Write your commands here
84-
54+
mvn -v
8555
# ./gradlew buildUtils || exit -1
86-
mvn install -f ./Utils/pom.xml -T 1C -Dcheckstyle.skip=true
56+
mvn clean install -f ./Utils/pom.xml -T 1C -Dcheckstyle.skip=true -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
57+
mvn clean -f ./Utils/pom.xml
8758
- task: Bash@3
88-
displayName: Build IntelliJ
59+
displayName: Build Plugin
8960
inputs:
9061
targetType: inline
9162
script: |
92-
(cd PluginsAndFeatures/azure-toolkit-for-intellij && ./gradlew clean buildPlugin -s -Papplicationinsights.key=$(INTELLIJ_KEY) -PneedPatchVersion=false -Psources=false -Porg.gradle.configureondemand=false -Porg.gradle.daemon=false -Porg.gradle.unsafe.configuration-cache=false -Porg.gradle.caching=false)
93-
9463
mkdir -p ./artifacts/intellij/
95-
cp ./PluginsAndFeatures/azure-toolkit-for-intellij/build/distributions/*.zip ./artifacts/intellij/azure-toolkit-for-intellij.zip
64+
65+
# Download the IntelliJ plugin from storage using SAS token
66+
echo "Downloading IntelliJ plugin from storage..."
67+
curl -L "$(INTELLIJ_PLUGIN_STORAGE_URL)" -o ./artifacts/intellij/azure-toolkit-for-intellij.zip
68+
9669
unzip ./artifacts/intellij/azure-toolkit-for-intellij.zip -d ./artifacts/intellij/folder
9770
rm ./artifacts/intellij/azure-toolkit-for-intellij.zip
98-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@3
71+
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
9972
displayName: Sign IntelliJ
73+
condition: and(succeeded(), ne(variables['DisableCodeSign'], 'true'))
10074
inputs:
101-
ConnectedServiceName: vscjavaci_codesign
75+
ConnectedServiceName: 'ESRP-Release-Test'
76+
AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
77+
AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
78+
AuthAKVName: 'vscjavaci'
79+
AuthCertName: 'vscjava-esrprelease-auth'
80+
AuthSignCertName: 'VSCJava-CodeSign'
10281
FolderPath: artifacts/intellij/folder
10382
Pattern: azure-toolkit-for-intellij.jar, azure-intellij-plugin-*.jar, azure-intellij-resource-connector-*.jar, azure-toolkit-ide-*.jar, azuretools-core-*.jar,azure-explorer-common-*.jar,hdinsight-node-common-*.jar, azure-sdk-reference-book.jar
10483
signConfigType: inlineSignParams
@@ -123,7 +102,7 @@ extends:
123102
}
124103
]
125104
- task: Bash@3
126-
displayName: Build IntelliJ Package
105+
displayName: Repackage
127106
inputs:
128107
targetType: inline
129108
script: |

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ target/
2020
### Intellij ###
2121
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
2222
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
23-
23+
**/.intellijPlatform
2424
# User-specific stuff:
2525
**/.idea/**/workspace.xml
2626
**/.idea/**/tasks.xml

‎CHANGELOG.md‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.
44

55
- [Change Log](#change-log)
6+
- [3.93.0](#3930)
7+
- [3.92.0](#3920)
8+
- [3.91.0](#3910)
9+
- [3.90.0](#3900)
10+
- [3.89.0](#3890)
11+
- [3.88.0](#3880)
12+
- [3.87.0](#3870)
13+
- [3.86.0](#3860)
614
- [3.85.0](#3850)
715
- [3.84.0](#3840)
816
- [3.83.0](#3830)
@@ -107,6 +115,80 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
107115
- [3.0.7](#307)
108116
- [3.0.6](#306)
109117

118+
## 3.94.0
119+
- Fix some known issues.
120+
121+
## 3.93.0
122+
- Support IntelliJ 2024.3 Beta
123+
- Support Azure Cloud Shell (Thanks for @rafaelldi)
124+
125+
## 3.92.0
126+
- Added Managed identity support for Azure Functions.
127+
- Fixed [#8473](https://github.com/microsoft/azure-tools-for-java/issues/8473): Class initialization must not depend on services. Consider using instance of the service on-demand instead.
128+
- Fixed [#8497](https://github.com/microsoft/azure-tools-for-java/issues/8497): fix support for swap
129+
130+
131+
## 3.91.0
132+
- Added support for Managed Identity Authentication in Web App Resource Connections.
133+
- Support update the identity configuration of Web App to connect Azure resources (Azure Storage Account/Azure Key Vault/Azure Cosmos DB for NoSQL)
134+
- Support grant permission to managed identity to connected resource (Azure Storage Account/Azure Key Vault)
135+
136+
## 3.90.0
137+
### Added
138+
- Support IntelliJ 2024.2 EAP
139+
- Support workload profiles environment type in Azure Container Apps
140+
- Support create workload profiles during the creation of an Azure Container Apps environment.
141+
- Enable setting of workload profiles during the creation of container apps and function apps.
142+
143+
## 3.89.0
144+
### Added
145+
- Added a "get started with Azure Container Apps" course.
146+
147+
### Fixed
148+
- Error occurs when pushing image to container registry with docker file.
149+
- WebApp of deploy WebApp run configuration shows incorrectly after deploying to a slot.
150+
- "Load .env" before run task doesn't show in cases when deploying Azure WebApp.
151+
- Some other know issues.
152+
153+
## 3.88.1
154+
### Added
155+
- Support creation/deployment for flex consumption function app.
156+
157+
### Fixed
158+
- Fixes duplicate before run tasks for Azure Container Apps deployment run configuration
159+
160+
## 3.88.0
161+
### Added
162+
- Support for deploying source code/artifacts to Azure Container Apps directly.
163+
164+
### Fixed
165+
- Error throws when starting streaming log for container apps env.
166+
167+
## 3.87.0
168+
### Added
169+
- Support for connecting Azure Storage account with connection string and managing them in both `Services` view and `Project Explorer`.
170+
171+
### Fixed
172+
- [#8205](https://github.com/microsoft/azure-tools-for-java/issues/8205): Could not emit tick xxx due to lack of requests (interval doesn't support small downstream requests that replenish slower than the ticks)
173+
- [azure-sdk-for-java#39214] (https://github.com/Azure/azure-sdk-for-java/issues/39214) msal-* libs are falsely treated as `deprecated`.
174+
175+
## 3.86.1
176+
### Fixed
177+
- [#8206](https://github.com/microsoft/azure-tools-for-java/issues/8206): After saving the web app run configuration, the app settings will be cleared.
178+
179+
## 3.86.0
180+
### Added
181+
- Support for managing Azure resources in integrated `Services` view.
182+
- Feature recommendation based on user project dependencies.
183+
184+
### Updated
185+
- Startup notifications are quequed to prevent distraction.
186+
187+
### Fixed
188+
- The link in warning for java 21 goes to a wrong page.
189+
- Function fails running using cli downloaded with the plugin.
190+
- [#8139](https://github.com/microsoft/azure-tools-for-java/issues/8139): NPE at web app configuration validation.
191+
110192
## 3.85.0
111193
### Added
112194
- Support for containerized FunctionApps (based on Azure Container Apps)

‎PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>com.microsoft.azuretools</groupId>
2929
<artifactId>utils</artifactId>
30-
<version>3.86.0-SNAPSHOT</version>
30+
<version>3.94.0</version>
3131
</parent>
3232
<groupId>com.microsoft.azuretools</groupId>
3333
<artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -39,9 +39,9 @@
3939
</organization>
4040

4141
<properties>
42-
<azuretool.version>3.86.0-SNAPSHOT</azuretool.version>
42+
<azuretool.version>3.94.0</azuretool.version>
4343
<azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
44-
<azure.toolkit-lib.version>0.42.0-SNAPSHOT</azure.toolkit-lib.version>
44+
<azure.toolkit-lib.version>0.51.0</azure.toolkit-lib.version>
4545
</properties>
4646
<dependencyManagement>
4747
<dependencies>
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>org.apache.commons</groupId>
100100
<artifactId>commons-compress</artifactId>
101-
<version>1.21</version>
101+
<version>1.26.0</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>jakarta.xml.bind</groupId>

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ Export-Package: com.microsoft.azuretools.appservice,
4343
com.microsoft.azuretools.appservice.handlers,
4444
com.microsoft.azuretools.appservice.ui
4545
Bundle-ClassPath: .,
46-
target/lib/azure-toolkit-ide-appservice-lib-0.42.0-SNAPSHOT.jar
46+
target/lib/azure-toolkit-ide-appservice-lib-0.51.0.jar

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependency>
1414
<groupId>com.microsoft.azure</groupId>
1515
<artifactId>azure-toolkit-ide-appservice-lib</artifactId>
16-
<version>0.42.0-SNAPSHOT</version>
16+
<version>0.51.0</version>
1717
</dependency>
1818
</dependencies>
1919
<repositories>

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.container/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>org.apache.commons</groupId>
2828
<artifactId>commons-compress</artifactId>
29-
<version>1.21</version>
29+
<version>1.26.0</version>
3030
</dependency>
3131
</dependencies>
3232
<build>

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
2323
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2424
Bundle-ActivationPolicy: lazy
2525
Bundle-ClassPath: .,
26-
target/lib/azure-toolkit-ide-springcloud-lib-0.42.0-SNAPSHOT.jar
26+
target/lib/azure-toolkit-ide-springcloud-lib-0.51.0.jar
2727
Import-Package: com.microsoft.azuretools.core.actions,
2828
org.eclipse.core.expressions,
2929
org.eclipse.jface.text.hyperlink,

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependency>
1414
<groupId>com.microsoft.azure</groupId>
1515
<artifactId>azure-toolkit-ide-springcloud-lib</artifactId>
16-
<version>0.42.0-SNAPSHOT</version>
16+
<version>0.51.0</version>
1717
</dependency>
1818
</dependencies>
1919
<build>

0 commit comments

Comments
 (0)