You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/11/20 11:15:52 UTC
[1/2] karaf git commit: [KARAF-4127] Missing license in
Karaf-maven-plugin test-rename-main-feature file
Repository: karaf
Updated Branches:
refs/heads/master 46e261173 -> 6ece80f14
[KARAF-4127] Missing license in Karaf-maven-plugin test-rename-main-feature file
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/68eef4aa
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/68eef4aa
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/68eef4aa
Branch: refs/heads/master
Commit: 68eef4aaddd2d02584c099281120765e55c6c6a2
Parents: 54df51d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Nov 19 17:50:00 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Nov 19 17:50:00 2015 +0100
----------------------------------------------------------------------
.../src/it/test-rename-main-feature/control.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/68eef4aa/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/control.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/control.xml b/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/control.xml
index 816f56d..e3133c9 100644
--- a/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/control.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/control.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="test-rename-project-artifact">
<feature name="test-feature" description="test-rename-project-artifact" version="1.0.0.SNAPSHOT">
<bundle>mvn:test/test-rename-project-artifact/1.0-SNAPSHOT</bundle>
[2/2] karaf git commit: Merge branch 'KARAF-4127' of
https://github.com/oscerd/karaf
Posted by jb...@apache.org.
Merge branch 'KARAF-4127' of https://github.com/oscerd/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6ece80f1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6ece80f1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6ece80f1
Branch: refs/heads/master
Commit: 6ece80f1465a63b01d268e9bae68b543dcdbae3c
Parents: 46e2611 68eef4a
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Nov 20 10:53:13 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Nov 20 10:53:13 2015 +0100
----------------------------------------------------------------------
.../src/it/test-rename-main-feature/control.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------