- 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:
Olivier Lamy 2019-01-24 07:29:49 +10:00 committed by GitHub
parent 60158edd2b
commit 826c27a2b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 39 deletions

View File

@ -10,7 +10,6 @@
<name>Jetty :: Jetty JSPC Maven Plugin</name> <name>Jetty :: Jetty JSPC Maven Plugin</name>
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
<it.debug>false</it.debug>
</properties> </properties>
<build> <build>
<plugins> <plugins>
@ -56,20 +55,10 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<debug>${it.debug}</debug>
<addTestClassPath>true</addTestClassPath> <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> <scriptVariables>
<maven.surefire.version>${maven.surefire.version}</maven.surefire.version> <maven.surefire.version>${maven.surefire.version}</maven.surefire.version>
</scriptVariables> </scriptVariables>
<skipInvocation>${skipTests}</skipInvocation>
<goals> <goals>
<goal>clean</goal> <goal>clean</goal>
</goals> </goals>

View File

@ -11,7 +11,6 @@
<description>Jetty maven plugins</description> <description>Jetty maven plugins</description>
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
<it.debug>false</it.debug>
<jetty.stopKey>FREEBEER</jetty.stopKey> <jetty.stopKey>FREEBEER</jetty.stopKey>
<jetty.jvmArgs></jetty.jvmArgs> <jetty.jvmArgs></jetty.jvmArgs>
</properties> </properties>
@ -62,29 +61,15 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<javaHome>${java.home}</javaHome>
<environmentVariables>
<JAVA_HOME>${java.home}</JAVA_HOME>
</environmentVariables>
<debug>${it.debug}</debug>
<addTestClassPath>true</addTestClassPath> <addTestClassPath>true</addTestClassPath>
<projectsDirectory>src/it</projectsDirectory>
<timeoutInSeconds>600</timeoutInSeconds>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<setupIncludes> <setupIncludes>
<setupInclude>it-parent-pom/pom.xml</setupInclude> <setupInclude>it-parent-pom/pom.xml</setupInclude>
</setupIncludes> </setupIncludes>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<scriptVariables> <scriptVariables>
<jettyStopKey>${jetty.stopKey}</jettyStopKey> <jettyStopKey>${jetty.stopKey}</jettyStopKey>
<jettyStopPort>${jetty.stopPort}</jettyStopPort> <jettyStopPort>${jetty.stopPort}</jettyStopPort>
<maven.surefire.version>${maven.surefire.version}</maven.surefire.version> <maven.surefire.version>${maven.surefire.version}</maven.surefire.version>
</scriptVariables> </scriptVariables>
<skipInvocation>${skipTests}</skipInvocation>
<goals> <goals>
<goal>clean</goal> <goal>clean</goal>
</goals> </goals>

View File

@ -11,7 +11,6 @@
<properties> <properties>
<assembly-directory>target/distribution</assembly-directory> <assembly-directory>target/distribution</assembly-directory>
<bundle-symbolic-name>${project.groupId}.runner</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.runner</bundle-symbolic-name>
<it.debug>false</it.debug>
</properties> </properties>
<build> <build>
@ -51,17 +50,6 @@
</execution> </execution>
</executions> </executions>
<configuration> <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> <scriptVariables>
<maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version> <maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version>
</scriptVariables> </scriptVariables>

19
pom.xml
View File

@ -52,6 +52,7 @@
<maven.plugin-tools.version>3.5.2</maven.plugin-tools.version> <maven.plugin-tools.version>3.5.2</maven.plugin-tools.version>
<!-- testing --> <!-- testing -->
<it.debug>false</it.debug>
<jetty.test.version>5.2</jetty.test.version> <jetty.test.version>5.2</jetty.test.version>
<spring-boot.version>2.1.1.RELEASE</spring-boot.version> <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
<jsr250-api.version>1.0</jsr250-api.version> <jsr250-api.version>1.0</jsr250-api.version>
@ -478,7 +479,23 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId> <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>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>