Skip to content

Commit 6d17fc1

Browse files
fengshuaihufengshuaihu
authored
Merge pull request #8045 from fengshuaihu/users/v-shufeng/code-cleanup
Users/v shufeng/code cleanup
2 parents 636fd1e + fb2fe67 commit 6d17fc1

File tree

26 files changed

+202
-1294
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij
  • Utils
    • azure-toolkit-ide-hdinsight-libs
    • azure-toolkit-ide-libs
      • azure-toolkit-ide-applicationinsights-lib
      • azure-toolkit-ide-appservice-lib
      • azure-toolkit-ide-arm-lib
      • azure-toolkit-ide-cognitiveservices-lib
      • azure-toolkit-ide-common-lib
      • azure-toolkit-ide-containerapps-lib
      • azure-toolkit-ide-containerregistry-lib
      • azure-toolkit-ide-containerservice-lib
      • azure-toolkit-ide-cosmos-lib
      • azure-toolkit-ide-database-lib
      • azure-toolkit-ide-eventhubs-lib
      • azure-toolkit-ide-keyvault-lib
      • azure-toolkit-ide-redis-lib
      • azure-toolkit-ide-servicebus-lib
      • azure-toolkit-ide-springcloud-lib
      • azure-toolkit-ide-storage-lib
      • azure-toolkit-ide-vm-lib
      • pom.xml

26 files changed

+202
-1294
lines changed

‎PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55
id "org.jetbrains.kotlin.jvm" version "1.9.10"
66
id "com.github.ben-manes.versions" version "0.39.0"
77
id "io.freefair.aspectj.post-compile-weaving" version "6.5.1"
8-
id "io.spring.dependency-management" version "1.0.11.RELEASE"
98
}
109

