Restored Automatic-Module-Name that was removed in 471dab752.

Cleaned up pom.xml files that required a correct JPMS module name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2019-02-11 10:16:07 +01:00
parent 9c655cbd29
commit 875af5c692
7 changed files with 44 additions and 22 deletions

View File

@ -1,18 +1,21 @@
<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/maven-v4_0_0.xsd"> <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/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>example-async-rest</artifactId> <artifactId>example-async-rest</artifactId>
<version>9.4.15-SNAPSHOT</version> <version>9.4.15-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.example-async-rest</groupId> <groupId>org.eclipse.jetty.example-async-rest</groupId>
<artifactId>example-async-rest-jar</artifactId> <artifactId>example-async-rest-jar</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Example Async Rest :: Jar</name> <name>Example Async Rest :: Jar</name>
<url>http://www.eclipse.org/jetty</url>
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.examples.async.rest</bundle-symbolic-name> <bundle-symbolic-name>${project.parent.groupId}.examples.async.rest</bundle-symbolic-name>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>

View File

@ -1,17 +1,21 @@
<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/maven-v4_0_0.xsd"> <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/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>example-async-rest</artifactId> <artifactId>example-async-rest</artifactId>
<version>9.4.15-SNAPSHOT</version> <version>9.4.15-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.example-async-rest</groupId> <groupId>org.eclipse.jetty.example-async-rest</groupId>
<artifactId>example-async-rest-webapp</artifactId> <artifactId>example-async-rest-webapp</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>Example Async Rest :: Webapp</name> <name>Example Async Rest :: Webapp</name>
<build> <build>
<finalName>async-rest</finalName> <finalName>async-rest</finalName>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jetty.example-async-rest</groupId> <groupId>org.eclipse.jetty.example-async-rest</groupId>

View File

@ -1,17 +1,20 @@
<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/maven-v4_0_0.xsd"> <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/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.eclipse.jetty.examples</groupId> <groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId> <artifactId>examples-parent</artifactId>
<version>9.4.15-SNAPSHOT</version> <version>9.4.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>example-async-rest</artifactId> <artifactId>example-async-rest</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Example Async Rest</name> <name>Example Async Rest</name>
<modules> <modules>
<module>async-rest-jar</module> <module>async-rest-jar</module>
<module>async-rest-webapp</module> <module>async-rest-webapp</module>
</modules> </modules>
</project> </project>

View File

@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?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/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId> <artifactId>jetty-project</artifactId>
<version>9.4.15-SNAPSHOT</version> <version>9.4.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.examples</groupId> <groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId> <artifactId>examples-parent</artifactId>
<name>Jetty Examples :: Parent</name> <name>Jetty Examples :: Parent</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<sonar.skip>true</sonar.skip> <sonar.skip>true</sonar.skip>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -26,6 +29,7 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<modules> <modules>
<!-- <!--
- The async-rest and embedded are examples that have historical locations, - The async-rest and embedded are examples that have historical locations,

View File

@ -1,14 +1,20 @@
<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/maven-v4_0_0.xsd"> <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/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId> <artifactId>jetty-project</artifactId>
<version>9.4.15-SNAPSHOT</version> <version>9.4.15-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jmh</artifactId> <artifactId>jetty-jmh</artifactId>
<name>Jetty :: Jmh</name> <name>Jetty :: Jmh</name>
<description>Jmh classes for Jetty</description> <description>Jmh classes for Jetty</description>
<url>http://www.eclipse.org/jetty</url>
<properties>
<bundle-symbolic-name>${project.groupId}.jmh</bundle-symbolic-name>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -39,8 +45,7 @@
<finalName>${jmhjar.name}</finalName> <finalName>${jmhjar.name}</finalName>
<shadeTestJar>true</shadeTestJar> <shadeTestJar>true</shadeTestJar>
<transformers> <transformers>
<transformer <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.openjdk.jmh.Main</mainClass> <mainClass>org.openjdk.jmh.Main</mainClass>
</transformer> </transformer>
</transformers> </transformers>
@ -72,6 +77,7 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>

View File

@ -9,7 +9,7 @@
<name>Jetty :: OSGi ALPN Fragment</name> <name>Jetty :: OSGi ALPN Fragment</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<bundle-symbolic-name>org.eclipse.jetty.osgi.alpn.fragment</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.alpn.fragment</bundle-symbolic-name>
</properties> </properties>
<build> <build>
<plugins> <plugins>

View File

@ -41,6 +41,7 @@
<unix.socket.tmp></unix.socket.tmp> <unix.socket.tmp></unix.socket.tmp>
<!-- enable or not TestTracker junit5 extension i.e log message when test method is starting --> <!-- enable or not TestTracker junit5 extension i.e log message when test method is starting -->
<jetty.testtracker.log>false</jetty.testtracker.log> <jetty.testtracker.log>false</jetty.testtracker.log>
<jpms-module-name>${bundle-symbolic-name}</jpms-module-name>
<!-- some maven plugins versions --> <!-- some maven plugins versions -->
<maven.surefire.version>3.0.0-M2</maven.surefire.version> <maven.surefire.version>3.0.0-M2</maven.surefire.version>
@ -514,6 +515,7 @@
<archive> <archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries> <manifestEntries>
<Automatic-Module-Name>${jpms-module-name}</Automatic-Module-Name>
<Implementation-Version>${project.version}</Implementation-Version> <Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>Eclipse Jetty Project</Implementation-Vendor> <Implementation-Vendor>Eclipse Jetty Project</Implementation-Vendor>
<url>${jetty.url}</url> <url>${jetty.url}</url>