Skip to content

Commit 3b224c8

Browse files
authored
Merge pull request #683 from jooby-project/669
Can't deploy jooby project on Jetty/Tomcat fix #669
2 parents 0ee877a + df3bce3 commit 3b224c8

5 files changed

Lines changed: 407 additions & 349 deletions

File tree

jooby-dist/src/main/resources/assemblies/jooby.war.xml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<dependencySet>
1515
<outputDirectory>WEB-INF${file.separator}lib</outputDirectory>
1616
<scope>runtime</scope>
17+
<useProjectArtifact>false</useProjectArtifact>
1718
<excludes>
1819
<!-- netty -->
1920
<exclude>io.netty:*</exclude>
@@ -51,6 +52,7 @@
5152
<outputDirectory>WEB-INF${file.separator}lib</outputDirectory>
5253
<scope>provided</scope>
5354
<useTransitiveDependencies>false</useTransitiveDependencies>
55+
<useProjectArtifact>false</useProjectArtifact>
5456
<includes>
5557
<include>org.jooby:jooby-servlet</include>
5658
</includes>
@@ -141,17 +143,6 @@
141143
</includes>
142144
</fileSet>
143145

144-
<!-- cmd : WEB-INF/cmd -->
145-
<fileSet>
146-
<directory>
147-
${project.build.outputDirectory}
148-
</directory>
149-
<outputDirectory>WEB-INF${file.separator}cmd</outputDirectory>
150-
<includes>
151-
<include>**/*</include>
152-
</includes>
153-
</fileSet>
154-
155146
</fileSets>
156147

157148
</assembly>

0 commit comments

Comments
 (0)