Repository: any23 Updated Branches: refs/heads/master 0dd983779 -> 0e557dac5
ANY23-210 Address 1.0 Release Review Discrepancies Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/0e557dac Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/0e557dac Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/0e557dac Branch: refs/heads/master Commit: 0e557dac517d70b2770c803284bd70395ac4bb3c Parents: 0dd9837 Author: Lewis John McGibbney <[email protected]> Authored: Thu Jan 25 10:32:21 2018 -0800 Committer: Lewis John McGibbney <[email protected]> Committed: Thu Jan 25 10:32:21 2018 -0800 ---------------------------------------------------------------------- LICENSE-header.txt | 41 -------------------- NOTICE.txt | 2 +- .../main/java/org/apache/any23/vocab/YAML.java | 13 ++++--- .../org/apache/any23/cli/SimpleRoverTest.java | 13 ++++--- .../org/apache/any23/cli/YAMLRoverTest.java | 13 ++++--- cli/src/test/resources/log4j.properties | 15 +++---- pom.xml | 7 ---- .../main/assembly/NOTICE-server-embedded.txt | 2 +- service/src/main/assembly/NOTICE-with-deps.txt | 2 +- .../src/main/assembly/NOTICE-without-deps.txt | 2 +- 10 files changed, 33 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/0e557dac/LICENSE-header.txt ---------------------------------------------------------------------- diff --git a/LICENSE-header.txt b/LICENSE-header.txt deleted file mode 100644 index 52c0a4d..0000000 --- a/LICENSE-header.txt +++ /dev/null @@ -1,41 +0,0 @@ - ================ - Java Code Header - ================= - -/* - * 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. - */ - - =============== - XML Code Header - =============== - -<!-- - 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. ---> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/0e557dac/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index d0e41e6..915ef19 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Any23 -Copyright 2011-2017 The Apache Software Foundation +Copyright 2011-2018 The Apache Software Foundation Copyright 2008-2011 Digital Enterprise Research Institute (DERI) This product includes software developed by http://git-wip-us.apache.org/repos/asf/any23/blob/0e557dac/api/src/main/java/org/apache/any23/vocab/YAML.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/YAML.java b/api/src/main/java/org/apache/any23/vocab/YAML.java index 52afda5..0236b81 100644 --- a/api/src/main/java/org/apache/any23/vocab/YAML.java +++ b/api/src/main/java/org/apache/any23/vocab/YAML.java @@ -1,11 +1,12 @@ /* - * Copyright 2017 The Apache Software Foundation. + * 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 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/any23/blob/0e557dac/cli/src/test/java/org/apache/any23/cli/SimpleRoverTest.java ---------------------------------------------------------------------- diff --git a/cli/src/test/java/org/apache/any23/cli/SimpleRoverTest.java b/cli/src/test/java/org/apache/any23/cli/SimpleRoverTest.java index b4c10ad..ec75022 100644 --- a/cli/src/test/java/org/apache/any23/cli/SimpleRoverTest.java +++ b/cli/src/test/java/org/apache/any23/cli/SimpleRoverTest.java @@ -1,11 +1,12 @@ /* - * Copyright 2017 The Apache Software Foundation. + * 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 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/any23/blob/0e557dac/cli/src/test/java/org/apache/any23/cli/YAMLRoverTest.java ---------------------------------------------------------------------- diff --git a/cli/src/test/java/org/apache/any23/cli/YAMLRoverTest.java b/cli/src/test/java/org/apache/any23/cli/YAMLRoverTest.java index 4600452..f559f67 100644 --- a/cli/src/test/java/org/apache/any23/cli/YAMLRoverTest.java +++ b/cli/src/test/java/org/apache/any23/cli/YAMLRoverTest.java @@ -1,11 +1,12 @@ /* - * Copyright 2017 The Apache Software Foundation. + * 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 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/any23/blob/0e557dac/cli/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/cli/src/test/resources/log4j.properties b/cli/src/test/resources/log4j.properties index a908dc8..e222c51 100644 --- a/cli/src/test/resources/log4j.properties +++ b/cli/src/test/resources/log4j.properties @@ -1,11 +1,12 @@ -# Copyright 2017 The Apache Software Foundation. -# -# 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 -# -# http://www.apache.org/licenses/LICENSE-2.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. http://git-wip-us.apache.org/repos/asf/any23/blob/0e557dac/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0b03914..e363161 100644 --- a/pom.xml +++ b/pom.xml @@ -576,18 +576,11 @@ </dependency> <!-- END: logger --> - <!-- BEGIN: plugins --> - <dependency> - <groupId>org.kohsuke.metainf-services</groupId> - <artifactId>metainf-services</artifactId> - <version>1.5</version> - </dependency> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> <version>1.17</version> </dependency> - <!-- END: plugins --> <!-- BEGIN: Test Dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/any23/blob/0e557dac/service/src/main/assembly/NOTICE-server-embedded.txt ---------------------------------------------------------------------- diff --git a/service/src/main/assembly/NOTICE-server-embedded.txt b/service/src/main/assembly/NOTICE-server-embedded.txt index 05e5b11..7566350 100644 --- a/service/src/main/assembly/NOTICE-server-embedded.txt +++ b/service/src/main/assembly/NOTICE-server-embedded.txt @@ -1,5 +1,5 @@ Apache Any23 -Copyright 2011-2017 The Apache Software Foundation +Copyright 2011-2018 The Apache Software Foundation Copyright 2008-2011 Digital Enterprise Research Institute (DERI) This product includes software developed by http://git-wip-us.apache.org/repos/asf/any23/blob/0e557dac/service/src/main/assembly/NOTICE-with-deps.txt ---------------------------------------------------------------------- diff --git a/service/src/main/assembly/NOTICE-with-deps.txt b/service/src/main/assembly/NOTICE-with-deps.txt index 84c9c2d..7ecdddd 100644 --- a/service/src/main/assembly/NOTICE-with-deps.txt +++ b/service/src/main/assembly/NOTICE-with-deps.txt @@ -1,5 +1,5 @@ Apache Any23 -Copyright 2011-2017 The Apache Software Foundation +Copyright 2011-2018 The Apache Software Foundation Copyright 2008-2011 Digital Enterprise Research Institute (DERI) This product includes software developed by http://git-wip-us.apache.org/repos/asf/any23/blob/0e557dac/service/src/main/assembly/NOTICE-without-deps.txt ---------------------------------------------------------------------- diff --git a/service/src/main/assembly/NOTICE-without-deps.txt b/service/src/main/assembly/NOTICE-without-deps.txt index d28093b..e2af4e5 100644 --- a/service/src/main/assembly/NOTICE-without-deps.txt +++ b/service/src/main/assembly/NOTICE-without-deps.txt @@ -1,5 +1,5 @@ Apache Any23 -Copyright 2011-2017 The Apache Software Foundation +Copyright 2011-2018 The Apache Software Foundation Copyright 2008-2011 Digital Enterprise Research Institute (DERI) This product includes software developed by
