Skip to content

Commit 31bf638

Browse files
JoeCquptJoeCqupt
authored
Simplify plugin.dest.dir property in pom.xml (#746)
1 parent b358267 commit 31bf638

File tree

23 files changed

+5
-36
lines changed

23 files changed

+5
-36
lines changed

‎apm-sniffer/apm-sdk-plugin/apm-armeria-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
3938
</properties>
4039

4140
</project>

‎apm-sniffer/apm-sdk-plugin/graphql-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,5 @@
3737

3838
<properties>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4140
</properties>
4241
</project>

‎apm-sniffer/apm-sdk-plugin/hutool-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
<properties>
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
3635
</properties>
3736

3837

‎apm-sniffer/apm-sdk-plugin/jedis-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<maven.compiler.source>8</maven.compiler.source>
2828
<maven.compiler.target>8</maven.compiler.target>
2929
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
3130
</properties>
3231

3332
<modelVersion>4.0.0</modelVersion>

‎apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,5 @@
4141

4242
<properties>
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
44-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4544
</properties>
4645
</project>

‎apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,5 @@
3737

3838
<properties>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4140
</properties>
4241
</project>

‎apm-sniffer/apm-sdk-plugin/micronaut-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
<properties>
3131
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
3332
</properties>
3433

3534
<modules>

‎apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
<properties>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
42-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4342
</properties>
4443

4544
</project>

‎apm-sniffer/apm-sdk-plugin/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,10 @@
146146

147147
<properties>
148148
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
149-
<sdk.plugin.related.dir />
150149
<shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
151150
<shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
152151

153-
<agent.package.dest.dir>${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent
154-
</agent.package.dest.dir>
155-
<plugin.dest.dir>${agent.package.dest.dir}/plugins</plugin.dest.dir>
152+
<plugin.dest.dir>${maven.multiModuleProjectDirectory}/skywalking-agent/plugins</plugin.dest.dir>
156153

157154
<ant-contrib.version>1.0b3</ant-contrib.version>
158155
<ant-nodeps.version>1.8.1</ant-nodeps.version>

‎apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,5 @@
3838

3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4241
</properties>
4342
</project>

‎apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,5 @@
3737

3838
<properties>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4140
</properties>
4241
</project>

‎apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@
3636

3737
<properties>
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4039
</properties>
4140
</project>

‎apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353

5454
<properties>
5555
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
5756
</properties>
5857

5958
</project>

‎apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737

3838
<properties>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<sdk.plugin.related.dir>/../../..</sdk.plugin.related.dir>
4140
</properties>
4241

4342
</project>

‎apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838

3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<sdk.plugin.related.dir>/../..</sdk.plugin.related.dir>
4241
</properties>
4342

4443
</project>

‎apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,5 @@
3737

3838
<properties>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4140
</properties>
4241
</project>

‎apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838

3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4241
</properties>
4342

4443
</project>

‎apm-sniffer/bootstrap-plugins/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@
3232
<shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434

35-
<sdk.plugin.related.dir />
36-
<agent.package.dest.dir>${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent
37-
</agent.package.dest.dir>
38-
<bootstrap.plugin.dest.dir>${agent.package.dest.dir}/bootstrap-plugins</bootstrap.plugin.dest.dir>
35+
<bootstrap.plugin.dest.dir>${maven.multiModuleProjectDirectory}/skywalking-agent/bootstrap-plugins</bootstrap.plugin.dest.dir>
3936

4037
<ant-contrib.version>1.0b3</ant-contrib.version>
4138
<ant-nodeps.version>1.8.1</ant-nodeps.version>

‎apm-sniffer/expired-plugins/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@
3232
<shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434

35-
<sdk.plugin.related.dir />
36-
<agent.package.dest.dir>${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent
37-
</agent.package.dest.dir>
38-
<expired.plugin.dest.dir>${agent.package.dest.dir}/expired-plugins</expired.plugin.dest.dir>
35+
<expired.plugin.dest.dir>${maven.multiModuleProjectDirectory}/skywalking-agent/expired-plugins</expired.plugin.dest.dir>
3936

4037
<ant-contrib.version>1.0b3</ant-contrib.version>
4138
<ant-nodeps.version>1.8.1</ant-nodeps.version>

‎apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141
<properties>
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
43-
<sdk.plugin.related.dir>/../..</sdk.plugin.related.dir>
4443
</properties>
4544

4645
</project>

‎apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
</modules>
4040

4141
<properties>
42-
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
4342
</properties>
4443

4544
</project>

‎apm-sniffer/optional-plugins/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@
3232
<shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434

35-
<sdk.plugin.related.dir />
36-
<agent.package.dest.dir>${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent
37-
</agent.package.dest.dir>
38-
<optional.plugin.dest.dir>${agent.package.dest.dir}/optional-plugins</optional.plugin.dest.dir>
35+
<optional.plugin.dest.dir>${maven.multiModuleProjectDirectory}/skywalking-agent/optional-plugins</optional.plugin.dest.dir>
3936

4037
<ant-contrib.version>1.0b3</ant-contrib.version>
4138
<ant-nodeps.version>1.8.1</ant-nodeps.version>

‎apm-sniffer/optional-reporter-plugins/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838

39-
<agent.package.dest.dir>${project.build.directory}/../../../../skywalking-agent</agent.package.dest.dir>
40-
<optional.reporter.plugins.dest.dir>${agent.package.dest.dir}/optional-reporter-plugins</optional.reporter.plugins.dest.dir>
39+
<optional.reporter.plugins.dest.dir>${maven.multiModuleProjectDirectory}/skywalking-agent/optional-reporter-plugins</optional.reporter.plugins.dest.dir>
4140

4241
<ant-contrib.version>1.0b3</ant-contrib.version>
4342
<ant-nodeps.version>1.8.1</ant-nodeps.version>

0 commit comments

Comments
 (0)