Updated Branches: refs/heads/master 88f35997e -> 20616cc21
Fixed CS errors Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20616cc2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20616cc2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20616cc2 Branch: refs/heads/master Commit: 20616cc21b1f20ed1a38ace17a2a08cade27aeca Parents: 88f3599 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Dec 26 11:30:25 2013 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Dec 26 11:30:25 2013 +0800 ---------------------------------------------------------------------- .../component/ssh/FileKeyPairProvider.java | 28 +++++++++----------- .../java/org/apache/camel/maven/RunMojo.java | 4 ++- 2 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/20616cc2/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java ---------------------------------------------------------------------- diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java index e4f2b88..02a2f00 100644 --- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java +++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java @@ -1,20 +1,18 @@ -/* - * 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 +/** + * 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, 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. + * 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.camel.component.ssh; http://git-wip-us.apache.org/repos/asf/camel/blob/20616cc2/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java index 0474059..88ce8e3 100644 --- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java +++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java @@ -131,6 +131,8 @@ public class RunMojo extends AbstractExecMojo { * default-value="false" */ protected boolean useCDI; + + protected String extendedPluginDependencyArtifactId; /** * @component @@ -369,7 +371,7 @@ public class RunMojo extends AbstractExecMojo { private Properties originalSystemProperties; private String extraPluginDependencyArtifactId; - protected String extendedPluginDependencyArtifactId; + /** * Execute goal.