some rat integration (minimal) and remove some rat warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/a393a07e Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/a393a07e Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/a393a07e Branch: refs/heads/GROOVY_2_4_X Commit: a393a07e5a02a5fbef705437e311aed38d3c6ec5 Parents: af7d9dd Author: Paul King <pa...@asert.com.au> Authored: Thu May 21 17:44:30 2015 +1000 Committer: Paul King <pa...@asert.com.au> Committed: Thu May 21 18:02:05 2015 +1000 ---------------------------------------------------------------------- config/licensing/HEADER.txt | 16 ++++++++ config/licensing/rat-excludes.txt | 39 ++++++++++++++++++++ gradle/HEADER.txt | 16 -------- gradle/quality.gradle | 19 +++++++++- .../metaprogramming/GroovyObjectTest.groovy | 18 +++++++++ .../metaprogramming/InterceptableTest.groovy | 18 +++++++++ .../InterceptionThroughMetaClassTest.groovy | 18 +++++++++ src/test/groovy/security/forbiddenCodeBase.gvy | 22 +++++++++-- .../org/codehaus/groovy/ant/GroovyTest.xml | 20 ++++++++++ .../org/codehaus/groovy/ant/GroovyTest1.groovy | 18 +++++++++ .../org/codehaus/groovy/ant/GroovyTest2.groovy | 18 +++++++++ .../groovy/ant/GroovyTest_errorMessage.groovy | 18 +++++++++ .../org/codehaus/groovy/ant/GroovycTest.xml | 27 ++++++++------ .../org/codehaus/groovy/ant/GroovycTest1.groovy | 25 +++++++------ .../org/codehaus/groovy/ant/GroovycTest2.java | 25 +++++++------ .../groovy/ant/IncorrectGenericsUsage.java | 25 +++++++------ .../ant/groovytest3/GroovyTest3Class.groovy | 25 +++++++------ .../codehaus/groovy/ant/GroovyTest2Class.groovy | 16 +------- 18 files changed, 293 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/config/licensing/HEADER.txt ---------------------------------------------------------------------- diff --git a/config/licensing/HEADER.txt b/config/licensing/HEADER.txt new file mode 100644 index 0000000..f62c326 --- /dev/null +++ b/config/licensing/HEADER.txt @@ -0,0 +1,16 @@ + 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. http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/config/licensing/rat-excludes.txt ---------------------------------------------------------------------- diff --git a/config/licensing/rat-excludes.txt b/config/licensing/rat-excludes.txt new file mode 100644 index 0000000..1053903 --- /dev/null +++ b/config/licensing/rat-excludes.txt @@ -0,0 +1,39 @@ +rat-excludes\.txt +rat\.out +\.gitignore +\.git +\.gradle +target +benchmark +licenses +xdocs +MANIFEST\.MF +tmp +\.classpath +\.project +build +.*\.ipr +.*\.iml +.*\.iws +.*\.bnd +gradlew +gradlew\.bat +.*\.adoc +.*\.gradle +.*\.js +.*\.css +.*\.tpl +.*\.xml +.*\.html +.*\.xsd +.*\.properties +.*\.policy +.*\.eps +.*\.mps +.*\.tex +.*\.txt +.*\.gif +.*\.png +.*\.jar +.*\.conf +.*\.text http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/gradle/HEADER.txt ---------------------------------------------------------------------- diff --git a/gradle/HEADER.txt b/gradle/HEADER.txt deleted file mode 100644 index f62c326..0000000 --- a/gradle/HEADER.txt +++ /dev/null @@ -1,16 +0,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. http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/gradle/quality.gradle ---------------------------------------------------------------------- diff --git a/gradle/quality.gradle b/gradle/quality.gradle index bb4e856..bc46fd1 100644 --- a/gradle/quality.gradle +++ b/gradle/quality.gradle @@ -26,7 +26,7 @@ allprojects { apply plugin: 'codenarc' // license { -// header rootProject.file('gradle/HEADER.txt') +// header rootProject.file('config/licensing/HEADER.txt') // include "**/*.groovy" // include "**/*.java" // include "**/*.properties" @@ -120,6 +120,23 @@ allprojects { } +configurations { + rat +} + +dependencies { + rat 'org.apache.rat:apache-rat-tasks:0.11' +} + +// Standalone rat task - suitable for manually checking license info +// TODO replace with rat gradle plugin to allow per subproject checking and better exclusion/license specification +task rat(type: JavaExec) { + println "Runs Apache RAT. Exclusions are defined in config/licensing/rat-excludes.txt file" + main = 'org.apache.rat.Report' + classpath = files(configurations.rat) + args = ['-E', 'config/licensing/rat-excludes.txt', '--dir', '.'] +} + apply from: 'gradle/jacoco/jacoco.gradle' // Temporarily disabled because of conflict //apply from: 'gradle/binarycompatibility.gradle' http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/src/spec/test/metaprogramming/GroovyObjectTest.groovy ---------------------------------------------------------------------- diff --git a/src/spec/test/metaprogramming/GroovyObjectTest.groovy b/src/spec/test/metaprogramming/GroovyObjectTest.groovy index 3131fa7..10120d1 100644 --- a/src/spec/test/metaprogramming/GroovyObjectTest.groovy +++ b/src/spec/test/metaprogramming/GroovyObjectTest.groovy @@ -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 metaprogramming class GroovyObjectTest extends GroovyTestCase { http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/src/spec/test/metaprogramming/InterceptableTest.groovy ---------------------------------------------------------------------- diff --git a/src/spec/test/metaprogramming/InterceptableTest.groovy b/src/spec/test/metaprogramming/InterceptableTest.groovy index 4e27ce8..9fbc184 100644 --- a/src/spec/test/metaprogramming/InterceptableTest.groovy +++ b/src/spec/test/metaprogramming/InterceptableTest.groovy @@ -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 metaprogramming // tag::groovy_interceptable_test[] http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy ---------------------------------------------------------------------- diff --git a/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy b/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy index ace80a3..ddd6349 100644 --- a/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy +++ b/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy @@ -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 metaprogramming import groovy.xml.Entity http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/src/test/groovy/security/forbiddenCodeBase.gvy ---------------------------------------------------------------------- diff --git a/src/test/groovy/security/forbiddenCodeBase.gvy b/src/test/groovy/security/forbiddenCodeBase.gvy index d5e0141..9265c4e 100644 --- a/src/test/groovy/security/forbiddenCodeBase.gvy +++ b/src/test/groovy/security/forbiddenCodeBase.gvy @@ -1,6 +1,22 @@ /* - * Groovy script to be read as a file to test the file based codesource features of groovy security. - * The file extension of .gvy is used to prevent this script from being treated as a groovy script by maven. + * 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. */ - + +// Groovy script to be read as a file to test the file based codesource features of groovy security. +// The file extension of .gvy is used to prevent this script from being treated as a groovy script in the build. new GroovyShell().evaluate("1+2", "forbiddenCodeBaseTest", "/groovy/security/forbiddenCodeBase"); http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest.xml ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest.xml b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest.xml index 1ac6774..867155b 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest.xml +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + 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 name="test-groovy-task" default="groovyCodeWithinTask" basedir="."> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest1.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest1.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest1.groovy index c710d16..23d3f8e 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest1.groovy +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest1.groovy @@ -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.codehaus.groovy.ant org.codehaus.groovy.ant.GroovyTest.FLAG = "from groovy file called from ant" http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest2.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest2.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest2.groovy index 1ab2fcc..59e3399 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest2.groovy +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest2.groovy @@ -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.codehaus.groovy.ant def foo = new GroovyTest2Class() http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest_errorMessage.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest_errorMessage.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest_errorMessage.groovy index 9b56f42..7451041 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest_errorMessage.groovy +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest_errorMessage.groovy @@ -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.codehaus.groovy.ant // should produce an error message def f = { http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml index def4fef..5e2afba 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml @@ -1,17 +1,22 @@ <?xml version="1.0" encoding="UTF-8" ?> - <!-- - Copyright 2003-2012 the original author or authors. - - 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 - - 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. + 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. --> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy index dd5b413..a0694ab 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy @@ -1,17 +1,20 @@ /* - * Copyright 2003-2012 the original author or authors. + * 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, - * 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.codehaus.groovy.ant http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java index ec64b84..d7ef1d5 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java @@ -1,17 +1,20 @@ /* - * Copyright 2003-2012 the original author or authors. + * 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, - * 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.codehaus.groovy.ant; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/IncorrectGenericsUsage.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/IncorrectGenericsUsage.java b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/IncorrectGenericsUsage.java index 90baf3c..1427a45 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/IncorrectGenericsUsage.java +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/IncorrectGenericsUsage.java @@ -1,17 +1,20 @@ /* - * Copyright 2003-2012 the original author or authors. + * 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, - * 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.codehaus.groovy.ant; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/groovytest3/GroovyTest3Class.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/groovytest3/GroovyTest3Class.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/groovytest3/GroovyTest3Class.groovy index 891b23a..fea77a5 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/groovytest3/GroovyTest3Class.groovy +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/groovytest3/GroovyTest3Class.groovy @@ -1,17 +1,20 @@ /* - * Copyright 2003-2012 the original author or authors. + * 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, - * 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. */ class GroovyTest3Class { void doSomething() { http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a393a07e/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest2Class.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest2Class.groovy b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest2Class.groovy index dcab94e..d49f536 100644 --- a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest2Class.groovy +++ b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest2Class.groovy @@ -17,21 +17,7 @@ * under the License. */ package org.codehaus.groovy.ant -/* - * Copyright 2003-2012 the original author or authors. - * - * 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 - * - * 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 GroovyTest2Class { void doSomething() { org.codehaus.groovy.ant.GroovyTest.FLAG = 'from GroovyTest2Class.doSomething()'
