You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/05/25 17:52:24 UTC
[GitHub] sijie closed pull request #1443: Issue 1442: Assembly descriptor
contains a filesystem-root relative reference '/'
sijie closed pull request #1443: Issue 1442: Assembly descriptor contains a filesystem-root relative reference '/'
URL: https://github.com/apache/bookkeeper/pull/1443
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/bookkeeper-dist/src/assemble/bin-all.xml b/bookkeeper-dist/src/assemble/bin-all.xml
index 4a7c4dc32..b8ea98db7 100644
--- a/bookkeeper-dist/src/assemble/bin-all.xml
+++ b/bookkeeper-dist/src/assemble/bin-all.xml
@@ -25,24 +25,24 @@
<fileSets>
<fileSet>
<directory>target</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>../../conf</directory>
- <outputDirectory>/conf</outputDirectory>
+ <outputDirectory>conf</outputDirectory>
</fileSet>
<fileSet>
<directory>../../bin</directory>
<fileMode>755</fileMode>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
</fileSet>
<fileSet>
<directory>../../bookkeeper-benchmark/bin</directory>
<fileMode>755</fileMode>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
</fileSet>
<fileSet>
<fileMode>644</fileMode>
@@ -52,7 +52,7 @@
</fileSet>
<fileSet>
<directory>../src/main/resources/deps</directory>
- <outputDirectory>/deps</outputDirectory>
+ <outputDirectory>deps</outputDirectory>
<includes>
<include>google-auth-library-credentials-0.4.0/LICENSE</include>
<include>javax.servlet-api-3.1.0/CDDL+GPL-1.1</include>
@@ -74,25 +74,25 @@
<files>
<file>
<source>../../README.md</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>../src/main/resources/LICENSE-all.bin.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<destName>LICENSE</destName>
<fileMode>644</fileMode>
</file>
<file>
<source>../src/main/resources/NOTICE-all.bin.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<destName>NOTICE</destName>
<fileMode>644</fileMode>
</file>
</files>
<dependencySets>
<dependencySet>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
diff --git a/bookkeeper-dist/src/assemble/bin-server.xml b/bookkeeper-dist/src/assemble/bin-server.xml
index ce5a64627..d848cea52 100644
--- a/bookkeeper-dist/src/assemble/bin-server.xml
+++ b/bookkeeper-dist/src/assemble/bin-server.xml
@@ -25,19 +25,19 @@
<fileSets>
<fileSet>
<directory>target</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>../../conf</directory>
- <outputDirectory>/conf</outputDirectory>
+ <outputDirectory>conf</outputDirectory>
</fileSet>
<fileSet>
<directory>../../bin</directory>
<fileMode>755</fileMode>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
</fileSet>
<fileSet>
<fileMode>644</fileMode>
@@ -47,7 +47,7 @@
</fileSet>
<fileSet>
<directory>../src/main/resources/deps</directory>
- <outputDirectory>/deps</outputDirectory>
+ <outputDirectory>deps</outputDirectory>
<includes>
<include>google-auth-library-credentials-0.4.0/LICENSE</include>
<include>javax.servlet-api-3.1.0/CDDL+GPL-1.1</include>
@@ -63,25 +63,25 @@
<files>
<file>
<source>../../README.md</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>../src/main/resources/LICENSE-server.bin.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<destName>LICENSE</destName>
<fileMode>644</fileMode>
</file>
<file>
<source>../src/main/resources/NOTICE-server.bin.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<destName>NOTICE</destName>
<fileMode>644</fileMode>
</file>
</files>
<dependencySets>
<dependencySet>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services