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 2014/04/09 18:46:57 UTC
git commit: [KARAF-2781] Enable rat profile by default and fix
license header issues
Repository: karaf
Updated Branches:
refs/heads/master 2824cf14c -> 67afefaae
[KARAF-2781] Enable rat profile by default and fix license header issues
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/67afefaa
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/67afefaa
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/67afefaa
Branch: refs/heads/master
Commit: 67afefaaeff7c0f41b741eef3e38e5d188e38cc5
Parents: 2824cf1
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Apr 9 18:45:55 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Apr 9 18:45:55 2014 +0200
----------------------------------------------------------------------
bundle/core/src/test/resources/settings.xml | 18 +++++++++++++++
bundle/core/src/test/resources/settings2.xml | 18 +++++++++++++++
.../features/internal/util/JsonReader.java | 24 ++++++++++++--------
.../features/internal/util/JsonWriter.java | 16 ++++++-------
pom.xml | 3 +++
.../apache/karaf/shell/ssh/ActivatorNoOsgi.java | 18 +++++++++++++++
6 files changed, 80 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/67afefaa/bundle/core/src/test/resources/settings.xml
----------------------------------------------------------------------
diff --git a/bundle/core/src/test/resources/settings.xml b/bundle/core/src/test/resources/settings.xml
index cd8cdc8..4ba01c3 100644
--- a/bundle/core/src/test/resources/settings.xml
+++ b/bundle/core/src/test/resources/settings.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+-->
<settings>
<localRepository>foo/bar</localRepository>
<profiles>
http://git-wip-us.apache.org/repos/asf/karaf/blob/67afefaa/bundle/core/src/test/resources/settings2.xml
----------------------------------------------------------------------
diff --git a/bundle/core/src/test/resources/settings2.xml b/bundle/core/src/test/resources/settings2.xml
index 25a06c3..cd4e5a6 100644
--- a/bundle/core/src/test/resources/settings2.xml
+++ b/bundle/core/src/test/resources/settings2.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+-->
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://git-wip-us.apache.org/repos/asf/karaf/blob/67afefaa/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonReader.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonReader.java b/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonReader.java
index 35b7308..a53d8a5 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonReader.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonReader.java
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2013 EclipseSource.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Ralf Sternberg - initial implementation and API
- ******************************************************************************/
+ * 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.
+ */
package org.apache.karaf.features.internal.util;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/karaf/blob/67afefaa/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonWriter.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonWriter.java b/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonWriter.java
index 8294faa..cba27fb 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonWriter.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/util/JsonWriter.java
@@ -1,12 +1,12 @@
-/**
- * Copyright (C) FuseSource, Inc.
- * http://fusesource.com
- *
- * Licensed 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
+/*
+ * 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/karaf/blob/67afefaa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b4f7124..a4448d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2267,6 +2267,9 @@
</profile>
<profile>
<id>rat</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/67afefaa/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ActivatorNoOsgi.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ActivatorNoOsgi.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ActivatorNoOsgi.java
index f71c5ef..dd33809 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ActivatorNoOsgi.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ActivatorNoOsgi.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.karaf.shell.ssh;
import java.io.File;