Browse Source

Merge pull request #44 from kriegaex/run-all-junit-tests-dependencies

Fix missing dependencies in module 'run-all-junit-tests'
tags/V1_9_7_M2
Andy Clement 2 years ago
parent
commit
bdb89385dd
No account linked to committer's email address
3 changed files with 71 additions and 13 deletions
  1. 13
    7
      ajdoc/pom.xml
  2. 50
    4
      run-all-junit-tests/pom.xml
  3. 8
    2
      tests/pom.xml

+ 13
- 7
ajdoc/pom.xml View File

@@ -18,7 +18,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies>
<!-- The tests need this during runtime, even though no direct usage is in our classes -->
<!-- The tests need these during runtime, even though no direct usage is in our classes -->
<usedDependency>com.github.olivergondza:maven-jdk-tools-wrapper</usedDependency>
</usedDependencies>
</configuration>
@@ -27,6 +27,7 @@
</build>

<dependencies>

<dependency>
<groupId>org.aspectj</groupId>
<artifactId>util</artifactId>
@@ -47,12 +48,6 @@
<artifactId>org.aspectj.ajdt.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!-- enables easy dependency on tools.jar -->
<groupId>com.github.olivergondza</groupId>
<artifactId>maven-jdk-tools-wrapper</artifactId>
<version>0.1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>asm-renamed</artifactId>
@@ -64,5 +59,16 @@
<scope>test</scope>
</dependency>

<!--
The tests need these during runtime, even though no direct usage is in our classes.
See also 'usedDependencies' in maven-dependency-plugin configuration.
-->
<dependency>
<!-- enables easy dependency on tools.jar -->
<groupId>com.github.olivergondza</groupId>
<artifactId>maven-jdk-tools-wrapper</artifactId>
<version>0.1</version>
</dependency>

</dependencies>
</project>

+ 50
- 4
run-all-junit-tests/pom.xml View File

@@ -12,10 +12,7 @@
<artifactId>run-all-junit-tests</artifactId>

<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>asm-renamed</artifactId>
</dependency>

<dependency>
<groupId>org.aspectj</groupId>
<artifactId>util</artifactId>
@@ -142,6 +139,41 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>

<!--
The tests need these during runtime, even though no direct usage is in our classes.
See also 'usedDependencies' in maven-dependency-plugin configuration.
-->
<dependency>
<groupId>ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>${lib.ant.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>asm-renamed</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>ajde</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>build</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

<profiles>
@@ -200,6 +232,20 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies>
<!-- The tests need these during runtime, even though no direct usage is in our classes -->
<usedDependency>ant:ant-launcher</usedDependency>
<usedDependency>org.aspectj:asm-renamed</usedDependency>
<usedDependency>org.aspectj:ajde</usedDependency>
<usedDependency>org.aspectj:build</usedDependency>
<usedDependency>org.aspectj:tests</usedDependency>
</usedDependencies>
</configuration>
</plugin>
</plugins>
</build>


+ 8
- 2
tests/pom.xml View File

@@ -12,6 +12,7 @@
<artifactId>tests</artifactId>

<dependencies>

<dependency>
<groupId>org.aspectj</groupId>
<artifactId>util</artifactId>
@@ -83,13 +84,18 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<!--
The tests need these during runtime, even though no direct usage is in our classes.
See also 'usedDependencies' in maven-dependency-plugin configuration.
-->
<dependency>
<!-- Identical to lib/ant/lib/ant-launcher.jar, a former system-scoped dependency -->
<groupId>ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>${lib.ant.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
@@ -110,7 +116,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies>
<!-- The tests need this during runtime, even though no direct usage is in our classes -->
<!-- The tests need these during runtime, even though no direct usage is in our classes -->
<usedDependency>ant:ant-launcher</usedDependency>
</usedDependencies>
</configuration>

Loading…
Cancel
Save