Skip to content

Commit

Permalink
Merge pull request #6340 from microsoft/endgame-december
Browse files Browse the repository at this point in the history
upgrade plugin/utils versions and add changelog
  • Loading branch information
wangmingliang-ms authored Jan 20, 2022
2 parents b28cbff + db679ee commit 78cfe45
Show file tree
Hide file tree
Showing 32 changed files with 79 additions and 71 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.

- [Change Log](#change-log)
- [3.60.2](#3601)
- [3.60.1](#3601)
- [3.60.0](#3600)
- [3.59.0](#3590)
Expand Down Expand Up @@ -77,6 +78,10 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
- [3.0.7](#307)
- [3.0.6](#306)

## 3.60.2
### Changed
- Upgrade log4j to the latest 2.17.1

## 3.60.1
### Fixed
- [#6294](https://github.com/microsoft/azure-tools-for-java/issues/6294): Uncaught Exception cannot create configurable component java.lang.NullPointerException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.microsoft.applicationinsights.feature"
label="Application Insights Plugin for Java"
version="3.30.0.qualifier"
version="3.30.1.qualifier"
provider-name="Microsoft Corp.">

<description>
Expand Down Expand Up @@ -95,7 +95,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous p
</license>

<requires>
<import feature="com.microsoft.azuretools.sdk.feature" version="3.30.0.qualifier"/>
<import feature="com.microsoft.azuretools.sdk.feature" version="3.30.1.qualifier"/>
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Application Insights Plugin for Java
Bundle-SymbolicName: com.microsoft.applicationinsights.ui;singleton:=true
Bundle-Version: 3.30.0.qualifier
Bundle-Version: 3.30.1.qualifier
Bundle-Activator: com.microsoft.applicationinsights.ui.activator.Activator
Bundle-Vendor: Microsoft Corp.
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.jdt.ui,
org.eclipse.jdt.core,
org.eclipse.core.resources,
com.microsoft.azuretools.sdk;bundle-version="3.30.0",
com.microsoft.azuretools.wasdkjava.ui;bundle-version="3.30.0",
com.microsoft.azuretools.core;bundle-version="3.30.0"
com.microsoft.azuretools.sdk;bundle-version="3.30.1",
com.microsoft.azuretools.wasdkjava.ui;bundle-version="3.30.1",
com.microsoft.azuretools.core;bundle-version="3.30.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.microsoft.azuretools.sdk.feature"
label="Package for Microsoft Azure Libraries for Java"
version="3.30.0.qualifier"
version="3.30.1.qualifier"
provider-name="Microsoft Corp.">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Package for Microsoft Azure Libraries for Java UI
Bundle-SymbolicName: com.microsoft.azuretools.wasdkjava.ui;singleton:=true
Bundle-Version: 3.30.0.qualifier
Bundle-Version: 3.30.1.qualifier
Bundle-Vendor: Microsoft Corp.
Bundle-Activator: com.microsoft.azuretools.wasdkjava.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.jdt.core;bundle-version="3.10.0",
org.eclipse.jdt.ui;bundle-version="3.10.0",
org.eclipse.core.resources;bundle-version="3.9.0",
com.microsoft.azuretools.core;bundle-version="3.30.0"
com.microsoft.azuretools.core;bundle-version="3.30.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Expand Down
8 changes: 4 additions & 4 deletions PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@
<parent>
<groupId>com.microsoft.azuretools</groupId>
<artifactId>utils</artifactId>
<version>3.60.0</version>
<version>3.60.1</version>
</parent>
<groupId>com.microsoft.azuretools</groupId>
<artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
<version>3.30.0-SNAPSHOT</version>
<version>3.30.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Package for Microsoft Azure Libraries for Java Plugin</name>
<organization>
<name>Microsoft Corp.</name>
</organization>

<properties>
<azuretool.version>3.60.0</azuretool.version>
<azuretool.sdk.version>3.30.0.qualifier</azuretool.sdk.version>
<azuretool.version>3.60.1</azuretool.version>
<azuretool.sdk.version>3.30.1.qualifier</azuretool.sdk.version>
</properties>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jdt.ui;bundle-version="3.10.0",
org.eclipse.jdt.core;bundle-version="3.10.0",
org.eclipse.core.resources;bundle-version="3.9.0",
com.microsoft.azuretools.core;bundle-version="3.30.0"
com.microsoft.azuretools.core;bundle-version="3.30.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/com.microsoft.applicationinsights.feature_3.30.0.qualifier.jar" id="com.microsoft.applicationinsights.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.applicationinsights.feature_3.30.0.qualifier.jar" id="com.microsoft.applicationinsights.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.azureexplorer.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.azureexplorer.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.azureexplorer.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.azureexplorer.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.core.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.core.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.core.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.core.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.sdk.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.sdk.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.sdk.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.sdk.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.sqljdbc4.feature_9.4.0.jre8.jar" id="com.microsoft.sqljdbc4.feature" version="9.4.0.jre8">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.hdinsight.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.hdinsight.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.hdinsight.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.hdinsight.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.appservice.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.appservice.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.appservice.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.appservice.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.container.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.container.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.container.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.container.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.springcloud.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.springcloud.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.springcloud.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.springcloud.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<category-def name="com.persistent.azuretools.eclipseplugin.category" label="Azure Toolkit for Java">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<description name="Microsoft Azure" url="Microsoft Azure">
Microsoft Azure
</description>
<feature url="features/com.microsoft.applicationinsights.feature_3.30.0.qualifier.jar" id="com.microsoft.applicationinsights.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.applicationinsights.feature_3.30.0.qualifier.jar" id="com.microsoft.applicationinsights.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.sdk.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.sdk.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.sdk.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.sdk.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.hdinsight.feature_1.0.0.qualifier.jar" id="com.microsoft.azuretools.hdinsight.feature" version="1.0.0.qualifier">
Expand All @@ -16,19 +16,19 @@
<feature url="features/com.microsoft.sqljdbc4.feature_9.4.0.jre8.jar" id="com.microsoft.sqljdbc4.feature" version="9.4.0.jre8">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.azureexplorer.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.azureexplorer.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.azureexplorer.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.azureexplorer.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.core.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.core.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.core.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.core.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.appservice.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.appservice.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.appservice.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.appservice.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.container.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.container.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.container.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.container.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<feature url="features/com.microsoft.azuretools.springcloud.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.springcloud.feature" version="3.30.0.qualifier">
<feature url="features/com.microsoft.azuretools.springcloud.feature_3.30.0.qualifier.jar" id="com.microsoft.azuretools.springcloud.feature" version="3.30.1.qualifier">
<category name="com.persistent.azuretools.eclipseplugin.category"/>
</feature>
<category-def name="com.persistent.azuretools.eclipseplugin.category" label="Azure Toolkit for Eclipse">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.microsoft.azuretools.appservice.feature"
label="App Service Plugin for Eclipse"
version="3.30.0.qualifier"
version="3.30.1.qualifier"
provider-name="Microsoft Corp.">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WebApp Plugin for Eclipse
Bundle-SymbolicName: com.microsoft.azuretools.appservice;singleton:=true
Bundle-Version: 3.30.0.qualifier
Bundle-Version: 3.30.1.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.jdt.core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.microsoft.azuretools.azureexplorer.feature"
label="Azure Explorer for Eclipse"
version="3.30.0.qualifier"
version="3.30.1.qualifier"
provider-name="Microsoft Corp.">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Azure Explorer Plugin for Eclipse
Bundle-SymbolicName: com.microsoft.azuretools.azureexplorer;singleton:=true
Bundle-Version: 3.30.0.qualifier
Bundle-Version: 3.30.1.qualifier
Bundle-Activator: com.microsoft.azuretools.azureexplorer.Activator
Bundle-Vendor: Microsoft Corp.
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
com.microsoft.azuretools.sdk;bundle-version="3.30.0",
com.microsoft.azuretools.sdk;bundle-version="3.30.1",
org.eclipse.ui.forms,
org.eclipse.ui.editors,
org.eclipse.text,
com.microsoft.azuretools.core;bundle-version="3.30.0",
com.microsoft.azuretools.container;bundle-version="3.30.0"
com.microsoft.azuretools.core;bundle-version="3.30.1",
com.microsoft.azuretools.container;bundle-version="3.30.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.microsoft.azuretools.container.feature"
label="Azure Container Tools for Eclipse"
version="3.30.0.qualifier"
version="3.30.1.qualifier"
provider-name="Microsoft Corp.">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Container
Bundle-SymbolicName: com.microsoft.azuretools.container;singleton:=true
Bundle-Version: 3.30.0.qualifier
Bundle-Version: 3.30.1.qualifier
Bundle-Activator: com.microsoft.azuretools.container.Activator
Bundle-Vendor: MICROSOFT
Require-Bundle: org.eclipse.ui,
Expand All @@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jst.j2ee.web,
org.eclipse.core.runtime,
org.eclipse.core.resources,
com.microsoft.azuretools.core;bundle-version="3.30.0",
com.microsoft.azuretools.sdk;bundle-version="3.30.0",
com.microsoft.azuretools.core;bundle-version="3.30.1",
com.microsoft.azuretools.sdk;bundle-version="3.30.1",
org.eclipse.swt,
org.eclipse.ui.forms,
org.eclipse.ui.views,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.microsoft.azuretools.core.feature"
label="Azure Common Plugin"
version="3.30.0.qualifier"
version="3.30.1.qualifier"
provider-name="Microsoft Corp.">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Azure Core Plugin Library
Bundle-SymbolicName: com.microsoft.azuretools.core;singleton:=true
Bundle-Version: 3.30.0.qualifier
Bundle-Version: 3.30.1.qualifier
Bundle-Activator: com.microsoft.azuretools.core.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand All @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.wst.common.frameworks;bundle-version="1.2.0";resolution:=optional,
org.eclipse.jst.j2ee;bundle-version="1.1.802";resolution:=optional,
org.eclipse.jst.j2ee.web;bundle-version="1.1.810";resolution:=optional,
com.microsoft.azuretools.sdk;bundle-version="3.30.0",
com.microsoft.azuretools.sdk;bundle-version="3.30.1",
com.jcraft.jsch;visibility:=reexport,
org.eclipse.equinox.p2.ui,
org.eclipse.equinox.p2.operations,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.microsoft.azuretools.hdinsight.feature"
label="Azure HDInsight plugin for Java"
version="3.30.0.qualifier"
version="3.30.1.qualifier"
provider-name="Microsoft Corp.">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: HDInsights
Bundle-SymbolicName: com.microsoft.azuretools.hdinsight;singleton:=true
Bundle-Version: 3.30.0.qualifier
Bundle-Version: 3.30.1.qualifier
Bundle-Activator: com.microsoft.azuretools.hdinsight.Activator
Bundle-Vendor: Microsoft Corp.
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
com.microsoft.azuretools.core;bundle-version="3.30.0",
com.microsoft.azuretools.azureexplorer;bundle-version="3.30.0",
com.microsoft.azuretools.sdk;bundle-version="3.30.0",
com.microsoft.azuretools.core;bundle-version="3.30.1",
com.microsoft.azuretools.azureexplorer;bundle-version="3.30.1",
com.microsoft.azuretools.sdk;bundle-version="3.30.1",
org.eclipse.swt,
org.eclipse.ui.workbench,
org.scala-ide.sdt.core;resolution:=optional,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.microsoft.azuretools.springcloud.feature"
label="Spring Cloud Plugin for Eclipse"
version="3.30.0.qualifier"
version="3.30.1.qualifier"
provider-name="Microsoft Corp.">

<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Spring Cloud for Eclipse
Bundle-SymbolicName: com.microsoft.azuretools.springcloud;singleton:=true
Bundle-Version: 3.30.0.qualifier
Bundle-Version: 3.30.1.qualifier
Bundle-Activator: com.microsoft.azure.toolkit.eclipse.springcloud.Activator
Bundle-Vendor: MICROSOFT Corp.
Require-Bundle: org.eclipse.ui,
Expand All @@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jst.j2ee.web,
org.eclipse.core.runtime,
org.eclipse.core.resources,
com.microsoft.azuretools.core;bundle-version="3.30.0",
com.microsoft.azuretools.sdk;bundle-version="3.30.0",
com.microsoft.azuretools.core;bundle-version="3.30.1",
com.microsoft.azuretools.sdk;bundle-version="3.30.1",
org.eclipse.swt,
org.eclipse.ui.forms,
org.eclipse.ui.views,
Expand Down
2 changes: 1 addition & 1 deletion PluginsAndFeatures/azure-toolkit-for-eclipse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho-version>2.5.0</tycho-version>
<azuretool.eclipse.version>3.30.0-SNAPSHOT</azuretool.eclipse.version>
<azuretool.eclipse.version>3.30.1-SNAPSHOT</azuretool.eclipse.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ dependencies {
compile group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: '9.3.1.jre8-preview'

// TODO(andxu): remove the legacy dependencies
compile 'com.microsoft.azuretools:azuretools-core:3.60.0', {
compile 'com.microsoft.azuretools:azuretools-core:3.60.1', {
exclude group: "com.microsoft.azure", module: "azure-client-authentication"
exclude group: "com.microsoft.azure", module: "azure-client-runtime"
exclude group: "javax.xml.bind", module: "jaxb-api"
}

compile 'com.microsoft.azuretools:azure-explorer-common:3.60.0', {
compile 'com.microsoft.azuretools:azure-explorer-common:3.60.1', {
exclude group: "com.microsoft.azure", module: "azure-client-authentication"
exclude group: "com.microsoft.azure", module: "azure-client-runtime"
exclude group: "javax.xml.bind", module: "jaxb-api"
Expand Down
Loading

0 comments on commit 78cfe45

Please sign in to comment.