diff options
| author | Andy Clement <aclement@pivotal.io> | 2021-04-28 13:08:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 13:08:08 -0700 |
| commit | bdb89385dd387464ab02d7655ac8d5486d32c2fc (patch) | |
| tree | d9c66f89753913e10226a318ea6236990ce7b41c | |
| parent | 48e1b14cb46f389ed7cb78312d8c8ab61f1fba05 (diff) | |
| parent | 3f127347ceeb042f6624c9ce956cc31555bc376d (diff) | |
| download | aspectj-bdb89385dd387464ab02d7655ac8d5486d32c2fc.tar.gz aspectj-bdb89385dd387464ab02d7655ac8d5486d32c2fc.zip | |
Merge pull request #44 from kriegaex/run-all-junit-tests-dependencies
Fix missing dependencies in module 'run-all-junit-tests'
| -rw-r--r-- | ajdoc/pom.xml | 20 | ||||
| -rw-r--r-- | run-all-junit-tests/pom.xml | 54 | ||||
| -rw-r--r-- | tests/pom.xml | 10 |
3 files changed, 71 insertions, 13 deletions
diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml index 22252b570..787f27600 100644 --- a/ajdoc/pom.xml +++ b/ajdoc/pom.xml @@ -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> @@ -48,12 +49,6 @@ <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> </dependency> @@ -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> diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index fe7d15dfb..fb21ee685 100644 --- a/run-all-junit-tests/pom.xml +++ b/run-all-junit-tests/pom.xml @@ -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> diff --git a/tests/pom.xml b/tests/pom.xml index 353945550..ae2fbcca4 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -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> |