466774 - Update jetty-all module for Jetty 9.3
+ Switching from assembly plugin to shade plugin to get added benefit of META-INF/services/ merging + Assembled jar also has fixed MANIFEST.MF to make it more sane with regards to OSGi + Fixing licensing files included to use Eclipse licenses in as-built jar file.
This commit is contained in:
parent
b8b4c4deb7
commit
33f153073c
|
@ -9,38 +9,87 @@
|
||||||
<groupId>org.eclipse.jetty.aggregate</groupId>
|
<groupId>org.eclipse.jetty.aggregate</groupId>
|
||||||
<artifactId>jetty-all</artifactId>
|
<artifactId>jetty-all</artifactId>
|
||||||
<name>Jetty :: Aggregate :: All core Jetty</name>
|
<name>Jetty :: Aggregate :: All core Jetty</name>
|
||||||
|
<description>UberJar for Core Jetty features</description>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<url>http://www.eclipse.org/jetty</url>
|
<url>http://www.eclipse.org/jetty</url>
|
||||||
|
<properties>
|
||||||
|
<uber-jar>${project.build.directory}/${project.artifactId}-${project.version}-uber.jar</uber-jar>
|
||||||
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
<version>2.5.1</version>
|
<version>2.3</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>uberjar</id>
|
<id>uberjar</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>single</goal>
|
<goal>shade</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<descriptors>
|
<shadedClassifierName>uber</shadedClassifierName>
|
||||||
<descriptor>src/main/assembly/uberjar.xml</descriptor>
|
<outputFile>${uber-jar}</outputFile>
|
||||||
</descriptors>
|
<transformers>
|
||||||
<attach>true</attach>
|
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
|
||||||
<archive>
|
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||||
<manifest>
|
<manifestEntries>
|
||||||
</manifest>
|
<mode>development</mode>
|
||||||
<manifestEntries>
|
<url>http://eclipse.org/jetty</url>
|
||||||
<mode>development</mode>
|
<Built-By>${user.name}</Built-By>
|
||||||
<url>http://eclipse.org/jetty</url>
|
<package>org.eclipse.jetty</package>
|
||||||
<Built-By>${user.name}</Built-By>
|
<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
|
||||||
<package>org.eclipse.jetty</package>
|
<Import-Package>javax.naming,javax.net.ssl,javax.security.auth,javax.servlet;version="[3.1,4)",javax.servlet.descriptor;version="[3.1,4)",javax.servlet.http;version="[3.1,4)",javax.sql,javax.annotation;version="[1.2,2)",javax.annotation.security;version="[1.2,2)",javax.servlet.annotation;version="[3.1,4)",org.objectweb.asm;version="[5.1,6)",javax.websocket;version="[1.0,2)",javax.websocket.server;version="[1.0,2)"</Import-Package>
|
||||||
<Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
|
<Bundle-SymbolicName>${project.groupId}.all</Bundle-SymbolicName>
|
||||||
<Bundle-Name>Jetty</Bundle-Name>
|
<Bundle-Description>${project.description}</Bundle-Description>
|
||||||
</manifestEntries>
|
<Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
|
||||||
</archive>
|
<Bundle-Name>Jetty Core UberJar</Bundle-Name>
|
||||||
|
</manifestEntries>
|
||||||
|
</transformer>
|
||||||
|
</transformers>
|
||||||
|
<artifactSet>
|
||||||
|
<excludes>
|
||||||
|
<exclude>javax:*</exclude>
|
||||||
|
<exclude>org.eclipse.jetty.orbit:*</exclude>
|
||||||
|
<exclude>org.mortbay.jetty:*</exclude>
|
||||||
|
<exclude>org.mortbay.jetty.alpn:*</exclude>
|
||||||
|
<exclude>org.slf4j:*</exclude>
|
||||||
|
<exclude>org.ow2.asm:*</exclude>
|
||||||
|
<exclude>*:javax</exclude>
|
||||||
|
</excludes>
|
||||||
|
</artifactSet>
|
||||||
|
<filters>
|
||||||
|
<filter>
|
||||||
|
<artifact>*</artifact>
|
||||||
|
<excludes>
|
||||||
|
<exclude>META-INF/MANIFEST.MF</exclude>
|
||||||
|
</excludes>
|
||||||
|
</filter>
|
||||||
|
</filters>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
<version>1.9.1</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>attach-artifacts</id>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>attach-artifact</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<artifacts>
|
||||||
|
<artifact>
|
||||||
|
<file>${uber-jar}</file>
|
||||||
|
<type>jar</type>
|
||||||
|
<classifier>uber</classifier>
|
||||||
|
</artifact>
|
||||||
|
</artifacts>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
|
|
||||||
<id>uber</id>
|
|
||||||
<formats>
|
|
||||||
<format>jar</format>
|
|
||||||
</formats>
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
<dependencySets>
|
|
||||||
<dependencySet>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<useTransitiveDependencies>true</useTransitiveDependencies>
|
|
||||||
<unpack>true</unpack>
|
|
||||||
<excludes>
|
|
||||||
<exclude>javax:*</exclude>
|
|
||||||
<exclude>org.eclipse.jetty.orbit:*</exclude>
|
|
||||||
<exclude>org.mortbay.jetty:*</exclude>
|
|
||||||
<exclude>org.mortbay.jetty.alpn:*</exclude>
|
|
||||||
<exclude>org.slf4j:*</exclude>
|
|
||||||
<exclude>org.ow2.asm:*</exclude>
|
|
||||||
<exclude>:javax:*</exclude>
|
|
||||||
</excludes>
|
|
||||||
<unpackOptions>
|
|
||||||
<excludes>
|
|
||||||
<exclude>META-INF/MANIFEST.MF</exclude>
|
|
||||||
<exclude>META-INF/maven/javax.*/**</exclude>
|
|
||||||
<exclude>javax/**</exclude>
|
|
||||||
</excludes>
|
|
||||||
</unpackOptions>
|
|
||||||
</dependencySet>
|
|
||||||
</dependencySets>
|
|
||||||
</assembly>
|
|
Loading…
Reference in New Issue