brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aledsage <...@git.apache.org>
Subject [GitHub] brooklyn-server pull request #850: Fix BundleMaker to handle an empty classp...
Date Mon, 02 Oct 2017 13:52:43 GMT
GitHub user aledsage opened a pull request:

    https://github.com/apache/brooklyn-server/pull/850

    Fix BundleMaker to handle an empty classpath dir

    Fixes the jenkins exception we hit in https://github.com/apache/brooklyn-server/pull/847#issuecomment-333528749.
    
    This fixes the exception. However, the underlying cause on jenkins was probably a messed
up build (the classpath dir should not have been empty!).
    
    Note that I couldn't add the test for this because git can't have an empty dir (it needs
to be really empty, rather than containing a single `.gitignore` file or whatever).
    
    The test I ran locally was:
    ```
        @Test
        public void testCreateJarFromEmptyClasspathDir() throws Exception {
            generatedJar = bundleMaker.createJarFromClasspathDir("/org/apache/brooklyn/util/core/osgi/test/bundlemaker/emptyfolder/");
            
            assertJarContents(generatedJar, ImmutableMap.of(), false);
        }
    ```

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/aledsage/brooklyn-server fix-bundlemaker-emptydir

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/brooklyn-server/pull/850.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #850
    
----
commit c2f7cdceba0cdd7cd04673903f1d4fce5e092ee6
Author: Aled Sage <aled.sage@gmail.com>
Date:   2017-10-02T13:49:04Z

    Handle empty-dir for `bundleMaker.createJarFromClasspathDir`

commit 5e30bd19bfca8bc22f7f0fa8369103e410755638
Author: Aled Sage <aled.sage@gmail.com>
Date:   2017-10-02T13:49:26Z

    BundleMaker: test with empty file

----


---

Mime
View raw message