diff options
| author | Joakim Erdfelt | 2013-09-06 14:53:08 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2013-09-06 14:53:35 +0000 |
| commit | db19102bba41c0913a2224dd9375b56769aa1900 (patch) | |
| tree | 60281fc93d638bc92cbe942bb9c1c0097ecd31d6 | |
| parent | e26ce1b303aad1608c01ce9350be1fc8c86cf596 (diff) | |
| download | org.eclipse.jetty.project-db19102bba41c0913a2224dd9375b56769aa1900.tar.gz org.eclipse.jetty.project-db19102bba41c0913a2224dd9375b56769aa1900.tar.xz org.eclipse.jetty.project-db19102bba41c0913a2224dd9375b56769aa1900.zip | |
Fixing distribution - adding servlets.mod + javax.mail support
| -rw-r--r-- | jetty-distribution/pom.xml | 6 | ||||
| -rw-r--r-- | jetty-servlets/pom.xml | 17 | ||||
| -rw-r--r-- | jetty-servlets/src/main/config/modules/servlets.mod | 1 |
3 files changed, 23 insertions, 1 deletions
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index cf5a6fa619..ebf739ac9b 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -427,7 +427,7 @@ </goals> <configuration> <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds> - <includeArtifactIds>javax.activation</includeArtifactIds> + <includeArtifactIds>javax.activation,javax.mail.glassfish</includeArtifactIds> <includeTypes>jar</includeTypes> <outputDirectory>${assembly-directory}/lib/jndi</outputDirectory> </configuration> @@ -535,6 +535,10 @@ <artifactId>javax.activation</artifactId> </dependency> <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.mail.glassfish</artifactId> + </dependency> + <dependency> <groupId>javax.transaction</groupId> <artifactId>javax.transaction-api</artifactId> </dependency> diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 16aaa7e05f..dbc1339f8e 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -45,6 +45,23 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptorRefs> + <descriptorRef>config</descriptorRef> + </descriptorRefs> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-servlets/src/main/config/modules/servlets.mod b/jetty-servlets/src/main/config/modules/servlets.mod index 02cd72b852..e8724b87d7 100644 --- a/jetty-servlets/src/main/config/modules/servlets.mod +++ b/jetty-servlets/src/main/config/modules/servlets.mod @@ -7,3 +7,4 @@ servlet [lib] lib/jetty-servlets-${jetty.version}.jar + |