- move duplicate configuration to parent pom (#3265)
- upgrade invoker plugin version Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
parent
60158edd2b
commit
826c27a2b2
|
@ -10,7 +10,6 @@
|
|||
<name>Jetty :: Jetty JSPC Maven Plugin</name>
|
||||
<properties>
|
||||
<bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
|
||||
<it.debug>false</it.debug>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
|
@ -56,20 +55,10 @@
|
|||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<debug>${it.debug}</debug>
|
||||
<addTestClassPath>true</addTestClassPath>
|
||||
<timeoutInSeconds>60</timeoutInSeconds>
|
||||
<projectsDirectory>src/it</projectsDirectory>
|
||||
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
|
||||
<pomIncludes>
|
||||
<pomInclude>*/pom.xml</pomInclude>
|
||||
</pomIncludes>
|
||||
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
|
||||
<settingsFile>src/it/settings.xml</settingsFile>
|
||||
<scriptVariables>
|
||||
<maven.surefire.version>${maven.surefire.version}</maven.surefire.version>
|
||||
</scriptVariables>
|
||||
<skipInvocation>${skipTests}</skipInvocation>
|
||||
<goals>
|
||||
<goal>clean</goal>
|
||||
</goals>
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
<description>Jetty maven plugins</description>
|
||||
<properties>
|
||||
<bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
|
||||
<it.debug>false</it.debug>
|
||||
<jetty.stopKey>FREEBEER</jetty.stopKey>
|
||||
<jetty.jvmArgs></jetty.jvmArgs>
|
||||
</properties>
|
||||
|
@ -62,29 +61,15 @@
|
|||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<javaHome>${java.home}</javaHome>
|
||||
<environmentVariables>
|
||||
<JAVA_HOME>${java.home}</JAVA_HOME>
|
||||
</environmentVariables>
|
||||
<debug>${it.debug}</debug>
|
||||
<addTestClassPath>true</addTestClassPath>
|
||||
<projectsDirectory>src/it</projectsDirectory>
|
||||
<timeoutInSeconds>600</timeoutInSeconds>
|
||||
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
|
||||
<pomIncludes>
|
||||
<pomInclude>*/pom.xml</pomInclude>
|
||||
</pomIncludes>
|
||||
<setupIncludes>
|
||||
<setupInclude>it-parent-pom/pom.xml</setupInclude>
|
||||
</setupIncludes>
|
||||
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
|
||||
<settingsFile>src/it/settings.xml</settingsFile>
|
||||
<scriptVariables>
|
||||
<jettyStopKey>${jetty.stopKey}</jettyStopKey>
|
||||
<jettyStopPort>${jetty.stopPort}</jettyStopPort>
|
||||
<maven.surefire.version>${maven.surefire.version}</maven.surefire.version>
|
||||
</scriptVariables>
|
||||
<skipInvocation>${skipTests}</skipInvocation>
|
||||
<goals>
|
||||
<goal>clean</goal>
|
||||
</goals>
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
<properties>
|
||||
<assembly-directory>target/distribution</assembly-directory>
|
||||
<bundle-symbolic-name>${project.groupId}.runner</bundle-symbolic-name>
|
||||
<it.debug>false</it.debug>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
|
@ -51,17 +50,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<javaHome>${java.home}</javaHome>
|
||||
<environmentVariables>
|
||||
<JAVA_HOME>${java.home}</JAVA_HOME>
|
||||
</environmentVariables>
|
||||
<debug>${it.debug}</debug>
|
||||
<projectsDirectory>src/it</projectsDirectory>
|
||||
<timeoutInSeconds>600</timeoutInSeconds>
|
||||
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
|
||||
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
|
||||
<settingsFile>src/it/settings.xml</settingsFile>
|
||||
<skipInvocation>${skipTests}</skipInvocation>
|
||||
<scriptVariables>
|
||||
<maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version>
|
||||
</scriptVariables>
|
||||
|
|
19
pom.xml
19
pom.xml
|
@ -52,6 +52,7 @@
|
|||
<maven.plugin-tools.version>3.5.2</maven.plugin-tools.version>
|
||||
|
||||
<!-- testing -->
|
||||
<it.debug>false</it.debug>
|
||||
<jetty.test.version>5.2</jetty.test.version>
|
||||
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
|
||||
<jsr250-api.version>1.0</jsr250-api.version>
|
||||
|
@ -478,7 +479,23 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-invoker-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<version>3.2.0</version>
|
||||
<configuration>
|
||||
<debug>${it.debug}</debug>
|
||||
<javaHome>${java.home}</javaHome>
|
||||
<environmentVariables>
|
||||
<JAVA_HOME>${java.home}</JAVA_HOME>
|
||||
</environmentVariables>
|
||||
<projectsDirectory>src/it</projectsDirectory>
|
||||
<timeoutInSeconds>300</timeoutInSeconds>
|
||||
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
|
||||
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
|
||||
<settingsFile>src/it/settings.xml</settingsFile>
|
||||
<skipInvocation>${skipTests}</skipInvocation>
|
||||
<pomIncludes>
|
||||
<pomInclude>*/pom.xml</pomInclude>
|
||||
</pomIncludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
|
Loading…
Reference in New Issue