commit 6044f2fc49a43fd62119f88f2d7813f2be2b228c
author Manuel Carrasco Monino <manolo@apache.org> Mon Feb 16 22:06:14 2015 +0000
committer Manuel Carrasco Monino <manolo@apache.org> Mon Feb 16 22:06:14 2015 +0000
tree 95f31113eb0f08703c1ff6cdeafa862048171445
parent 1a00a526d65ed108e54519605f061f8d2dcb311e

Fix manifest issues with embedded jetty

git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1660221 13f79535-47bb-0310-9956-ffa450edef68

.gitignore

diff --git a/.gitignore b/.gitignore
index f47f3bd..69b148e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 *.swp
 .factorypath
 .DS_Store
+MANIFEST.MF

hupa/pom.xml

diff --git a/hupa/pom.xml b/hupa/pom.xml
index 6092fd9..dbd6a76 100644
--- a/hupa/pom.xml
+++ b/hupa/pom.xml
@@ -194,6 +194,14 @@
                         </manifest>
                     </archive>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -281,6 +289,7 @@
                         <configuration>
                             <includeGroupIds>org.eclipse.jetty,javax.servlet</includeGroupIds>
                             <excludeArtifactIds>jsp-api,jstl</excludeArtifactIds>
+                            <excludes>META-INF/**</excludes>
                             <outputDirectory>
                                 ${project.build.directory}/${project.artifactId}-${project.version}
                             </outputDirectory>