1110
processResources {
@@ -45,7 +44,6 @@ sourceSets {
4544
allprojects {
4645
apply plugin: 'java'
4746
apply plugin: 'io.freefair.aspectj.post-compile-weaving'
48-
apply plugin: 'io.spring.dependency-management'
4947
apply plugin: 'org.jetbrains.intellij'
5048

5149
group = 'com.microsoft.azuretools'
@@ -92,21 +90,16 @@ allprojects {
9290
mavenCentral()
9391
}
9492

95-
dependencyManagement {
96-
imports {
97-
mavenBom 'com.microsoft.azure:azure-toolkit-libs:0.40.0-SNAPSHOT'
98-
mavenBom 'com.microsoft.azure:azure-toolkit-ide-libs:0.40.0-SNAPSHOT'
99-
mavenBom 'com.microsoft.hdinsight:azure-toolkit-ide-hdinsight-libs:0.1.1'
100-
}
101-
}
102-
10393
dependencies {
104-
// https://mvnrepository.com/artifact/org.projectlombok/lombok
105-
compileOnly 'org.projectlombok:lombok'
106-
annotationProcessor 'org.projectlombok:lombok'
107-
implementation 'com.microsoft.azure:azure-toolkit-common-lib'
108-
aspect "com.microsoft.azure:azure-toolkit-common-lib"
109-
compileOnly 'org.jetbrains:annotations'
94+
implementation platform('com.microsoft.azure:azure-toolkit-libs:0.40.0-SNAPSHOT')
95+
implementation platform('com.microsoft.azure:azure-toolkit-ide-libs:0.40.0-SNAPSHOT')
96+
implementation platform('com.microsoft.hdinsight:azure-toolkit-ide-hdinsight-libs:0.1.1')
97+
98+
compileOnly 'org.projectlombok:lombok:1.18.24'
99+
compileOnly 'org.jetbrains:annotations:24.0.0'
100+
annotationProcessor 'org.projectlombok:lombok:1.18.24'
101+
implementation 'com.microsoft.azure:azure-toolkit-common-lib:0.40.0-SNAPSHOT'
102+
aspect "com.microsoft.azure:azure-toolkit-common-lib:0.40.0-SNAPSHOT"
110103
}
111104

112105
configurations {

‎Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/pom.xml

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -40,55 +40,6 @@
4040
</testResource>
4141
</testResources>
4242
<plugins>
43-
<plugin>
44-
<groupId>org.codehaus.mojo</groupId>
45-
<artifactId>aspectj-maven-plugin</artifactId>
46-
<version>1.14.0</version>
47-
<configuration>
48-
<showWeaveInfo>false</showWeaveInfo>
49-
<source>1.8</source>
50-
<target>1.8</target>
51-
<Xlint>ignore</Xlint>
52-
<complianceLevel>1.8</complianceLevel>
53-
<encoding>UTF-8</encoding>
54-
<verbose>false</verbose>
55-
<outxml>true</outxml>
56-
<forceAjcCompile>true</forceAjcCompile>
57-
<sources/><!-- this is important!-->
58-
<aspectLibraries>
59-
<aspectLibrary>
60-
<groupId>com.microsoft.azure</groupId>
61-
<artifactId>azure-toolkit-common-lib</artifactId>
62-
</aspectLibrary>
63-
</aspectLibraries>
64-
</configuration>
65-
<executions>
66-
<execution>
67-
<id>compile-with-aspectj</id>
68-
<phase>process-classes</phase>
69-
<configuration>
70-
<weaveDirectories>
71-
<weaveDirectory>${project.build.directory}/classes</weaveDirectory>
72-
</weaveDirectories>
73-
</configuration>
74-
<goals>
75-
<goal>compile</goal>
76-
</goals>
77-
</execution>
78-
<execution>
79-
<id>test-compile-with-aspectj</id>
80-
<phase>process-classes</phase>
81-
<configuration>
82-
<weaveDirectories>
83-
<weaveDirectory>${project.build.directory}/test-classes</weaveDirectory>
84-
</weaveDirectories>
85-
</configuration>
86-
<goals>
87-
<goal>test-compile</goal>
88-
</goals>
89-
</execution>
90-
</executions>
91-
</plugin>
9243
<plugin>
9344
<artifactId>maven-compiler-plugin</artifactId>
9445
<version>3.3</version>
@@ -97,22 +48,6 @@
9748
<target>17</target>
9849
</configuration>
9950
</plugin>
100-
<plugin>
101-
<groupId>org.apache.maven.plugins</groupId>
102-
<artifactId>maven-checkstyle-plugin</artifactId>
103-
<configuration>
104-
<failOnViolation>false</failOnViolation>
105-
</configuration>
106-
<executions>
107-
<execution>
108-
<id>validate</id>
109-
<phase>validate</phase>
110-
<goals>
111-
<goal>check</goal>
112-
</goals>
113-
</execution>
114-
</executions>
115-
</plugin>
11651
</plugins>
11752
</build>
11853
<dependencies>

‎Utils/azure-toolkit-ide-hdinsight-libs/azure-toolkit-ide-cosmos-spark-lib/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
</properties>
1919

2020
<dependencies>
21-
<dependency>
22-
<groupId>com.microsoft.azure</groupId>
23-
<artifactId>azure-toolkit-common-lib</artifactId>
24-
</dependency>
2521
<dependency>
2622
<groupId>com.microsoft.azure</groupId>
2723
<artifactId>azure-toolkit-ide-common-lib</artifactId>

‎Utils/azure-toolkit-ide-hdinsight-libs/azure-toolkit-ide-hdinsight-spark-lib/pom.xml

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
</properties>
1919

2020
<dependencies>
21-
<dependency>
22-
<groupId>com.microsoft.azure</groupId>
23-
<artifactId>azure-toolkit-common-lib</artifactId>
24-
</dependency>
2521
<dependency>
2622
<groupId>com.microsoft.azure</groupId>
2723
<artifactId>azure-toolkit-ide-common-lib</artifactId>
@@ -44,59 +40,5 @@
4440
<artifactId>gson</artifactId>
4541
</dependency>
4642
</dependencies>
47-
<build>
48-
<plugins>
49-
<plugin>
50-
<!-- https://mvnrepository.com/artifact/org.codehaus.mojo/aspectj-maven-plugin -->
51-
<!-- http://www.quabr.com/62976155/aspectj-maven-plugin-1-11-missing-tools-jar-issue-with-jdk-11 -->
52-
<groupId>org.codehaus.mojo</groupId>
53-
<artifactId>aspectj-maven-plugin</artifactId>
54-
<version>1.14.0</version>
55-
<configuration>
56-
<showWeaveInfo>false</showWeaveInfo>
57-
<source>1.8</source>
58-
<target>1.8</target>
59-
<Xlint>ignore</Xlint>
60-
<complianceLevel>1.8</complianceLevel>
61-
<encoding>UTF-8</encoding>
62-
<verbose>false</verbose>
63-
<outxml>true</outxml>
64-
<forceAjcCompile>true</forceAjcCompile>
65-
<sources/><!-- this is important!-->
66-
<aspectLibraries>
67-
<aspectLibrary>
68-
<groupId>com.microsoft.azure</groupId>
69-
<artifactId>azure-toolkit-common-lib</artifactId>
70-
</aspectLibrary>
71-
</aspectLibraries>
72-
</configuration>
73-
<executions>
74-
<execution>
75-
<id>compile-with-aspectj</id>
76-
<phase>process-classes</phase>
77-
<configuration>
78-
<weaveDirectories>
79-
<weaveDirectory>${project.build.directory}/classes</weaveDirectory>
80-
</weaveDirectories>
81-
</configuration>
82-
<goals>
83-
<goal>compile</goal>
84-
</goals>
85-
</execution>
86-
<execution>
87-
<id>test-compile-with-aspectj</id>
88-
<phase>process-test-classes</phase>
89-
<goals>
90-
<goal>test-compile</goal>
91-
</goals>
92-
<configuration>
93-
<weaveDirectories>
94-
<weaveDirectory>${project.build.directory}/test-classes</weaveDirectory>
95-
</weaveDirectories>
96-
</configuration>
97-
</execution>
98-
</executions>
99-
</plugin>
100-
</plugins>
101-
</build>
43+
10244
</project>

‎Utils/azure-toolkit-ide-hdinsight-libs/azure-toolkit-ide-sqlserver-spark-lib/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
</properties>
1919

2020
<dependencies>
21-
<dependency>
22-
<groupId>com.microsoft.azure</groupId>
23-
<artifactId>azure-toolkit-common-lib</artifactId>
24-
</dependency>
2521
<dependency>
2622
<groupId>com.microsoft.azure</groupId>
2723
<artifactId>azure-toolkit-ide-common-lib</artifactId>

‎Utils/azure-toolkit-ide-hdinsight-libs/azure-toolkit-ide-synapse-spark-lib/pom.xml

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
</properties>
1919

2020
<dependencies>
21-
<dependency>
22-
<groupId>com.microsoft.azure</groupId>
23-
<artifactId>azure-toolkit-common-lib</artifactId>
24-
</dependency>
2521
<dependency>
2622
<groupId>com.microsoft.azure</groupId>
2723
<artifactId>azure-toolkit-ide-common-lib</artifactId>
@@ -31,59 +27,5 @@
3127
<artifactId>hdinsight-node-common</artifactId>
3228
</dependency>
3329
</dependencies>
34-
<build>
35-
<plugins>
36-
<plugin>
37-
<!-- https://mvnrepository.com/artifact/org.codehaus.mojo/aspectj-maven-plugin -->
38-
<!-- http://www.quabr.com/62976155/aspectj-maven-plugin-1-11-missing-tools-jar-issue-with-jdk-11 -->
39-
<groupId>org.codehaus.mojo</groupId>
40-
<artifactId>aspectj-maven-plugin</artifactId>
41-
<version>1.14.0</version>
42-
<configuration>
43-
<showWeaveInfo>false</showWeaveInfo>
44-
<source>1.8</source>
45-
<target>1.8</target>
46-
<Xlint>ignore</Xlint>
47-
<complianceLevel>1.8</complianceLevel>
48-
<encoding>UTF-8</encoding>
49-
<verbose>false</verbose>
50-
<outxml>true</outxml>
51-
<forceAjcCompile>true</forceAjcCompile>
52-
<sources/><!-- this is important!-->
53-
<aspectLibraries>
54-
<aspectLibrary>
55-
<groupId>com.microsoft.azure</groupId>
56-
<artifactId>azure-toolkit-common-lib</artifactId>
57-
</aspectLibrary>
58-
</aspectLibraries>
59-
</configuration>
60-
<executions>
61-
<execution>
62-
<id>compile-with-aspectj</id>
63-
<phase>process-classes</phase>
64-
<configuration>
65-
<weaveDirectories>
66-
<weaveDirectory>${project.build.directory}/classes</weaveDirectory>
67-
</weaveDirectories>
68-
</configuration>
69-
<goals>
70-
<goal>compile</goal>
71-
</goals>
72-
</execution>
73-
<execution>
74-
<id>test-compile-with-aspectj</id>
75-
<phase>process-test-classes</phase>
76-
<goals>
77-
<goal>test-compile</goal>
78-
</goals>
79-
<configuration>
80-
<weaveDirectories>
81-
<weaveDirectory>${project.build.directory}/test-classes</weaveDirectory>
82-
</weaveDirectories>
83-
</configuration>
84-
</execution>
85-
</executions>
86-
</plugin>
87-
</plugins>
88-
</build>
30+
8931
</project>

‎Utils/azure-toolkit-ide-hdinsight-libs/azuretools-core/pom.xml

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -56,81 +56,6 @@
5656
<build>
5757
<sourceDirectory>src</sourceDirectory>
5858
<testSourceDirectory>test</testSourceDirectory>
59-
<plugins>
60-
<plugin>
61-
<groupId>org.codehaus.mojo</groupId>
62-
<artifactId>aspectj-maven-plugin</artifactId>
63-
<version>1.14.0</version>
64-
<configuration>
65-
<showWeaveInfo>false</showWeaveInfo>
66-
<source>1.8</source>
67-
<target>1.8</target>
68-
<Xlint>ignore</Xlint>
69-
<complianceLevel>1.8</complianceLevel>
70-
<encoding>UTF-8</encoding>
71-
<verbose>false</verbose>
72-
<outxml>true</outxml>
73-
<forceAjcCompile>true</forceAjcCompile>
74-
<sources/><!-- this is important!-->
75-
<aspectLibraries>
76-
<aspectLibrary>
77-
<groupId>com.microsoft.azure</groupId>
78-
<artifactId>azure-toolkit-common-lib</artifactId>
79-
</aspectLibrary>
80-
</aspectLibraries>
81-
</configuration>
82-
<executions>
83-
<execution>
84-
<id>compile-with-aspectj</id>
85-
<phase>process-classes</phase>
86-
<configuration>
87-
<weaveDirectories>
88-
<weaveDirectory>${project.build.directory}/classes</weaveDirectory>
89-
</weaveDirectories>
90-
</configuration>
91-
<goals>
92-
<goal>compile</goal>
93-
</goals>
94-
</execution>
95-
<execution>
96-
<id>test-compile-with-aspectj</id>
97-
<phase>process-classes</phase>
98-
<configuration>
99-
<weaveDirectories>
100-
<weaveDirectory>${project.build.directory}/test-classes</weaveDirectory>
101-
</weaveDirectories>
102-
</configuration>
103-
<goals>
104-
<goal>test-compile</goal>
105-
</goals>
106-
</execution>
107-
</executions>
108-
</plugin>
109-
<plugin>
110-
<artifactId>maven-compiler-plugin</artifactId>
111-
<version>3.3</version>
112-
<configuration>
113-
<source>17</source>
114-
<target>17</target>
115-
</configuration>
116-
</plugin>
117-
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-checkstyle-plugin</artifactId>
120-
<configuration>
121-
<failOnViolation>false</failOnViolation>
122-
</configuration>
123-
<executions>
124-
<execution>
125-
<id>validate</id>
126-
<phase>validate</phase>
127-
<goals>
128-
<goal>check</goal>
129-
</goals>
130-
</execution>
131-
</executions>
132-
</plugin>
133-
</plugins>
13459
<resources>
13560
<resource>
13661
<directory>src</directory>
@@ -144,10 +69,6 @@
14469
</resources>
14570
</build>
14671
<dependencies>
147-
<dependency>
148-
<groupId>com.microsoft.azure</groupId>
149-
<artifactId>azure-toolkit-common-lib</artifactId>
150-
</dependency>
15172
<dependency>
15273
<groupId>com.microsoft.azure</groupId>
15374
<artifactId>azure-toolkit-ide-common-lib</artifactId>

0 commit comments

Comments
 (0)