You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@karaf.apache.org by tnaroska <gi...@git.apache.org> on 2013/03/01 17:19:31 UTC

karaf pull request: [KARAF-2215] kar fails to attach...

GitHub user tnaroska opened a pull request:

    https://github.com/apache/karaf/pull/14

    [KARAF-2215] <packaging>kar</packaging> fails to attach artifact

    - additional integration-tests for karaf-maven-plugin
    - archetype uses kar-packaging again

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

    $ git pull https://github.com/tnaroska/karaf trunk

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

    https://github.com/apache/karaf/pull/14.patch

----
commit d7e3c179753ca8610885990d3db143853c6962c2
Author: tnaroska <tn...@mac.com>
Date:   2013-02-22T01:23:39Z

    [KARAF-1851] Fixes for features v1.2.0
    Fix karaf-maven-plugin integration tests

commit ab3cf13dc1c5a6caed9c97e8656be66036992032
Author: tnaroska <tn...@mac.com>
Date:   2013-02-22T08:14:43Z

    Merge remote-tracking branch 'upstream/trunk' into trunk
    
    Conflicts:
    	tooling/karaf-maven-plugin/src/it/test-basic-generation/control.xml
    	tooling/karaf-maven-plugin/src/it/test-type-classifier/control.xml

commit 6540cedc3df3f04ab6f8ea417874965a07c69508
Author: tnaroska <tn...@adobe.com>
Date:   2013-02-27T13:18:00Z

    Merge branch 'trunk' of github.com:apache/karaf into trunk

commit 54ec59f792ff4c220b2db23a86b0613413989d38
Author: tnaroska <tn...@mac.com>
Date:   2013-03-01T15:47:12Z

    [KARAF-2215] <packaging>kar</packaging> fails to attach artifact
    
    - additional integration-tests
    - archetype uses kar-packaging again

----