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

fix maven plugin starting distribution as jetty home has different name, configure invoker plugin to be faster when running locally 

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2020-09-23 17:18:22 +10:00
parent 63736990c5
commit a2cd9b3a50
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/invoker.properties
View File

@ -1,2 +1,2 @@
invoker.goals = verify -fae invoker.goals = verify -fae -e
#invoker.debug = true #invoker.debug = true

1
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractWebAppMojo.java
View File

@ -548,6 +548,7 @@ public abstract class AbstractWebAppMojo extends AbstractMojo
if (jettyHome == null) if (jettyHome == null)
jetty.setJettyHomeZip(mavenProjectHelper.resolveArtifact(JETTY_HOME_GROUPID, JETTY_HOME_ARTIFACTID, plugin.getVersion(), "zip")); jetty.setJettyHomeZip(mavenProjectHelper.resolveArtifact(JETTY_HOME_GROUPID, JETTY_HOME_ARTIFACTID, plugin.getVersion(), "zip"));
jetty.version = plugin.getVersion();
jetty.setJettyHome(jettyHome); jetty.setJettyHome(jettyHome);
jetty.setJettyBase(jettyBase); jetty.setJettyBase(jettyBase);
jetty.setBaseDir(target); jetty.setBaseDir(target);

7
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyHomeForker.java
View File

@ -30,6 +30,7 @@ import java.nio.file.FileVisitOption;
import java.nio.file.FileVisitResult; import java.nio.file.FileVisitResult;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor; import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList; import java.util.ArrayList;
@ -84,6 +85,7 @@ public class JettyHomeForker extends AbstractForker
protected Path libPath; protected Path libPath;
protected Path webappPath; protected Path webappPath;
protected Path mavenLibPath; protected Path mavenLibPath;
protected String version;
public List<File> getLibExtJarFiles() public List<File> getLibExtJarFiles()
{ {
@ -400,10 +402,7 @@ public class JettyHomeForker extends AbstractForker
JarResource res = (JarResource)JarResource.newJarResource(Resource.newResource(jettyHomeZip)); JarResource res = (JarResource)JarResource.newJarResource(Resource.newResource(jettyHomeZip));
res.copyTo(baseDir); res.copyTo(baseDir);
//zip will unpack to target/jetty-home-<VERSION> //zip will unpack to target/jetty-home-<VERSION>
String name = jettyHome.getName(); jettyHome = new File(baseDir,"jetty-home-" + version);
int i = name.lastIndexOf('.');
name = (i > 0 ? name.substring(0, i) : "home");
jettyHome = new File(baseDir, name);
} }
} }
} }

4
pom.xml
View File

@ -65,6 +65,7 @@
<jackson-databind.version>2.9.9</jackson-databind.version> <jackson-databind.version>2.9.9</jackson-databind.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath> <localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<settingsPath>src/it/settings.xml</settingsPath> <settingsPath>src/it/settings.xml</settingsPath>
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount> <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<testcontainers.version>1.14.3</testcontainers.version> <testcontainers.version>1.14.3</testcontainers.version>
</properties> </properties>
@ -512,7 +513,7 @@
<artifactId>maven-invoker-plugin</artifactId> <artifactId>maven-invoker-plugin</artifactId>
<version>3.2.1</version> <version>3.2.1</version>
<configuration> <configuration>
<mergeUserSettings>true</mergeUserSettings> <mergeUserSettings>${invoker.mergeUserSettings}</mergeUserSettings>
<writeJunitReport>true</writeJunitReport> <writeJunitReport>true</writeJunitReport>
<junitPackageName>org.eclipse.jetty.maven.its</junitPackageName> <junitPackageName>org.eclipse.jetty.maven.its</junitPackageName>
<debug>${it.debug}</debug> <debug>${it.debug}</debug>
@ -1329,6 +1330,7 @@
<id>ci</id> <id>ci</id>
<properties> <properties>
<settingsPath>${env.GLOBAL_MVN_SETTINGS}</settingsPath> <settingsPath>${env.GLOBAL_MVN_SETTINGS}</settingsPath>
<invoker.mergeUserSettings>true</invoker.mergeUserSettings>
<surefire.rerunFailingTestsCount>3</surefire.rerunFailingTestsCount> <surefire.rerunFailingTestsCount>3</surefire.rerunFailingTestsCount>
</properties> </properties>
<modules> <modules>