diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-03-06 12:22:21 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-03-06 12:25:43 +0100 |
| commit | dd64d974b4808ca7b0096749ccd71b1fcd794c13 (patch) | |
| tree | be95fe30ba18e0262aac6a934469e89bd69a2f30 /jdisc_core_test | |
| parent | 6342e9119f5f75b8277ec92fff7c337ec01be005 (diff) | |
Upgrade maven-dependency-plugin to 3.1.1
- Build jdisc_core_test test bundles right after compile
phase to still allow running 'mvn test'.
- Note that 'mvn compile' still fails because the
integration_test module tries to copy test jars in that phase.
Diffstat (limited to 'jdisc_core_test')
| -rw-r--r-- | jdisc_core_test/integration_test/pom.xml | 2 | ||||
| -rw-r--r-- | jdisc_core_test/test_bundles/cert-b/pom.xml | 11 | ||||
| -rw-r--r-- | jdisc_core_test/test_bundles/cert-p-jar/pom.xml | 34 | ||||
| -rw-r--r-- | jdisc_core_test/test_bundles/pom.xml | 14 |
4 files changed, 60 insertions, 1 deletions
diff --git a/jdisc_core_test/integration_test/pom.xml b/jdisc_core_test/integration_test/pom.xml index b1cebcdfcc6..c876df3273c 100644 --- a/jdisc_core_test/integration_test/pom.xml +++ b/jdisc_core_test/integration_test/pom.xml @@ -22,7 +22,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/jdisc_core_test/test_bundles/cert-b/pom.xml b/jdisc_core_test/test_bundles/cert-b/pom.xml index dc9f06a33f0..53b28cc5923 100644 --- a/jdisc_core_test/test_bundles/cert-b/pom.xml +++ b/jdisc_core_test/test_bundles/cert-b/pom.xml @@ -20,6 +20,17 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> + <executions> + <!-- Trick to package bundle before test phase, see test_bundles pom --> + <execution> + <id>package-cert-b</id> + <phase>process-classes</phase> + <goals> + <goal>generate-osgi-manifest</goal> + <goal>assemble-container-plugin</goal> + </goals> + </execution> + </executions> <configuration> <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> </configuration> diff --git a/jdisc_core_test/test_bundles/cert-p-jar/pom.xml b/jdisc_core_test/test_bundles/cert-p-jar/pom.xml index 94a3f5c2322..ad82c53b76b 100644 --- a/jdisc_core_test/test_bundles/cert-p-jar/pom.xml +++ b/jdisc_core_test/test_bundles/cert-p-jar/pom.xml @@ -14,4 +14,38 @@ <version>7-SNAPSHOT</version> <packaging>jar</packaging> <name>${project.artifactId}</name> + <build> + <plugins> + <plugin> + <!-- Trick to package bundle before test phase, see test_bundles pom --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>package-cert-p</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <!-- Trick to avoid replacing the jar created above in the package phase, which is not allowed. --> + <id>default-jar</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + <plugin> + <!-- Packaged as jar, not bundle, so must skip maven-bundle-plugin --> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>package-test-bundles</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/jdisc_core_test/test_bundles/pom.xml b/jdisc_core_test/test_bundles/pom.xml index a8713fb4e41..c11a94eacc5 100644 --- a/jdisc_core_test/test_bundles/pom.xml +++ b/jdisc_core_test/test_bundles/pom.xml @@ -28,6 +28,20 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> </plugin> + <plugin> + <!-- Trick to package bundles before test phase to allow running 'mvn test' --> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>package-test-bundles</id> + <phase>process-classes</phase> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <modules> |