Skip to content

Commit 6029a69

Browse files
committed
Move webapp folder in the default Spring Boot location
spiritual replacement of #1745 because the feature branch was old and fixing conflicts was not fun.
1 parent 330fea4 commit 6029a69

File tree

145 files changed

+1
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+1
-3
lines changed

pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</includes>
105105
</resource>
106106
<resource>
107-
<directory>src/main/resources</directory>
107+
<directory>src/main</directory>
108108
<filtering>false</filtering>
109109
<includes>
110110
<include>webapp/static/**</include>
@@ -324,8 +324,6 @@
324324
<goal>jspc</goal>
325325
</goals>
326326
<configuration>
327-
<webAppSourceDirectory>${basedir}/src/main/resources/webapp</webAppSourceDirectory>
328-
<webXml>${basedir}/src/main/resources/webapp/WEB-INF/web.xml</webXml>
329327
<webXmlFragment>${basedir}/target/classes/webapp/WEB-INF/web.xml-frag</webXmlFragment>
330328
</configuration>
331329
</execution>

0 commit comments

Comments
 (0)