Skip to content

Commit 705ae21

Browse files
authored
[MPLUGIN-525] Remove ant and beanshell support (#285)
1 parent 9813e5b commit 705ae21

File tree

68 files changed

+3
-4541
lines changed

Some content is hidden

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

68 files changed

+3
-4541
lines changed

maven-plugin-plugin/pom.xml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,6 @@
7878
'maven-plugin-tools-annotations' which fails to load at runtime when not available.
7979
-->
8080
</dependency>
81-
<!-- define optional runtime dependencies for integration tests -->
82-
<dependency>
83-
<groupId>org.apache.maven.plugin-tools</groupId>
84-
<artifactId>maven-plugin-tools-ant</artifactId>
85-
<scope>runtime</scope>
86-
<optional>true</optional>
87-
</dependency>
88-
<dependency>
89-
<groupId>org.apache.maven.plugin-tools</groupId>
90-
<artifactId>maven-plugin-tools-beanshell</artifactId>
91-
<scope>runtime</scope>
92-
<optional>true</optional>
93-
</dependency>
9481

9582
<!-- Maven -->
9683
<dependency>
@@ -166,18 +153,6 @@
166153
</dependency>
167154

168155
<!-- needed for it tests -->
169-
<dependency>
170-
<groupId>org.apache.maven.plugin-tools</groupId>
171-
<artifactId>maven-script-beanshell</artifactId>
172-
<version>${project.version}</version>
173-
<scope>test</scope>
174-
</dependency>
175-
<dependency>
176-
<groupId>org.apache.maven.plugin-tools</groupId>
177-
<artifactId>maven-script-ant</artifactId>
178-
<version>${project.version}</version>
179-
<scope>test</scope>
180-
</dependency>
181156

182157
</dependencies>
183158

@@ -289,9 +264,7 @@
289264
<debug>true</debug>
290265
<streamLogsOnFailures>true</streamLogsOnFailures>
291266
<showErrors>true</showErrors>
292-
<filterProperties>
293-
<antVersion>${antVersion}</antVersion>
294-
</filterProperties>
267+
<filterProperties />
295268
<properties>
296269
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
297270
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
@@ -304,8 +277,6 @@
304277
<!-- used in ITs -->
305278
<extraArtifact>org.apache.maven.plugin-tools:maven-plugin-tools-annotations:${project.version}:jar:test-sources</extraArtifact>
306279
<extraArtifact>org.apache.maven.plugin-tools:maven-plugin-tools-annotations:${project.version}:test-jar</extraArtifact>
307-
<extraArtifact>org.apache.maven.plugin-tools:maven-script-ant:${project.version}</extraArtifact>
308-
<extraArtifact>org.apache.maven.plugin-tools:maven-script-beanshell:${project.version}</extraArtifact>
309280
</extraArtifacts>
310281
</configuration>
311282
<executions>

maven-plugin-plugin/src/it/ant-basic/invoker.properties

Lines changed: 0 additions & 20 deletions
This file was deleted.

maven-plugin-plugin/src/it/ant-basic/pom.xml

Lines changed: 0 additions & 69 deletions
This file was deleted.

maven-plugin-plugin/src/it/ant-basic/src/main/scripts/touch.build.xml

Lines changed: 0 additions & 27 deletions
This file was deleted.

maven-plugin-plugin/src/it/ant-basic/src/main/scripts/touch.mojos.xml

Lines changed: 0 additions & 44 deletions
This file was deleted.

maven-plugin-plugin/src/it/ant-basic/verify.groovy

Lines changed: 0 additions & 30 deletions
This file was deleted.

maven-plugin-plugin/src/it/ant-reference-parameter/invoker.properties

Lines changed: 0 additions & 20 deletions
This file was deleted.

maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml

Lines changed: 0 additions & 65 deletions
This file was deleted.

maven-plugin-plugin/src/it/ant-reference-parameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

maven-plugin-plugin/src/it/ant-reference-parameter/src/main/resources/org/apache/maven/plugins/antWithRefs/antlib.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)