Skip to content

Commit 6778eb1

Browse files
borettiboretti
committed
Add separated test for invoker in jdk<11 and jdk>10
1 parent 9eee9b7 commit 6778eb1

File tree

2 files changed

+48
-41
lines changed

2 files changed

+48
-41
lines changed

‎pom.xml‎

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -380,26 +380,26 @@
380380
</dependencies>
381381
</plugin>
382382
<plugin>
383-
<artifactId>maven-invoker-plugin</artifactId>
384-
<configuration>
385-
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
386-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
387-
<preBuildHookScript>prepare.bsh</preBuildHookScript>
388-
<postBuildHookScript>verify.bsh</postBuildHookScript>
389-
<settingsFile>src/it/settings.xml</settingsFile>
390-
<invokerPropertiesFile>params.properties</invokerPropertiesFile>
391-
<streamLogs>true</streamLogs>
392-
</configuration>
393-
<executions>
394-
<execution>
395-
<id>integration-test</id>
396-
<goals>
397-
<goal>install</goal>
398-
<goal>run</goal>
399-
</goals>
400-
</execution>
401-
</executions>
402-
</plugin>
383+
<artifactId>maven-invoker-plugin</artifactId>
384+
<configuration>
385+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
386+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
387+
<preBuildHookScript>prepare.bsh</preBuildHookScript>
388+
<postBuildHookScript>verify.bsh</postBuildHookScript>
389+
<settingsFile>src/it/settings.xml</settingsFile>
390+
<invokerPropertiesFile>params.properties</invokerPropertiesFile>
391+
<streamLogs>true</streamLogs>
392+
</configuration>
393+
<executions>
394+
<execution>
395+
<id>integration-test</id>
396+
<goals>
397+
<goal>install</goal>
398+
<goal>run</goal>
399+
</goals>
400+
</execution>
401+
</executions>
402+
</plugin>
403403
</plugins>
404404
<resources>
405405
<resource>
@@ -532,27 +532,34 @@
532532
<scope>test</scope>
533533
<optional>true</optional>
534534
</dependency>
535+
<dependency>
536+
<groupId>com.sun.activation</groupId>
537+
<artifactId>javax.activation</artifactId>
538+
<version>1.2.0</version>
539+
<scope>test</scope>
540+
<optional>true</optional>
541+
</dependency>
535542
<dependency>
536543
<groupId>javax.xml.bind</groupId>
537544
<artifactId>jaxb-api</artifactId>
538545
<version>2.3.1</version>
539546
<scope>test</scope>
540547
<optional>true</optional>
541548
</dependency>
542-
<dependency>
543-
<groupId>com.sun.xml.bind</groupId>
544-
<artifactId>jaxb-impl</artifactId>
545-
<version>2.3.2</version>
546-
<scope>test</scope>
549+
<dependency>
550+
<groupId>com.sun.xml.bind</groupId>
551+
<artifactId>jaxb-impl</artifactId>
552+
<version>2.3.2</version>
553+
<scope>test</scope>
547554
<optional>true</optional>
548-
</dependency>
549-
<dependency>
550-
<groupId>com.sun.xml.bind</groupId>
551-
<artifactId>jaxb-core</artifactId>
552-
<version>2.3.0.1</version>
553-
<scope>test</scope>
555+
</dependency>
556+
<dependency>
557+
<groupId>com.sun.xml.bind</groupId>
558+
<artifactId>jaxb-core</artifactId>
559+
<version>2.3.0.1</version>
560+
<scope>test</scope>
554561
<optional>true</optional>
555-
</dependency>
562+
</dependency>
556563
<dependency>
557564
<groupId>sax</groupId>
558565
<artifactId>sax</artifactId>
@@ -561,11 +568,11 @@
561568
<optional>true</optional>
562569
</dependency>
563570
<dependency>
564-
<groupId>org.apache.commons</groupId>
565-
<artifactId>commons-collections4</artifactId>
566-
<scope>compile</scope>
567-
<optional>true</optional>
568-
<version>4.4</version>
571+
<groupId>org.apache.commons</groupId>
572+
<artifactId>commons-collections4</artifactId>
573+
<scope>compile</scope>
574+
<optional>true</optional>
575+
<version>4.4</version>
569576
</dependency>
570577
</dependencies>
571578
</project>

‎src/it/module-simple-jdk11/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<longModulepath>false</longModulepath>
138138
<arguments>
139139
<argument>--module-path</argument>
140-
<argument>${project.build.directory}/../../../local-repo/javax/javax/activation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar${path.separator}${project.build.directory}/../../../local-repo/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar${path.separator}${project.build.directory}/../../../local-repo/ch/powerunit/extensions/powerunit-extensions-exceptions/@project.version@/powerunit-extensions-exceptions-@project.version@.jar${path.separator}${project.build.directory}/${project.build.finalName}.jar</argument>
140+
<argument>${project.build.directory}/../../../local-repo/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar${path.separator}${project.build.directory}/../../../local-repo/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar${path.separator}${project.build.directory}/../../../local-repo/ch/powerunit/extensions/powerunit-extensions-exceptions/@project.version@/powerunit-extensions-exceptions-@project.version@.jar${path.separator}${project.build.directory}/${project.build.finalName}.jar</argument>
141141
<argument>-cp</argument>
142142
<argument>${project.build.directory}/../../../local-repo/javax/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1.jar${path.separator}${project.build.directory}/../../../local-repo/javax/com/sun/xml/bind/jaxb-impl/2.3.2/jaxb-impl-2.3.2.jar</argument>
143143
<argument>--add-modules</argument>
@@ -192,9 +192,9 @@
192192
</dependency>
193193

194194
<dependency>
195-
<groupId>javax.annotation</groupId>
196-
<artifactId>javax.annotation-api</artifactId>
197-
<version>1.3.2</version>
195+
<groupId>com.sun.activation</groupId>
196+
<artifactId>javax.activation</artifactId>
197+
<version>1.2.0</version>
198198
</dependency>
199199

200200
<dependency>

0 commit comments

Comments
 (0)