Repository: camel Updated Branches: refs/heads/master 2ca8497e5 -> f0eeaf233
Fixed missing licenses. RAT check Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a7f25105 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a7f25105 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a7f25105 Branch: refs/heads/master Commit: a7f251057ec0384d50949d1a0ee167c89239b4c2 Parents: 2ca8497 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 21 20:06:12 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 21 20:06:12 2017 +0200 ---------------------------------------------------------------------- components/camel-couchbase/pom.xml | 33 +++++++++----------- .../src/main/java/META-INF/MANIFEST.MF | 3 -- .../src/main/java/META-INF/MANIFEST.MF | 3 -- .../services/org/apache/camel/TypeConverter | 17 ++++++++++ .../org/apache/camel/component/milo-client | 17 ++++++++++ .../org/apache/camel/component/milo-server | 17 ++++++++++ .../camel-olingo4-component/pom.xml | 29 ++++++++++++++--- .../src/main/java/META-INF/MANIFEST.MF | 3 -- pom.xml | 10 ++++++ 9 files changed, 100 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a7f25105/components/camel-couchbase/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-couchbase/pom.xml b/components/camel-couchbase/pom.xml index 43921de..9714598 100644 --- a/components/camel-couchbase/pom.xml +++ b/components/camel-couchbase/pom.xml @@ -1,24 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - https://camel-extra.github.io - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - as published by the Free Software Foundation; either version 3 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. - - http://www.gnu.org/licenses/lgpl-3.0-standalone.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 + + 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/camel/blob/a7f25105/components/camel-elasticsearch5/src/main/java/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch5/src/main/java/META-INF/MANIFEST.MF b/components/camel-elasticsearch5/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 5e94951..0000000 --- a/components/camel-elasticsearch5/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - http://git-wip-us.apache.org/repos/asf/camel/blob/a7f25105/components/camel-grpc/src/main/java/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/components/camel-grpc/src/main/java/META-INF/MANIFEST.MF b/components/camel-grpc/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 5e94951..0000000 --- a/components/camel-grpc/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - http://git-wip-us.apache.org/repos/asf/camel/blob/a7f25105/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/TypeConverter ---------------------------------------------------------------------- diff --git a/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/TypeConverter index 57fb90f..f59787a 100644 --- a/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/TypeConverter +++ b/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/TypeConverter @@ -1 +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 +# +# 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. +# + org.apache.camel.component.milo.converter \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a7f25105/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-client ---------------------------------------------------------------------- diff --git a/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-client b/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-client index 17dec7a..ee73d85 100644 --- a/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-client +++ b/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-client @@ -1 +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 +# +# 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. +# + class=org.apache.camel.component.milo.client.MiloClientComponent \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a7f25105/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-server ---------------------------------------------------------------------- diff --git a/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-server b/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-server index aa7ae63..10b0982 100644 --- a/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-server +++ b/components/camel-milo/src/main/resources/META-INF/services/org/apache/camel/component/milo-server @@ -1 +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 +# +# 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. +# + class=org.apache.camel.component.milo.server.MiloServerComponent \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a7f25105/components/camel-olingo4/camel-olingo4-component/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml index 4479dd5..b88fa42 100644 --- a/components/camel-olingo4/camel-olingo4-component/pom.xml +++ b/components/camel-olingo4/camel-olingo4-component/pom.xml @@ -1,15 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> +<!-- + 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. + --> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-olingo4-parent</artifactId> <version>2.19.0-SNAPSHOT</version> </parent> + <artifactId>camel-olingo4</artifactId> <name>Camel :: Olingo4 :: Component</name> <description>Camel Olingo4 component</description> + <properties> <componentName>Olingo4</componentName> <schemeName>olingo4</schemeName> @@ -19,6 +39,7 @@ <outPackage>org.apache.camel.component.olingo4.internal</outPackage> <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg> </properties> + <dependencies> <dependency> <groupId>org.apache.camel</groupId> @@ -27,7 +48,7 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-olingo4-api</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.olingo</groupId> @@ -113,7 +134,7 @@ <configuration> <apis> <api> - <apiName /> + <apiName/> <proxyClass>org.apache.camel.component.olingo4.api.Olingo4App</proxyClass> <fromSignatureFile>src/signatures/olingo-api-signature.txt</fromSignatureFile> <excludeConfigNames>edm|responseHandler</excludeConfigNames> http://git-wip-us.apache.org/repos/asf/camel/blob/a7f25105/components/camel-olingo4/camel-olingo4-component/src/main/java/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/META-INF/MANIFEST.MF b/components/camel-olingo4/camel-olingo4-component/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 5e94951..0000000 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - http://git-wip-us.apache.org/repos/asf/camel/blob/a7f25105/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2da5887..c0d3ff9 100755 --- a/pom.xml +++ b/pom.xml @@ -239,6 +239,8 @@ <exclude>.git/**/*</exclude> <exclude>**/*.adoc</exclude> <exclude>**/*.md</exclude> + <exclude>**/*.sh</exclude> + <exclude>**/*.bat</exclude> <!-- tooling/camel-manual/src/styles/print.css use a different license --> <exclude>**/src/styles/print.css</exclude> <!-- tooling for component docs --> @@ -246,12 +248,15 @@ <exclude>**/component-options.mvel</exclude> <exclude>**/endpoint-options.mvel</exclude> <exclude>**/dataformat-options.mvel</exclude> + <exclude>**/eip-options.mvel</exclude> <exclude>**/language-options.mvel</exclude> <exclude>**/readme-components.mvel</exclude> <exclude>**/readme-components.mvel</exclude> <exclude>**/readme-dataformats.mvel</exclude> <exclude>**/readme-eips.mvel</exclude> + <exclude>**/readme-examples.mvel</exclude> <exclude>**/readme-languages.mvel</exclude> + <exclude>**/readme-others.mvel</exclude> <exclude>**/spring-boot-starter-NOTICE.txt</exclude> <!-- cxf does not handle comments here --> <exclude>**/src/main/resources/META-INF/cxf/cxf.extension</exclude> @@ -267,6 +272,10 @@ <exclude>**/npm-shrinkwrap.json</exclude> <exclude>**/package.json</exclude> <exclude>**/user-manual/**</exclude> + <!-- camel connector --> + <exclude>**/camel-connector.json</exclude> + <exclude>**/camel-connector-schema.json</exclude> + <exclude>**/camel-connector-maven-plugin/src/main/resources/META-INF/MANIFEST.MF</exclude> <!-- generated files --> <exclude>**/target/**/*</exclude> <exclude>**/eclipse-classes/**/*</exclude> @@ -287,6 +296,7 @@ <exclude>**/file-sig-api.txt</exclude> <exclude>**/Tasks__c.java</exclude> <exclude>**/additional-spring-configuration-metadata.json</exclude> + <exclude>**/*.proto</exclude> </excludes> </configuration> </plugin>
