Issue #3241 Jetty runner add missing Main-Class in MANIFEST #3260
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,8 +11,9 @@ | |
| <properties> | ||
| <assembly-directory>target/distribution</assembly-directory> | ||
| <bundle-symbolic-name>${project.groupId}.runner</bundle-symbolic-name> | ||
| <it.debug>false</it.debug> | ||
| </properties> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
|
|
@@ -35,21 +36,38 @@ | |
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-invoker-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>integration-test</id> | ||
| <phase>integration-test</phase> | ||
| <goals> | ||
| <goal>install</goal> | ||
| <goal>integration-test</goal> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| </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> | ||
|
There was a problem hiding this comment. What if my local repo path is different? or even on a different drive? There was a problem hiding this comment. Wait, this is in There was a problem hiding this comment. it's the repo path for the forked maven invocation :) so don't worry http://maven.apache.org/plugins/maven-invoker-plugin/run-mojo.html#localRepositoryPath |
||
| <settingsFile>src/it/settings.xml</settingsFile> | ||
|
There was a problem hiding this comment. ew! i don't understand this one. There was a problem hiding this comment. we use a settings file which simply use your local repo as a mirror (so we do not download all the internet again :) ) |
||
| <skipInvocation>${skipTests}</skipInvocation> | ||
| <scriptVariables> | ||
| <maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version> | ||
| </scriptVariables> | ||
| <goals> | ||
| <goal>clean</goal> | ||
| </goals> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
|
|
@@ -63,6 +81,28 @@ | |
| <skip>true</skip> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <configuration> | ||
| <!-- jetty-runner is not an OSGi component --> | ||
| <skip>true</skip> | ||
| <!-- there is no way to skip MANIFEST creation by the plugin so just configure dummy location --> | ||
| <manifestLocation>${project.build.directory}/NON_USED_MANIFEST</manifestLocation> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <configuration> | ||
| <archive> | ||
| <manifestFile>src/main/resources/MANIFEST.MF</manifestFile> | ||
| <manifest> | ||
| <mainClass>org.eclipse.jetty.runner.Runner</mainClass> | ||
| </manifest> | ||
| </archive> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| </build> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <settings> | ||
| <profiles> | ||
| <profile> | ||
| <id>it-repo</id> | ||
| <activation> | ||
| <activeByDefault>true</activeByDefault> | ||
| </activation> | ||
| <repositories> | ||
| <repository> | ||
| <id>local.central</id> | ||
| <url>@localRepositoryUrl@</url> | ||
| <releases> | ||
| <enabled>true</enabled> | ||
| </releases> | ||
| <snapshots> | ||
| <enabled>true</enabled> | ||
| </snapshots> | ||
| </repository> | ||
| </repositories> | ||
| <pluginRepositories> | ||
| <pluginRepository> | ||
| <id>local.central</id> | ||
| <url>@localRepositoryUrl@</url> | ||
| <releases> | ||
| <enabled>true</enabled> | ||
| </releases> | ||
| <snapshots> | ||
| <enabled>true</enabled> | ||
| </snapshots> | ||
| </pluginRepository> | ||
| </pluginRepositories> | ||
| </profile> | ||
| </profiles> | ||
| </settings> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| invoker.goals = generate-resources |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
|
|
||
|
|
||
| <groupId>org.eclipse.jetty.its</groupId> | ||
| <artifactId>jetty-runner-it-test</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <packaging>war</packaging> | ||
|
|
||
|
|
||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
|
|
||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-runner</artifactId> | ||
| <version>@project.version@</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <version>@maven.dependency.plugin.version@</version> | ||
| <executions> | ||
| <execution> | ||
| <id>copy-jetty-runner</id> | ||
| <phase>generate-resources</phase> | ||
| <goals> | ||
| <goal>copy</goal> | ||
| </goals> | ||
| <configuration> | ||
| <artifactItems> | ||
| <artifactItem> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-runner</artifactId> | ||
| <version>@project.version@</version> | ||
| <type>jar</type> | ||
| <overWrite>false</overWrite> | ||
| <outputDirectory>${project.build.directory}/</outputDirectory> | ||
| <destFileName>jetty-runner.jar</destFileName> | ||
| </artifactItem> | ||
| </artifactItems> | ||
| <overWriteReleases>false</overWriteReleases> | ||
| <overWriteSnapshots>true</overWriteSnapshots> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
|
|
||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import java.util.jar.* | ||
|
|
||
| File artifact = new File( basedir, "target/jetty-runner.jar" ) | ||
| assert artifact.exists() | ||
|
|
||
| JarFile jar = new JarFile( artifact ); | ||
|
|
||
| Attributes manifest = jar.getManifest().getMainAttributes(); | ||
|
|
||
| assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.runner.Runner" ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Comment: Jetty Runner |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OMG, what is going on here??
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just to be sure the forked maven used the current java version