Skip to content

Use bundle JNA for azure Intellij toolkit #7501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Use bundle JNA for azure Intellij toolkit #7501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
651dc74
Use bundle jna for azure intellij toolkit
Flanker32 Jan 31, 2023
4328421
Enable load jna from class path
Flanker32 Jan 31, 2023
cbe1d59
Replace deprecated method in HDinsightModuleBuilder
Flanker32 Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ allprojects {
implementation.exclude module:'stax-api'
implementation.exclude module:'groovy-xml'
implementation.exclude module:'groovy-templates'
implementation.exclude module:'jna'
cucumberRuntime {
extendsFrom testImplementation
}
Expand Down Expand Up @@ -242,6 +241,7 @@ dependencies {
implementation group: 'jaxen', name: 'jaxen', version: '1.2.0'

implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22")
implementation 'net.java.dev.jna:jna:5.12.1'
testImplementation 'io.cucumber:cucumber-java:7.0.0'
testImplementation 'io.cucumber:cucumber-junit:7.0.0'
testImplementation 'org.assertj:assertj-core:3.19.0'
Expand Down
2 changes: 1 addition & 1 deletion ...intellij/src/main/java/com/microsoft/azure/hdinsight/projects/HDInsightModuleBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void moduleCreated(@NotNull Module module) {
case MAVEN:
new MavenProjectGenerator(module, this.selectedTemplate.getTemplateType(), sparkVersion)
.generate()
.done(mavenProject -> {
.onSuccess(mavenProject -> {
if (getSelectedTemplate() != null && artifactPackagingFactory != null &&
getSelectedTemplate().getTemplateType() == HDInsightTemplatesType.ScalaFailureTaskDebugSample) {

Expand Down
2 changes: 2 additions & 0 deletions ...azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/AzureActionsListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.diagnostic.Logger;
import com.microsoft.applicationinsights.core.dependencies.apachecommons.lang3.exception.ExceptionUtils;
import com.microsoft.azure.cosmosspark.CosmosSparkClusterOpsCtrl;
Expand Down Expand Up @@ -127,6 +128,7 @@ public class AzureActionsListener implements AppLifecycleListener, PluginCompone
@AzureOperation(name = "platform/common.init_plugin")
public void appFrameCreated(@NotNull List<String> commandLineArgs) {
try {
System.setProperty("jna.noclasspath", "false");
DefaultLoader.setPluginComponent(this);
DefaultLoader.setUiHelper(new UIHelperImpl());
DefaultLoader.setIdeHelper(new IDEHelperImpl());
Expand Down