Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #7408 fix scope of Maven plugins dependencies and re enable some IT tests (#10660) 

* Issue #7408 fix scope of maven dependencies for ee10
* Issue #7408 fix scope of maven dependencies for ee10 jspc and restore it test which were disabled
* Issue #7408 fix scope of maven dependencies for ee9 maven plugin
* Issue #7408 fix scope of maven dependencies for ee9 jspc and restore it test which were disabled
* Issue #7408 fix scope of maven dependencies for ee8 maven plugin
* Issue #7408 fix scope of maven dependencies for ee8 jspc and restore it test which were disabled

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
This commit is contained in:
Olivier Lamy 2023-10-06 02:10:07 +02:00 committed by GitHub
parent ff57574285
commit 8bdf42f652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 111 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml
View File

@ -11,7 +11,6 @@
<name>EE10 :: Jetty JSPC Maven Plugin</name>
<properties>
<bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
<skipTests>true</skipTests>
<jacoco.skip>true</jacoco.skip>
</properties>
<build>
@ -62,6 +61,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@ -74,9 +74,20 @@
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>

2
jetty-ee10/jetty-ee10-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy
View File

@ -1,3 +1,5 @@
import groovy.xml.XmlSlurper
System.out.println( "running postbuild.groovy" )
File webfrag = new File(basedir, 'target/webfrag.xml')

20
jetty-ee10/jetty-ee10-maven-plugin/pom.xml
View File

@ -173,6 +173,18 @@
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-xml</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml-meta</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -183,6 +195,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@ -193,10 +206,17 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>

5
jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/JettyStopMojo.java
View File

@ -86,7 +86,10 @@ public class JettyStopMojo extends AbstractWebAppMojo
}
catch (NumberFormatException e)
{
e.printStackTrace();
if (getLog().isDebugEnabled())
{
getLog().debug(e);
}
getLog().info("Server returned bad pid");
}
catch (ConnectException e)

13
jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml
View File

@ -12,7 +12,6 @@
<properties>
<bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
<ee9.module>jetty-ee9-jspc-maven-plugin</ee9.module>
<skipTest>true</skipTest>
<jacoco.skip>true</jacoco.skip>
</properties>
<build>
@ -63,6 +62,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@ -78,6 +78,17 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>

20
jetty-ee8/jetty-ee8-maven-plugin/pom.xml
View File

@ -132,6 +132,18 @@
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-xml</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml-meta</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -142,6 +154,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@ -152,10 +165,17 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>

13
jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml
View File

@ -11,7 +11,6 @@
<name>EE9 :: Jetty JSPC Maven Plugin</name>
<properties>
<bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
<skipTests>true</skipTests>
<jacoco.skip>true</jacoco.skip>
</properties>
<build>
@ -62,6 +61,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@ -69,6 +69,16 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
@ -77,6 +87,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>

2
jetty-ee9/jetty-ee9-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy
View File

@ -1,3 +1,5 @@
import groovy.xml.XmlSlurper
System.out.println( "running postbuild.groovy" )
File webfrag = new File(basedir, 'target/webfrag.xml')

22
jetty-ee9/jetty-ee9-maven-plugin/pom.xml
View File

@ -169,6 +169,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@ -179,14 +180,35 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-xml</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml-meta</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>

5
pom.xml
View File

@ -1096,6 +1096,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${maven.deps.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>