You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/06/11 18:23:43 UTC
[1/2] incubator-groovy git commit: remove duplicated Apache license
headers
Repository: incubator-groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 1d5b67b7c -> 9bec5552a
remove duplicated Apache license headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/054403ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/054403ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/054403ef
Branch: refs/heads/GROOVY_2_4_X
Commit: 054403eff8071c83e822e266b5c3e91256ed0e56
Parents: 1d5b67b
Author: pascalschumacher <pa...@gmx.net>
Authored: Thu Jun 11 18:22:45 2015 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Thu Jun 11 18:22:45 2015 +0200
----------------------------------------------------------------------
gradle/utils.gradle | 16 -----
.../runtime/dgmimpl/NumberNumberMetaMethod.java | 62 +-------------------
.../annotations/ParameterAnnotationTest.groovy | 15 -----
.../transform/AnnotationCollectorTest.groovy | 15 -----
.../groovy/swing/SwingBuilderConsoleTest.groovy | 15 -----
.../src/test/groovy/GroovyTestCaseTest.groovy | 16 -----
.../test/groovy/groovy/xml/XmlUtilTest.groovy | 15 -----
7 files changed, 1 insertion(+), 153 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/054403ef/gradle/utils.gradle
----------------------------------------------------------------------
diff --git a/gradle/utils.gradle b/gradle/utils.gradle
index 16529b0..e1c79ca 100644
--- a/gradle/utils.gradle
+++ b/gradle/utils.gradle
@@ -24,22 +24,6 @@ import org.objectweb.asm.MethodVisitor
import static org.objectweb.asm.Opcodes.*
-/*
-* Copyright 2003-2013 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.
-*/
-
buildscript {
repositories {
mavenCentral()
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/054403ef/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java
index 5b1af26..1d945fc 100644
--- a/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java
+++ b/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -16,66 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Copyright 2003-2007 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.
- */
-/*
- * Copyright 2003-2007 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.
- */
-/*
- * Copyright 2003-2007 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.
- */
-/*
- * Copyright 2003-2007 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.
- */
package org.codehaus.groovy.runtime.dgmimpl;
import groovy.lang.MetaClassImpl;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/054403ef/src/test/groovy/annotations/ParameterAnnotationTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/annotations/ParameterAnnotationTest.groovy b/src/test/groovy/annotations/ParameterAnnotationTest.groovy
index dcc376c..69cdf8d 100644
--- a/src/test/groovy/annotations/ParameterAnnotationTest.groovy
+++ b/src/test/groovy/annotations/ParameterAnnotationTest.groovy
@@ -16,21 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
-* Copyright 2003-2011 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.
-*/
package groovy.annotations
import org.codehaus.groovy.control.*
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/054403ef/src/test/groovy/transform/AnnotationCollectorTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/transform/AnnotationCollectorTest.groovy b/src/test/groovy/transform/AnnotationCollectorTest.groovy
index 92f0221..2965f0b 100644
--- a/src/test/groovy/transform/AnnotationCollectorTest.groovy
+++ b/src/test/groovy/transform/AnnotationCollectorTest.groovy
@@ -16,21 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
-* 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.
-*/
package groovy.transform
import org.codehaus.groovy.ast.*;
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/054403ef/subprojects/groovy-console/src/test/groovy/groovy/swing/SwingBuilderConsoleTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/test/groovy/groovy/swing/SwingBuilderConsoleTest.groovy b/subprojects/groovy-console/src/test/groovy/groovy/swing/SwingBuilderConsoleTest.groovy
index 9983c2a..9ef89c2 100644
--- a/subprojects/groovy-console/src/test/groovy/groovy/swing/SwingBuilderConsoleTest.groovy
+++ b/subprojects/groovy-console/src/test/groovy/groovy/swing/SwingBuilderConsoleTest.groovy
@@ -17,21 +17,6 @@
* under the License.
*/
package groovy.swing
-/*
- * Copyright 2003-2013 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.
- */
import groovy.ui.Console
import groovy.ui.ConsoleActions
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/054403ef/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy b/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy
index 6eedd04..9ee4c2f 100644
--- a/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy
+++ b/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy
@@ -16,22 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
-* Copyright 2003-2014 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.
-*/
-
import junit.framework.AssertionFailedError
/**
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/054403ef/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
index 9c64274..07d41e7 100644
--- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
@@ -16,21 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
-* Copyright 2003-2013 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.
-*/
package groovy.xml
import org.xml.sax.ErrorHandler
[2/2] incubator-groovy git commit: update to correct Apache license
header
Posted by pa...@apache.org.
update to correct Apache license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/9bec5552
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/9bec5552
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/9bec5552
Branch: refs/heads/GROOVY_2_4_X
Commit: 9bec5552acf42951a3e75926c5d6d9fd72c6ac31
Parents: 054403e
Author: pascalschumacher <pa...@gmx.net>
Authored: Thu Jun 11 18:23:21 2015 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Thu Jun 11 18:23:21 2015 +0200
----------------------------------------------------------------------
src/test/groovy/bugs/Groovy4393BugV1.foogroovy | 25 ++++++++++---------
.../transform/traitx/Groovy7456Bug.groovy | 26 +++++++++++---------
2 files changed, 28 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9bec5552/src/test/groovy/bugs/Groovy4393BugV1.foogroovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/Groovy4393BugV1.foogroovy b/src/test/groovy/bugs/Groovy4393BugV1.foogroovy
index 07381d8..52b3e65 100644
--- a/src/test/groovy/bugs/Groovy4393BugV1.foogroovy
+++ b/src/test/groovy/bugs/Groovy4393BugV1.foogroovy
@@ -1,17 +1,20 @@
/*
- * Copyright 2003-2010 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 groovy.bugs
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9bec5552/src/test/org/codehaus/groovy/transform/traitx/Groovy7456Bug.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/transform/traitx/Groovy7456Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7456Bug.groovy
index ecc5c46..351ef77 100644
--- a/src/test/org/codehaus/groovy/transform/traitx/Groovy7456Bug.groovy
+++ b/src/test/org/codehaus/groovy/transform/traitx/Groovy7456Bug.groovy
@@ -1,19 +1,21 @@
/*
- * Copyright 2003-2015 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.transform.traitx
class Groovy7456Bug extends GroovyTestCase {