Skip to content

S
spring-boot
Commit bdd8cb34 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.5.x'

parents 2d6bb9b5 51970f81
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
spring-boot-cli/src/main/assembly/bin-package.xml
View file @ bdd8cb34
......@@ -2,7 +2,6 @@
<id>bin</id>
<formats>
<format>zip</format>
<format>dir</format>
<format>tar.gz</format>
</formats>
<baseDirectory>spring-${project.version}</baseDirectory>
......@@ -10,7 +9,7 @@
<fileSets>
<fileSet>
<directory>src/main/content</directory>
<outputDirectory>/</outputDirectory>
<outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
......@@ -21,7 +20,7 @@
</fileSet>
<fileSet>
<directory>src/main/content</directory>
<outputDirectory>/</outputDirectory>
<outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
......@@ -31,7 +30,7 @@
</fileSet>
<fileSet>
<directory>src/main/executablecontent</directory>
<outputDirectory>/</outputDirectory>
<outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
......@@ -40,7 +39,7 @@
<files>
<file>
<source>${project.build.directory}/${project.artifactId}-${project.version}-full.jar</source>
<outputDirectory>/lib</outputDirectory>
<outputDirectory>lib</outputDirectory>
<destName>${project.build.finalName}.jar</destName>
</file>
</files>
......
spring-boot-cli/src/main/assembly/jar-with-dependencies.xml
View file @ bdd8cb34
......@@ -21,7 +21,7 @@
<fileSets>
<fileSet>
<directory>${project.build.directory}/assembly</directory>
<outputDirectory>/</outputDirectory>
<outputDirectory></outputDirectory>
</fileSet>
</fileSets>
</assembly>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment