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/05/21 10:02:25 UTC
[1/4] incubator-groovy git commit: build tweak - rely on checkstyle
version from gradle plugin
Repository: incubator-groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 871f49579 -> a393a07e5
build tweak - rely on checkstyle version from gradle plugin
Conflicts:
build.gradle
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/d4eefb7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/d4eefb7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/d4eefb7b
Branch: refs/heads/GROOVY_2_4_X
Commit: d4eefb7b3199f4e91d2264208261db515c49abe2
Parents: 871f495
Author: Paul King <pa...@asert.com.au>
Authored: Wed May 20 13:01:04 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 21 17:54:31 2015 +1000
----------------------------------------------------------------------
build.gradle | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d4eefb7b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index a6046aa..07f5ba4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -118,7 +118,6 @@ ext {
antVersion = '1.9.4'
asmVersion = '5.0.3'
antlrVersion = '2.7.7'
- checkstyleVersion = '4.4'
coberturaVersion = '1.9.4.1'
commonsCliVersion = '1.2'
commonsHttpClientVersion = '3.1'
@@ -137,7 +136,6 @@ ext {
openbeansVersion = '1.0'
openejbVersion = '1.0'
qdoxVersion = '1.12.1'
- simianVersion = '2.2.4'
slf4jVersion = '1.7.6'
xmlunitVersion = '1.5'
xstreamVersion = '1.4.7'
@@ -178,10 +176,6 @@ dependencies {
testCompile "com.thoughtworks.qdox:qdox:$qdoxVersion"
tools "com.googlecode.jarjar:jarjar:$jarjarVersion"
- tools("checkstyle:checkstyle:$checkstyleVersion") {
- exclude(module: 'junit')
- }
- tools "redhill:simian:$simianVersion"
tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") {
exclude(module: 'asm')
exclude(module: 'asm')
[4/4] incubator-groovy git commit: some rat integration (minimal) and
remove some rat warnings
Posted by pa...@apache.org.
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()'
[3/4] incubator-groovy git commit: tweak licenses
Posted by pa...@apache.org.
tweak licenses
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/af7d9dd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/af7d9dd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/af7d9dd4
Branch: refs/heads/GROOVY_2_4_X
Commit: af7d9dd4db0acfe96cb0df2f307b59d820b01442
Parents: 20dce43
Author: Paul King <pa...@asert.com.au>
Authored: Thu May 21 15:28:51 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 21 18:02:04 2015 +1000
----------------------------------------------------------------------
gradle/HEADER.txt | 16 ++++++++++++++++
gradle/LICENSE.txt | 16 ----------------
gradle/quality.gradle | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/af7d9dd4/gradle/HEADER.txt
----------------------------------------------------------------------
diff --git a/gradle/HEADER.txt b/gradle/HEADER.txt
new file mode 100644
index 0000000..f62c326
--- /dev/null
+++ b/gradle/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/af7d9dd4/gradle/LICENSE.txt
----------------------------------------------------------------------
diff --git a/gradle/LICENSE.txt b/gradle/LICENSE.txt
deleted file mode 100644
index f62c326..0000000
--- a/gradle/LICENSE.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/af7d9dd4/gradle/quality.gradle
----------------------------------------------------------------------
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
index 245bf51..bb4e856 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
@@ -26,7 +26,7 @@ allprojects {
apply plugin: 'codenarc'
// license {
-// header rootProject.file('gradle/LICENSE.txt')
+// header rootProject.file('gradle/HEADER.txt')
// include "**/*.groovy"
// include "**/*.java"
// include "**/*.properties"
[2/4] incubator-groovy git commit: tweak licenses
Posted by pa...@apache.org.
tweak licenses
Conflicts:
LICENSE
NOTICE
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/20dce431
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/20dce431
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/20dce431
Branch: refs/heads/GROOVY_2_4_X
Commit: 20dce431cdbc43bd71c18d6bfe2d8a1777e855b8
Parents: d4eefb7
Author: Paul King <pa...@asert.com.au>
Authored: Thu May 21 15:00:42 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 21 18:01:58 2015 +1000
----------------------------------------------------------------------
LICENSE | 308 +++++++++++++++++++++++++--------------
NOTICE | 2 +-
gradle/assemble.gradle | 1 +
licenses/javadocfixtool.txt | 85 +++++++++++
4 files changed, 284 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/20dce431/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7424416..8825713 100644
--- a/LICENSE
+++ b/LICENSE
@@ -202,6 +202,182 @@
limitations under the License.
---------------------------------------------------------------------
+ANTLR 2 License
+
+We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do
+whatever they wish with source code distributed with ANTLR or the code generated by ANTLR, including the
+incorporation of ANTLR, or its output, into commerical software.
+
+We encourage users to develop software with ANTLR. However, we do ask that credit is given to us for
+developing ANTLR. By "credit", we mean that if you use ANTLR or incorporate any source code into one of your
+programs (commercial product, research project, or otherwise) that you acknowledge this fact somewhere in
+the documentation, research report, etc... If you like ANTLR and have developed a nice tool with the output,
+please mention that you developed it using ANTLR. In addition, we ask that the headers remain intact in our
+source code. As long as these guidelines are kept, we expect to continue enhancing this system and expect to
+make other tools available as they are completed.
+
+In countries where the Public Domain status of the work may not be valid, the author grants a copyright
+licence to the general public to deal in the work without restriction and permission to sublicence derivates
+under the terms of any (OSI approved) Open Source licence.
+
+The Python parser generator code under antlr/actions/python/ is covered by the 3-clause BSD licence (this
+part is included in the binary JAR files); the run-time part under lib/python/ is covered by the GNU GPL,
+version 3 or later (this part is not included in the binary JAR files). See [1] for the full details.
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750643#80%22
+
+---------------------------------------------------------------------
+ASM 4 License
+
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+---------------------------------------------------------------------
+Hamcrest License
+
+BSD License
+
+Copyright (c) 2000-2015 www.hamcrest.org
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer. Redistributions in binary form must reproduce
+the above copyright notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+Neither the name of Hamcrest nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+---------------------------------------------------------------------
+Oracle Javadoc FixTool License
+
+Copyright (c) 2013 Oracle and/or its affiliates.
+All rights reserved. Use is subject to license terms.
+
+License Agreement
+
+PLEASE READ THE FOLLOWING LICENSE TERMS CAREFULLY BEFORE USING THE
+ACCOMPANYING PROGRAM. THESE TERMS CONSTITUTE A LEGAL AGREEMENT BETWEEN
+YOU AND US.
+
+"Oracle" refers to Oracle America, Inc., for and on behalf of itself and its
+subsidiaries and affiliates under common control. "We," "us," and "our"
+refers to Oracle and any Program contributors. "You" and "your" refers to
+the individual or entity that wishes to use the Program. "Program" refers to
+the Java API Documentation Updater Tool, Copyright (c) 2013, Oracle America,
+Inc., and updates or error corrections provided by Oracle or contributors.
+
+WARNING:
+The Program will analyze directory information on your computer
+system and may modify software components on such computer system. You
+should only use the Program on computer systems that you maintain sufficient
+rights to update software components.
+
+If your computer system is owned by a person or entity other than you,
+you should check with such person or entity before using the Program.
+
+It is possible that you may lose some software functionality, and make
+Java API Documentation pages unusable on your computer system after you use
+the Program to update software components.
+
+License Rights and Obligations
+We grant you a perpetual, nonexclusive, limited license to use, modify and
+distribute the Program in binary and/or source code form, only for the
+purpose of analyzing the directory structure of your computer system and
+updating Java API Documentation files. If you distribute the Program, in
+either or both binary or source form, including as modified by you, you
+shall include this License Agreement ("Agreement") with your distribution.
+
+All rights not expressly granted above are hereby reserved. If you want to
+use the Program for any purpose other than as permitted under this
+Agreement, you must obtain a valid license permitting such use from Oracle.
+Neither the name of Oracle nor the names of any Program contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+Ownership and Restrictions
+We retain all ownership and intellectual property rights in the Program as
+provided by us. You retain all ownership and intellectual property rights
+in your modifications.
+
+Export
+You agree to comply fully with export laws and regulations of the United
+States and any other applicable export laws ("Export Laws") to assure that
+neither the Program nor any direct products thereof are: (1) exported,
+directly or indirectly, in violation of this Agreement or Export Laws; or
+(2) used for any purposes prohibited by the Export Laws, including, without
+limitation, nuclear, chemical, or biological weapons proliferation, or
+development of missile technology.
+
+Disclaimer of Warranty and Limitation of Liability
+THE PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. USE AT YOUR
+OWN RISK. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED,
+INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+
+IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, DIRECT, INCIDENTAL,
+SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS,
+REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN
+ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES. ORACLE SHALL HAVE NO LIABILITY FOR MODIFICATIONS MADE BY
+YOU OR ANY THIRD PARTY.
+
+Entire Agreement
+You agree that this Agreement is the complete agreement for the Program, and
+this Agreement supersedes all prior or contemporaneous agreements or
+representations. If any term of this Agreement is found to be invalid or
+unenforceable, the remaining provisions will remain effective. This
+Agreement is governed by the substantive and procedural laws of California.
+You and Oracle agree to submit to the exclusive jurisdiction of, and venue
+in, the courts of San Francisco or Santa Clara counties in California in
+any dispute between you and Oracle arising out of or relating to this
+Agreement.
+
+Last updated: 14 June 2013
+
+---------------------------------------------------------------------
JLine License
Copyright (c) 2002-2012, the original author or authors.
@@ -239,39 +415,30 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------
-ASM 4 License
+JSR223 License
-Copyright (c) 2000-2011 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
+Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+Use is subject to license terms.
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met: Redistributions of source code
+must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other materials
+provided with the distribution. Neither the name of the Sun Microsystems nor the names of
+is contributors may be used to endorse or promote products derived from this software
+without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------
JUnit License
@@ -503,6 +670,7 @@ Eclipse Public License - v 1.0
this Agreement will bring a legal action under this Agreement more than
one year after the cause of action arose. Each party waives its rights
to a jury trial in any resulting litigation.
+
---------------------------------------------------------------------
Multiverse License
@@ -526,85 +694,3 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------
-ANTLR 2 License
-
-We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company may do
-whatever they wish with source code distributed with ANTLR or the code generated by ANTLR, including the
-incorporation of ANTLR, or its output, into commerical software.
-
-We encourage users to develop software with ANTLR. However, we do ask that credit is given to us for
-developing ANTLR. By "credit", we mean that if you use ANTLR or incorporate any source code into one of your
-programs (commercial product, research project, or otherwise) that you acknowledge this fact somewhere in
-the documentation, research report, etc... If you like ANTLR and have developed a nice tool with the output,
-please mention that you developed it using ANTLR. In addition, we ask that the headers remain intact in our
-source code. As long as these guidelines are kept, we expect to continue enhancing this system and expect to
-make other tools available as they are completed.
-
-In countries where the Public Domain status of the work may not be valid, the author grants a copyright
-licence to the general public to deal in the work without restriction and permission to sublicence derivates
-under the terms of any (OSI approved) Open Source licence.
-
-The Python parser generator code under antlr/actions/python/ is covered by the 3-clause BSD licence (this
-part is included in the binary JAR files); the run-time part under lib/python/ is covered by the GNU GPL,
-version 3 or later (this part is not included in the binary JAR files). See [1] for the full details.
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750643#80%22
-
----------------------------------------------------------------------
-
-Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-Use is subject to license terms.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met: Redistributions of source code
-must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of
-conditions and the following disclaimer in the documentation and/or other materials
-provided with the distribution. Neither the name of the Sun Microsystems nor the names of
-is contributors may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
----------------------------------------------------------------------
-Hamcrest License
-
-BSD License
-
-Copyright (c) 2000-2015 www.hamcrest.org
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of Hamcrest nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/20dce431/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 24776c1..27c7e05 100644
--- a/NOTICE
+++ b/NOTICE
@@ -19,7 +19,7 @@ Hamcrest (https://github.com/hamcrest/JavaHamcrest)
JCommander (http://jcommander.org/)
Openbeans (https://code.google.com/p/openbeans/)
QDox (http://qdox.codehaus.org/)
-TestNG (http://qdox.codehaus.org/)
+TestNG (http://testng.org/)
XMLPull (http://www.xmlpull.org/)
XStream (http://xstream.codehaus.org/)
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/20dce431/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 862c3ce..d4b69a1 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -38,6 +38,7 @@ ext.licenseSpec = copySpec {
ext.srcSpec = copySpec {
from(projectDir) {
exclude 'target',
+ 'benchmark',
'subprojects/*/target',
'buildSrc/target',
buildDir.path,
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/20dce431/licenses/javadocfixtool.txt
----------------------------------------------------------------------
diff --git a/licenses/javadocfixtool.txt b/licenses/javadocfixtool.txt
new file mode 100644
index 0000000..ca81be8
--- /dev/null
+++ b/licenses/javadocfixtool.txt
@@ -0,0 +1,85 @@
+Oracle Javadoc FixTool License
+
+Copyright (c) 2013 Oracle and/or its affiliates.
+All rights reserved. Use is subject to license terms.
+
+License Agreement
+
+PLEASE READ THE FOLLOWING LICENSE TERMS CAREFULLY BEFORE USING THE
+ACCOMPANYING PROGRAM. THESE TERMS CONSTITUTE A LEGAL AGREEMENT BETWEEN
+YOU AND US.
+
+"Oracle" refers to Oracle America, Inc., for and on behalf of itself and its
+subsidiaries and affiliates under common control. "We," "us," and "our"
+refers to Oracle and any Program contributors. "You" and "your" refers to
+the individual or entity that wishes to use the Program. "Program" refers to
+the Java API Documentation Updater Tool, Copyright (c) 2013, Oracle America,
+Inc., and updates or error corrections provided by Oracle or contributors.
+
+WARNING:
+The Program will analyze directory information on your computer
+system and may modify software components on such computer system. You
+should only use the Program on computer systems that you maintain sufficient
+rights to update software components.
+
+If your computer system is owned by a person or entity other than you,
+you should check with such person or entity before using the Program.
+
+It is possible that you may lose some software functionality, and make
+Java API Documentation pages unusable on your computer system after you use
+the Program to update software components.
+
+License Rights and Obligations
+We grant you a perpetual, nonexclusive, limited license to use, modify and
+distribute the Program in binary and/or source code form, only for the
+purpose of analyzing the directory structure of your computer system and
+updating Java API Documentation files. If you distribute the Program, in
+either or both binary or source form, including as modified by you, you
+shall include this License Agreement ("Agreement") with your distribution.
+
+All rights not expressly granted above are hereby reserved. If you want to
+use the Program for any purpose other than as permitted under this
+Agreement, you must obtain a valid license permitting such use from Oracle.
+Neither the name of Oracle nor the names of any Program contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+Ownership and Restrictions
+We retain all ownership and intellectual property rights in the Program as
+provided by us. You retain all ownership and intellectual property rights
+in your modifications.
+
+Export
+You agree to comply fully with export laws and regulations of the United
+States and any other applicable export laws ("Export Laws") to assure that
+neither the Program nor any direct products thereof are: (1) exported,
+directly or indirectly, in violation of this Agreement or Export Laws; or
+(2) used for any purposes prohibited by the Export Laws, including, without
+limitation, nuclear, chemical, or biological weapons proliferation, or
+development of missile technology.
+
+Disclaimer of Warranty and Limitation of Liability
+THE PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. USE AT YOUR
+OWN RISK. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED,
+INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+
+IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, DIRECT, INCIDENTAL,
+SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS,
+REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN
+ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES. ORACLE SHALL HAVE NO LIABILITY FOR MODIFICATIONS MADE BY
+YOU OR ANY THIRD PARTY.
+
+Entire Agreement
+You agree that this Agreement is the complete agreement for the Program, and
+this Agreement supersedes all prior or contemporaneous agreements or
+representations. If any term of this Agreement is found to be invalid or
+unenforceable, the remaining provisions will remain effective. This
+Agreement is governed by the substantive and procedural laws of California.
+You and Oracle agree to submit to the exclusive jurisdiction of, and venue
+in, the courts of San Francisco or Santa Clara counties in California in
+any dispute between you and Oracle arising out of or relating to this
+Agreement.
+
+Last updated: 14 June 2013