This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.1 by this push: new a65e909 Fix licenses to pass RAT check a65e909 is described below commit a65e909bf4b5373be54f6b8d822edf99665f1e64 Author: Nikita Timofeev <stari...@gmail.com> AuthorDate: Mon Feb 3 14:22:24 2020 +0300 Fix licenses to pass RAT check --- cayenne-jcache/src/test/resources/eh-cache.xml | 18 ++++++++++++++++++ .../docs/asciidoc/_cayenne-guide/part2/including.adoc | 2 +- .../asciidoc/_cayenne-guide/part2/queries/custom.adoc | 2 +- .../asciidoc/_cayenne-guide/part2/queries/ejbql.adoc | 2 +- .../asciidoc/_cayenne-guide/part2/queries/mapped.adoc | 2 +- .../_cayenne-guide/part2/queries/objectselect.adoc | 2 +- .../_cayenne-guide/part2/queries/procedure.adoc | 2 +- .../_cayenne-guide/part2/queries/selectbyid.adoc | 2 +- .../asciidoc/_cayenne-guide/part2/queries/sql.adoc | 2 +- .../_cayenne-guide/part2/queries/sqlscripting.adoc | 2 +- .../docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc | 2 +- .../asciidoc/_cayenne-guide/part6/gradle-plugin.adoc | 2 +- .../asciidoc/_cayenne-guide/part6/maven-plugin.adoc | 2 +- 13 files changed, 30 insertions(+), 12 deletions(-) diff --git a/cayenne-jcache/src/test/resources/eh-cache.xml b/cayenne-jcache/src/test/resources/eh-cache.xml index 60f4455..796d491 100644 --- a/cayenne-jcache/src/test/resources/eh-cache.xml +++ b/cayenne-jcache/src/test/resources/eh-cache.xml @@ -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. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <config xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://www.ehcache.org/v3' xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.0.xsd"> diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc index d4f255a..4372953 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/including.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/custom.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/custom.adoc index 01cb75b..d7cf762 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/custom.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/custom.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/ejbql.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/ejbql.adoc index c1eb228..ee1f362 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/ejbql.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/ejbql.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/mapped.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/mapped.adoc index 94fe170..da21add 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/mapped.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/mapped.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc index 38ac7d3..5cb1bda 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/objectselect.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/procedure.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/procedure.adoc index 1a9280d..223dbf0 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/procedure.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/procedure.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/selectbyid.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/selectbyid.adoc index 95af725..c6f4135 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/selectbyid.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/selectbyid.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc index d3419bf..7184aa0 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sql.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc index e8d280d..40918d0 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc index 94ad752..225f203 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/gradle-plugin.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/gradle-plugin.adoc index 0763c46..e449263 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/gradle-plugin.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/gradle-plugin.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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 diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/maven-plugin.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/maven-plugin.adoc index 1d8394a..c4575f0 100644 --- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/maven-plugin.adoc +++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/maven-plugin.adoc @@ -5,7 +5,7 @@ // 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 // -// https://www.apache.org/licenses/LICENSE-2.0 Unless required by +// 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