Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/34b70b23 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/34b70b23 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/34b70b23 Branch: refs/heads/ldp Commit: 34b70b23ed9ff49198e0e29651e5967246db68f9 Parents: 2697461 73d80e0 Author: Sebastian Schaffert <[email protected]> Authored: Tue Mar 18 14:51:00 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Tue Mar 18 14:51:00 2014 +0100 ---------------------------------------------------------------------- .../maven/plugins/refpack/RefPackMojo.java | 4 ++-- launchers/marmotta-installer/pom.xml | 7 ------- .../src/main/resources/installer/standalone.xml | 1 - launchers/marmotta-webapp/assembly.xml | 8 +------- launchers/marmotta-webapp/pom.xml | 17 ++++++++++------- parent/pom.xml | 2 ++ 6 files changed, 15 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/34b70b23/parent/pom.xml ----------------------------------------------------------------------
