You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/05/19 09:04:56 UTC
[groovy] branch master updated (a0971cc -> 86f5c82)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from a0971cc GROOVY-8647: Split package renaming (a few remaining deprecations)
new 3c1d895 GROOVY-8647: Split package renaming (fix a broken link)
new 86f5c82 move some java files from src/main/groovy to src/main/java and fix up some Javadoc assertion tests that weren't running
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
gradle/test.gradle | 2 +-
src/main/{groovy => java}/groovy/beans/Bindable.java | 0
.../groovy/beans/BindableASTTransformation.java | 0
.../{groovy => java}/groovy/beans/DefaultPropertyAccessor.java | 0
.../{groovy => java}/groovy/beans/DefaultPropertyReader.java | 0
.../{groovy => java}/groovy/beans/DefaultPropertyWriter.java | 0
src/main/{groovy => java}/groovy/beans/PropertyAccessor.java | 0
src/main/{groovy => java}/groovy/beans/PropertyReader.java | 0
src/main/{groovy => java}/groovy/beans/PropertyWriter.java | 0
src/main/{groovy => java}/groovy/beans/Vetoable.java | 0
.../groovy/beans/VetoableASTTransformation.java | 0
src/main/{groovy => java}/groovy/cli/Option.java | 0
src/main/{groovy => java}/groovy/cli/TypedOption.java | 0
src/main/{groovy => java}/groovy/cli/Unparsed.java | 0
.../groovy/grape/GrabAnnotationTransformation.java | 0
src/main/{groovy => java}/groovy/grape/Grape.java | 0
src/main/{groovy => java}/groovy/grape/GrapeEngine.java | 0
src/main/{groovy => java}/groovy/inspect/Inspector.java | 0
src/main/{groovy => java}/groovy/inspect/package.html | 0
.../groovy/io/EncodingAwareBufferedWriter.java | 0
src/main/{groovy => java}/groovy/io/FileType.java | 0
src/main/{groovy => java}/groovy/io/FileVisitResult.java | 0
src/main/{groovy => java}/groovy/io/GroovyPrintStream.java | 0
src/main/{groovy => java}/groovy/io/GroovyPrintWriter.java | 0
src/main/{groovy => java}/groovy/io/LineColumnReader.java | 0
src/main/{groovy => java}/groovy/io/PlatformLineWriter.java | 0
src/main/{groovy => java}/groovy/io/package.html | 0
src/main/{groovy => java}/groovy/lang/AdaptingMetaClass.java | 0
.../{groovy => java}/groovy/lang/BenchmarkInterceptor.java | 0
src/main/{groovy => java}/groovy/lang/Binding.java | 0
src/main/{groovy => java}/groovy/lang/Buildable.java | 0
src/main/{groovy => java}/groovy/lang/Category.java | 0
src/main/{groovy => java}/groovy/lang/Closure.java | 2 +-
src/main/{groovy => java}/groovy/lang/ClosureException.java | 0
.../{groovy => java}/groovy/lang/ClosureInvokingMethod.java | 0
src/main/{groovy => java}/groovy/lang/Delegate.java | 0
src/main/{groovy => java}/groovy/lang/DelegatesTo.java | 0
src/main/{groovy => java}/groovy/lang/DelegatingMetaClass.java | 0
.../{groovy => java}/groovy/lang/DeprecationException.java | 0
src/main/{groovy => java}/groovy/lang/EmptyRange.java | 0
src/main/{groovy => java}/groovy/lang/ExpandoMetaClass.java | 0
.../groovy/lang/ExpandoMetaClassCreationHandle.java | 0
src/main/{groovy => java}/groovy/lang/GString.java | 0
.../{groovy => java}/groovy/lang/GeneratedGroovyProxy.java | 0
src/main/{groovy => java}/groovy/lang/Grab.java | 0
src/main/{groovy => java}/groovy/lang/GrabConfig.java | 0
src/main/{groovy => java}/groovy/lang/GrabExclude.java | 0
src/main/{groovy => java}/groovy/lang/GrabResolver.java | 0
src/main/{groovy => java}/groovy/lang/Grapes.java | 0
src/main/{groovy => java}/groovy/lang/GroovyCallable.java | 0
src/main/{groovy => java}/groovy/lang/GroovyClassLoader.java | 0
src/main/{groovy => java}/groovy/lang/GroovyCodeSource.java | 0
src/main/{groovy => java}/groovy/lang/GroovyInterceptable.java | 0
src/main/{groovy => java}/groovy/lang/GroovyObject.java | 0
src/main/{groovy => java}/groovy/lang/GroovyObjectSupport.java | 0
.../{groovy => java}/groovy/lang/GroovyResourceLoader.java | 0
.../{groovy => java}/groovy/lang/GroovyRuntimeException.java | 0
src/main/{groovy => java}/groovy/lang/GroovyShell.java | 0
src/main/{groovy => java}/groovy/lang/GroovySystem.java | 0
src/main/{groovy => java}/groovy/lang/Groovydoc.java | 0
.../groovy/lang/IllegalPropertyAccessException.java | 0
.../groovy/lang/IncorrectClosureArgumentsException.java | 0
src/main/{groovy => java}/groovy/lang/IntRange.java | 0
src/main/{groovy => java}/groovy/lang/Interceptor.java | 0
src/main/{groovy => java}/groovy/lang/Lazy.java | 0
src/main/{groovy => java}/groovy/lang/ListWithDefault.java | 0
src/main/{groovy => java}/groovy/lang/MapWithDefault.java | 0
.../{groovy => java}/groovy/lang/MetaArrayLengthProperty.java | 0
src/main/{groovy => java}/groovy/lang/MetaBeanProperty.java | 0
src/main/{groovy => java}/groovy/lang/MetaClass.java | 0
src/main/{groovy => java}/groovy/lang/MetaClassImpl.java | 0
src/main/{groovy => java}/groovy/lang/MetaClassRegistry.java | 0
.../groovy/lang/MetaClassRegistryChangeEvent.java | 0
.../groovy/lang/MetaClassRegistryChangeEventListener.java | 0
src/main/{groovy => java}/groovy/lang/MetaExpandoProperty.java | 0
src/main/{groovy => java}/groovy/lang/MetaMethod.java | 0
src/main/{groovy => java}/groovy/lang/MetaObjectProtocol.java | 0
src/main/{groovy => java}/groovy/lang/MetaProperty.java | 0
.../{groovy => java}/groovy/lang/MissingClassException.java | 0
.../{groovy => java}/groovy/lang/MissingFieldException.java | 0
.../{groovy => java}/groovy/lang/MissingMethodException.java | 0
.../{groovy => java}/groovy/lang/MissingPropertyException.java | 0
src/main/{groovy => java}/groovy/lang/Mixin.java | 0
src/main/{groovy => java}/groovy/lang/MutableMetaClass.java | 0
src/main/{groovy => java}/groovy/lang/Newify.java | 0
src/main/{groovy => java}/groovy/lang/NonEmptySequence.java | 0
src/main/{groovy => java}/groovy/lang/NumberRange.java | 0
src/main/{groovy => java}/groovy/lang/ObjectRange.java | 0
src/main/{groovy => java}/groovy/lang/ParameterArray.java | 0
.../groovy/lang/PropertyAccessInterceptor.java | 0
src/main/{groovy => java}/groovy/lang/PropertyValue.java | 0
src/main/{groovy => java}/groovy/lang/ProxyMetaClass.java | 0
src/main/{groovy => java}/groovy/lang/Range.java | 0
.../groovy/lang/ReadOnlyPropertyException.java | 0
src/main/{groovy => java}/groovy/lang/Reference.java | 0
src/main/{groovy => java}/groovy/lang/Script.java | 0
src/main/{groovy => java}/groovy/lang/Sequence.java | 0
src/main/{groovy => java}/groovy/lang/Singleton.java | 0
.../groovy/lang/SpreadListEvaluatingException.java | 0
src/main/{groovy => java}/groovy/lang/SpreadMap.java | 0
.../groovy/lang/SpreadMapEvaluatingException.java | 0
.../{groovy => java}/groovy/lang/StringWriterIOException.java | 0
src/main/{groovy => java}/groovy/lang/TracingInterceptor.java | 0
src/main/{groovy => java}/groovy/lang/TrampolineClosure.java | 0
src/main/{groovy => java}/groovy/lang/Tuple.java | 0
src/main/{groovy => java}/groovy/lang/Tuple0.java | 0
src/main/{groovy => java}/groovy/lang/Tuple1.java | 0
src/main/{groovy => java}/groovy/lang/Tuple10.java | 0
src/main/{groovy => java}/groovy/lang/Tuple11.java | 0
src/main/{groovy => java}/groovy/lang/Tuple12.java | 0
src/main/{groovy => java}/groovy/lang/Tuple13.java | 0
src/main/{groovy => java}/groovy/lang/Tuple14.java | 0
src/main/{groovy => java}/groovy/lang/Tuple15.java | 0
src/main/{groovy => java}/groovy/lang/Tuple16.java | 0
src/main/{groovy => java}/groovy/lang/Tuple2.java | 0
src/main/{groovy => java}/groovy/lang/Tuple3.java | 0
src/main/{groovy => java}/groovy/lang/Tuple4.java | 0
src/main/{groovy => java}/groovy/lang/Tuple5.java | 0
src/main/{groovy => java}/groovy/lang/Tuple6.java | 0
src/main/{groovy => java}/groovy/lang/Tuple7.java | 0
src/main/{groovy => java}/groovy/lang/Tuple8.java | 0
src/main/{groovy => java}/groovy/lang/Tuple9.java | 0
src/main/{groovy => java}/groovy/lang/Writable.java | 0
src/main/{groovy => java}/groovy/lang/groovydoc/Groovydoc.java | 0
.../groovy/lang/groovydoc/GroovydocHolder.java | 0
.../{groovy => java}/groovy/lang/groovydoc/GroovydocTag.java | 0
src/main/{groovy => java}/groovy/lang/package.html | 0
src/main/{groovy => java}/groovy/namespace/QName.java | 0
.../groovy/security/GroovyCodeSourcePermission.java | 0
src/main/{groovy => java}/groovy/security/package.html | 0
src/main/{groovy => java}/groovy/time/BaseDuration.java | 0
.../{groovy => java}/groovy/time/DatumDependentDuration.java | 0
src/main/{groovy => java}/groovy/time/Duration.java | 0
src/main/{groovy => java}/groovy/time/TimeCategory.java | 0
.../groovy/time/TimeDatumDependentDuration.java | 0
src/main/{groovy => java}/groovy/time/TimeDuration.java | 0
src/main/{groovy => java}/groovy/time/package.html | 0
src/main/{groovy => java}/groovy/transform/ASTTest.java | 0
.../{groovy => java}/groovy/transform/AnnotationCollector.java | 8 ++++----
.../groovy/transform/AnnotationCollectorMode.java | 0
src/main/{groovy => java}/groovy/transform/AutoClone.java | 0
src/main/{groovy => java}/groovy/transform/AutoCloneStyle.java | 0
src/main/{groovy => java}/groovy/transform/AutoFinal.java | 0
src/main/{groovy => java}/groovy/transform/AutoImplement.java | 0
src/main/{groovy => java}/groovy/transform/BaseScript.java | 0
.../groovy/transform/CompilationUnitAware.java | 0
src/main/{groovy => java}/groovy/transform/CompileStatic.java | 0
.../{groovy => java}/groovy/transform/EqualsAndHashCode.java | 0
.../{groovy => java}/groovy/transform/ExternalizeMethods.java | 0
.../{groovy => java}/groovy/transform/ExternalizeVerifier.java | 0
src/main/{groovy => java}/groovy/transform/Field.java | 0
src/main/{groovy => java}/groovy/transform/Generated.java | 0
src/main/{groovy => java}/groovy/transform/ImmutableBase.java | 0
.../{groovy => java}/groovy/transform/ImmutableOptions.java | 0
.../{groovy => java}/groovy/transform/IndexedProperty.java | 0
.../{groovy => java}/groovy/transform/InheritConstructors.java | 0
src/main/{groovy => java}/groovy/transform/Internal.java | 0
src/main/{groovy => java}/groovy/transform/KnownImmutable.java | 0
src/main/{groovy => java}/groovy/transform/MapConstructor.java | 0
src/main/{groovy => java}/groovy/transform/Memoized.java | 0
src/main/{groovy => java}/groovy/transform/NamedDelegate.java | 0
src/main/{groovy => java}/groovy/transform/NamedParam.java | 0
src/main/{groovy => java}/groovy/transform/NamedParams.java | 0
src/main/{groovy => java}/groovy/transform/NamedVariant.java | 0
src/main/{groovy => java}/groovy/transform/NullCheck.java | 0
src/main/{groovy => java}/groovy/transform/PackageScope.java | 0
.../{groovy => java}/groovy/transform/PackageScopeTarget.java | 0
.../{groovy => java}/groovy/transform/PropertyOptions.java | 0
src/main/{groovy => java}/groovy/transform/SelfType.java | 0
src/main/{groovy => java}/groovy/transform/Sortable.java | 0
src/main/{groovy => java}/groovy/transform/SourceURI.java | 0
src/main/{groovy => java}/groovy/transform/Synchronized.java | 0
src/main/{groovy => java}/groovy/transform/ToString.java | 0
src/main/{groovy => java}/groovy/transform/Trait.java | 0
.../{groovy => java}/groovy/transform/TupleConstructor.java | 0
src/main/{groovy => java}/groovy/transform/TypeChecked.java | 0
.../{groovy => java}/groovy/transform/TypeCheckingMode.java | 0
src/main/{groovy => java}/groovy/transform/Undefined.java | 0
.../{groovy => java}/groovy/transform/VisibilityOptions.java | 0
src/main/{groovy => java}/groovy/transform/WithReadLock.java | 0
src/main/{groovy => java}/groovy/transform/WithWriteLock.java | 0
.../{groovy => java}/groovy/transform/builder/Builder.java | 0
.../groovy/transform/builder/DefaultStrategy.java | 0
.../groovy/transform/builder/ExternalStrategy.java | 0
.../groovy/transform/builder/InitializerStrategy.java | 0
.../groovy/transform/builder/SimpleStrategy.java | 0
.../groovy/transform/options/DefaultPropertyHandler.java | 0
.../groovy/transform/options/ImmutablePropertyHandler.java | 0
.../groovy/transform/options/LegacyHashMapPropertyHandler.java | 0
.../groovy/transform/options/PropertyHandler.java | 0
.../{groovy => java}/groovy/transform/options/Visibility.java | 0
.../{groovy => java}/groovy/transform/stc/ClosureParams.java | 0
.../groovy/transform/stc/ClosureSignatureConflictResolver.java | 0
.../groovy/transform/stc/ClosureSignatureHint.java | 0
src/main/{groovy => java}/groovy/transform/stc/FirstParam.java | 0
.../groovy/transform/stc/FromAbstractTypeMethods.java | 0
src/main/{groovy => java}/groovy/transform/stc/FromString.java | 0
.../groovy/transform/stc/IncorrectTypeHintException.java | 0
.../groovy/transform/stc/MapEntryOrKeyValue.java | 0
.../groovy/transform/stc/PickAnyArgumentHint.java | 0
.../groovy/transform/stc/PickFirstResolver.java | 0
.../{groovy => java}/groovy/transform/stc/SecondParam.java | 0
src/main/{groovy => java}/groovy/transform/stc/SimpleType.java | 0
.../groovy/transform/stc/SingleSignatureClosureHint.java | 0
src/main/{groovy => java}/groovy/transform/stc/ThirdParam.java | 0
src/main/{groovy => java}/groovy/ui/GroovyMain.java | 0
src/main/{groovy => java}/groovy/ui/GroovySocketServer.java | 0
src/main/{groovy => java}/groovy/util/AbstractFactory.java | 0
src/main/{groovy => java}/groovy/util/BufferedIterator.java | 0
src/main/{groovy => java}/groovy/util/BuilderSupport.java | 0
src/main/{groovy => java}/groovy/util/CharsetToolkit.java | 0
src/main/{groovy => java}/groovy/util/ClosureComparator.java | 0
src/main/{groovy => java}/groovy/util/ConfigObject.java | 0
src/main/{groovy => java}/groovy/util/DelegatingScript.java | 0
src/main/{groovy => java}/groovy/util/Eval.java | 0
src/main/{groovy => java}/groovy/util/Expando.java | 0
src/main/{groovy => java}/groovy/util/Factory.java | 0
.../{groovy => java}/groovy/util/FactoryBuilderSupport.java | 0
src/main/{groovy => java}/groovy/util/GroovyCollections.java | 0
src/main/{groovy => java}/groovy/util/GroovyScriptEngine.java | 0
src/main/{groovy => java}/groovy/util/IFileNameFinder.java | 0
src/main/{groovy => java}/groovy/util/IndentPrinter.java | 0
src/main/{groovy => java}/groovy/util/MapEntry.java | 0
src/main/{groovy => java}/groovy/util/Node.java | 0
src/main/{groovy => java}/groovy/util/NodeBuilder.java | 0
src/main/{groovy => java}/groovy/util/NodeList.java | 0
src/main/{groovy => java}/groovy/util/NodePrinter.java | 0
src/main/{groovy => java}/groovy/util/ObjectGraphBuilder.java | 0
src/main/{groovy => java}/groovy/util/ObservableList.java | 0
src/main/{groovy => java}/groovy/util/ObservableMap.java | 0
src/main/{groovy => java}/groovy/util/ObservableSet.java | 0
src/main/{groovy => java}/groovy/util/OrderBy.java | 0
.../{groovy => java}/groovy/util/PermutationGenerator.java | 0
src/main/{groovy => java}/groovy/util/Proxy.java | 0
src/main/{groovy => java}/groovy/util/ProxyGenerator.java | 0
src/main/{groovy => java}/groovy/util/ResourceConnector.java | 0
src/main/{groovy => java}/groovy/util/ResourceException.java | 0
src/main/{groovy => java}/groovy/util/ScriptException.java | 0
src/main/{groovy => java}/groovy/util/logging/Commons.java | 0
src/main/{groovy => java}/groovy/util/logging/Log.java | 0
src/main/{groovy => java}/groovy/util/logging/Log4j.java | 0
src/main/{groovy => java}/groovy/util/logging/Log4j2.java | 0
src/main/{groovy => java}/groovy/util/logging/Slf4j.java | 0
src/main/{groovy => java}/groovy/util/package.html | 0
src/main/{groovy => java}/groovy/xml/QName.java | 0
src/test/MainJavadocAssertionTest.groovy | 3 ++-
subprojects/groovy-json/build.gradle | 2 +-
.../test/groovy/groovy/json/JsonJavadocAssertionTest.groovy | 2 ++
.../main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy | 5 ++---
.../main/groovy/groovy/test/JavadocAssertionTestSuite.groovy | 2 +-
.../src/main/java/groovy/transform/NotYetImplemented.java | 2 +-
.../groovy/groovy/test}/JavadocAssertionTestBuilderTest.groovy | 2 +-
.../src/test/groovy/groovy/xml/XmlJavadocAssertionTest.groovy | 4 ++--
subprojects/groovy-yaml/build.gradle | 1 +
.../test/groovy/groovy/yaml/YamlJavadocAssertionTest.groovy | 10 +++++++---
255 files changed, 26 insertions(+), 19 deletions(-)
rename src/main/{groovy => java}/groovy/beans/Bindable.java (100%)
rename src/main/{groovy => java}/groovy/beans/BindableASTTransformation.java (100%)
rename src/main/{groovy => java}/groovy/beans/DefaultPropertyAccessor.java (100%)
rename src/main/{groovy => java}/groovy/beans/DefaultPropertyReader.java (100%)
rename src/main/{groovy => java}/groovy/beans/DefaultPropertyWriter.java (100%)
rename src/main/{groovy => java}/groovy/beans/PropertyAccessor.java (100%)
rename src/main/{groovy => java}/groovy/beans/PropertyReader.java (100%)
rename src/main/{groovy => java}/groovy/beans/PropertyWriter.java (100%)
rename src/main/{groovy => java}/groovy/beans/Vetoable.java (100%)
rename src/main/{groovy => java}/groovy/beans/VetoableASTTransformation.java (100%)
rename src/main/{groovy => java}/groovy/cli/Option.java (100%)
rename src/main/{groovy => java}/groovy/cli/TypedOption.java (100%)
rename src/main/{groovy => java}/groovy/cli/Unparsed.java (100%)
rename src/main/{groovy => java}/groovy/grape/GrabAnnotationTransformation.java (100%)
rename src/main/{groovy => java}/groovy/grape/Grape.java (100%)
rename src/main/{groovy => java}/groovy/grape/GrapeEngine.java (100%)
rename src/main/{groovy => java}/groovy/inspect/Inspector.java (100%)
rename src/main/{groovy => java}/groovy/inspect/package.html (100%)
rename src/main/{groovy => java}/groovy/io/EncodingAwareBufferedWriter.java (100%)
rename src/main/{groovy => java}/groovy/io/FileType.java (100%)
rename src/main/{groovy => java}/groovy/io/FileVisitResult.java (100%)
rename src/main/{groovy => java}/groovy/io/GroovyPrintStream.java (100%)
rename src/main/{groovy => java}/groovy/io/GroovyPrintWriter.java (100%)
rename src/main/{groovy => java}/groovy/io/LineColumnReader.java (100%)
rename src/main/{groovy => java}/groovy/io/PlatformLineWriter.java (100%)
rename src/main/{groovy => java}/groovy/io/package.html (100%)
rename src/main/{groovy => java}/groovy/lang/AdaptingMetaClass.java (100%)
rename src/main/{groovy => java}/groovy/lang/BenchmarkInterceptor.java (100%)
rename src/main/{groovy => java}/groovy/lang/Binding.java (100%)
copy src/main/{groovy => java}/groovy/lang/Buildable.java (100%)
rename src/main/{groovy => java}/groovy/lang/Category.java (100%)
rename src/main/{groovy => java}/groovy/lang/Closure.java (99%)
rename src/main/{groovy => java}/groovy/lang/ClosureException.java (100%)
rename src/main/{groovy => java}/groovy/lang/ClosureInvokingMethod.java (100%)
rename src/main/{groovy => java}/groovy/lang/Delegate.java (100%)
rename src/main/{groovy => java}/groovy/lang/DelegatesTo.java (100%)
rename src/main/{groovy => java}/groovy/lang/DelegatingMetaClass.java (100%)
rename src/main/{groovy => java}/groovy/lang/DeprecationException.java (100%)
rename src/main/{groovy => java}/groovy/lang/EmptyRange.java (100%)
rename src/main/{groovy => java}/groovy/lang/ExpandoMetaClass.java (100%)
rename src/main/{groovy => java}/groovy/lang/ExpandoMetaClassCreationHandle.java (100%)
rename src/main/{groovy => java}/groovy/lang/GString.java (100%)
rename src/main/{groovy => java}/groovy/lang/GeneratedGroovyProxy.java (100%)
rename src/main/{groovy => java}/groovy/lang/Grab.java (100%)
rename src/main/{groovy => java}/groovy/lang/GrabConfig.java (100%)
rename src/main/{groovy => java}/groovy/lang/GrabExclude.java (100%)
rename src/main/{groovy => java}/groovy/lang/GrabResolver.java (100%)
rename src/main/{groovy => java}/groovy/lang/Grapes.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovyCallable.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovyClassLoader.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovyCodeSource.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovyInterceptable.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovyObject.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovyObjectSupport.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovyResourceLoader.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovyRuntimeException.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovyShell.java (100%)
rename src/main/{groovy => java}/groovy/lang/GroovySystem.java (100%)
rename src/main/{groovy => java}/groovy/lang/Groovydoc.java (100%)
rename src/main/{groovy => java}/groovy/lang/IllegalPropertyAccessException.java (100%)
rename src/main/{groovy => java}/groovy/lang/IncorrectClosureArgumentsException.java (100%)
rename src/main/{groovy => java}/groovy/lang/IntRange.java (100%)
rename src/main/{groovy => java}/groovy/lang/Interceptor.java (100%)
rename src/main/{groovy => java}/groovy/lang/Lazy.java (100%)
rename src/main/{groovy => java}/groovy/lang/ListWithDefault.java (100%)
rename src/main/{groovy => java}/groovy/lang/MapWithDefault.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaArrayLengthProperty.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaBeanProperty.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaClass.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaClassImpl.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaClassRegistry.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaClassRegistryChangeEvent.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaClassRegistryChangeEventListener.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaExpandoProperty.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaMethod.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaObjectProtocol.java (100%)
rename src/main/{groovy => java}/groovy/lang/MetaProperty.java (100%)
rename src/main/{groovy => java}/groovy/lang/MissingClassException.java (100%)
rename src/main/{groovy => java}/groovy/lang/MissingFieldException.java (100%)
rename src/main/{groovy => java}/groovy/lang/MissingMethodException.java (100%)
rename src/main/{groovy => java}/groovy/lang/MissingPropertyException.java (100%)
rename src/main/{groovy => java}/groovy/lang/Mixin.java (100%)
rename src/main/{groovy => java}/groovy/lang/MutableMetaClass.java (100%)
rename src/main/{groovy => java}/groovy/lang/Newify.java (100%)
rename src/main/{groovy => java}/groovy/lang/NonEmptySequence.java (100%)
rename src/main/{groovy => java}/groovy/lang/NumberRange.java (100%)
rename src/main/{groovy => java}/groovy/lang/ObjectRange.java (100%)
rename src/main/{groovy => java}/groovy/lang/ParameterArray.java (100%)
rename src/main/{groovy => java}/groovy/lang/PropertyAccessInterceptor.java (100%)
rename src/main/{groovy => java}/groovy/lang/PropertyValue.java (100%)
rename src/main/{groovy => java}/groovy/lang/ProxyMetaClass.java (100%)
rename src/main/{groovy => java}/groovy/lang/Range.java (100%)
rename src/main/{groovy => java}/groovy/lang/ReadOnlyPropertyException.java (100%)
rename src/main/{groovy => java}/groovy/lang/Reference.java (100%)
rename src/main/{groovy => java}/groovy/lang/Script.java (100%)
rename src/main/{groovy => java}/groovy/lang/Sequence.java (100%)
rename src/main/{groovy => java}/groovy/lang/Singleton.java (100%)
rename src/main/{groovy => java}/groovy/lang/SpreadListEvaluatingException.java (100%)
rename src/main/{groovy => java}/groovy/lang/SpreadMap.java (100%)
rename src/main/{groovy => java}/groovy/lang/SpreadMapEvaluatingException.java (100%)
rename src/main/{groovy => java}/groovy/lang/StringWriterIOException.java (100%)
rename src/main/{groovy => java}/groovy/lang/TracingInterceptor.java (100%)
rename src/main/{groovy => java}/groovy/lang/TrampolineClosure.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple0.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple1.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple10.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple11.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple12.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple13.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple14.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple15.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple16.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple2.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple3.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple4.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple5.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple6.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple7.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple8.java (100%)
rename src/main/{groovy => java}/groovy/lang/Tuple9.java (100%)
rename src/main/{groovy => java}/groovy/lang/Writable.java (100%)
rename src/main/{groovy => java}/groovy/lang/groovydoc/Groovydoc.java (100%)
rename src/main/{groovy => java}/groovy/lang/groovydoc/GroovydocHolder.java (100%)
rename src/main/{groovy => java}/groovy/lang/groovydoc/GroovydocTag.java (100%)
rename src/main/{groovy => java}/groovy/lang/package.html (100%)
rename src/main/{groovy => java}/groovy/namespace/QName.java (100%)
rename src/main/{groovy => java}/groovy/security/GroovyCodeSourcePermission.java (100%)
rename src/main/{groovy => java}/groovy/security/package.html (100%)
rename src/main/{groovy => java}/groovy/time/BaseDuration.java (100%)
rename src/main/{groovy => java}/groovy/time/DatumDependentDuration.java (100%)
rename src/main/{groovy => java}/groovy/time/Duration.java (100%)
rename src/main/{groovy => java}/groovy/time/TimeCategory.java (100%)
rename src/main/{groovy => java}/groovy/time/TimeDatumDependentDuration.java (100%)
rename src/main/{groovy => java}/groovy/time/TimeDuration.java (100%)
rename src/main/{groovy => java}/groovy/time/package.html (100%)
rename src/main/{groovy => java}/groovy/transform/ASTTest.java (100%)
rename src/main/{groovy => java}/groovy/transform/AnnotationCollector.java (97%)
rename src/main/{groovy => java}/groovy/transform/AnnotationCollectorMode.java (100%)
rename src/main/{groovy => java}/groovy/transform/AutoClone.java (100%)
rename src/main/{groovy => java}/groovy/transform/AutoCloneStyle.java (100%)
rename src/main/{groovy => java}/groovy/transform/AutoFinal.java (100%)
rename src/main/{groovy => java}/groovy/transform/AutoImplement.java (100%)
rename src/main/{groovy => java}/groovy/transform/BaseScript.java (100%)
rename src/main/{groovy => java}/groovy/transform/CompilationUnitAware.java (100%)
rename src/main/{groovy => java}/groovy/transform/CompileStatic.java (100%)
rename src/main/{groovy => java}/groovy/transform/EqualsAndHashCode.java (100%)
rename src/main/{groovy => java}/groovy/transform/ExternalizeMethods.java (100%)
rename src/main/{groovy => java}/groovy/transform/ExternalizeVerifier.java (100%)
rename src/main/{groovy => java}/groovy/transform/Field.java (100%)
rename src/main/{groovy => java}/groovy/transform/Generated.java (100%)
rename src/main/{groovy => java}/groovy/transform/ImmutableBase.java (100%)
rename src/main/{groovy => java}/groovy/transform/ImmutableOptions.java (100%)
rename src/main/{groovy => java}/groovy/transform/IndexedProperty.java (100%)
rename src/main/{groovy => java}/groovy/transform/InheritConstructors.java (100%)
rename src/main/{groovy => java}/groovy/transform/Internal.java (100%)
rename src/main/{groovy => java}/groovy/transform/KnownImmutable.java (100%)
rename src/main/{groovy => java}/groovy/transform/MapConstructor.java (100%)
rename src/main/{groovy => java}/groovy/transform/Memoized.java (100%)
rename src/main/{groovy => java}/groovy/transform/NamedDelegate.java (100%)
rename src/main/{groovy => java}/groovy/transform/NamedParam.java (100%)
rename src/main/{groovy => java}/groovy/transform/NamedParams.java (100%)
rename src/main/{groovy => java}/groovy/transform/NamedVariant.java (100%)
rename src/main/{groovy => java}/groovy/transform/NullCheck.java (100%)
rename src/main/{groovy => java}/groovy/transform/PackageScope.java (100%)
rename src/main/{groovy => java}/groovy/transform/PackageScopeTarget.java (100%)
rename src/main/{groovy => java}/groovy/transform/PropertyOptions.java (100%)
rename src/main/{groovy => java}/groovy/transform/SelfType.java (100%)
rename src/main/{groovy => java}/groovy/transform/Sortable.java (100%)
rename src/main/{groovy => java}/groovy/transform/SourceURI.java (100%)
rename src/main/{groovy => java}/groovy/transform/Synchronized.java (100%)
rename src/main/{groovy => java}/groovy/transform/ToString.java (100%)
rename src/main/{groovy => java}/groovy/transform/Trait.java (100%)
rename src/main/{groovy => java}/groovy/transform/TupleConstructor.java (100%)
rename src/main/{groovy => java}/groovy/transform/TypeChecked.java (100%)
rename src/main/{groovy => java}/groovy/transform/TypeCheckingMode.java (100%)
rename src/main/{groovy => java}/groovy/transform/Undefined.java (100%)
rename src/main/{groovy => java}/groovy/transform/VisibilityOptions.java (100%)
rename src/main/{groovy => java}/groovy/transform/WithReadLock.java (100%)
rename src/main/{groovy => java}/groovy/transform/WithWriteLock.java (100%)
rename src/main/{groovy => java}/groovy/transform/builder/Builder.java (100%)
rename src/main/{groovy => java}/groovy/transform/builder/DefaultStrategy.java (100%)
rename src/main/{groovy => java}/groovy/transform/builder/ExternalStrategy.java (100%)
rename src/main/{groovy => java}/groovy/transform/builder/InitializerStrategy.java (100%)
rename src/main/{groovy => java}/groovy/transform/builder/SimpleStrategy.java (100%)
rename src/main/{groovy => java}/groovy/transform/options/DefaultPropertyHandler.java (100%)
rename src/main/{groovy => java}/groovy/transform/options/ImmutablePropertyHandler.java (100%)
rename src/main/{groovy => java}/groovy/transform/options/LegacyHashMapPropertyHandler.java (100%)
rename src/main/{groovy => java}/groovy/transform/options/PropertyHandler.java (100%)
rename src/main/{groovy => java}/groovy/transform/options/Visibility.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/ClosureParams.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/ClosureSignatureConflictResolver.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/ClosureSignatureHint.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/FirstParam.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/FromAbstractTypeMethods.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/FromString.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/IncorrectTypeHintException.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/MapEntryOrKeyValue.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/PickAnyArgumentHint.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/PickFirstResolver.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/SecondParam.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/SimpleType.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/SingleSignatureClosureHint.java (100%)
rename src/main/{groovy => java}/groovy/transform/stc/ThirdParam.java (100%)
rename src/main/{groovy => java}/groovy/ui/GroovyMain.java (100%)
rename src/main/{groovy => java}/groovy/ui/GroovySocketServer.java (100%)
rename src/main/{groovy => java}/groovy/util/AbstractFactory.java (100%)
rename src/main/{groovy => java}/groovy/util/BufferedIterator.java (100%)
rename src/main/{groovy => java}/groovy/util/BuilderSupport.java (100%)
rename src/main/{groovy => java}/groovy/util/CharsetToolkit.java (100%)
rename src/main/{groovy => java}/groovy/util/ClosureComparator.java (100%)
rename src/main/{groovy => java}/groovy/util/ConfigObject.java (100%)
rename src/main/{groovy => java}/groovy/util/DelegatingScript.java (100%)
rename src/main/{groovy => java}/groovy/util/Eval.java (100%)
rename src/main/{groovy => java}/groovy/util/Expando.java (100%)
rename src/main/{groovy => java}/groovy/util/Factory.java (100%)
rename src/main/{groovy => java}/groovy/util/FactoryBuilderSupport.java (100%)
rename src/main/{groovy => java}/groovy/util/GroovyCollections.java (100%)
rename src/main/{groovy => java}/groovy/util/GroovyScriptEngine.java (100%)
rename src/main/{groovy => java}/groovy/util/IFileNameFinder.java (100%)
rename src/main/{groovy => java}/groovy/util/IndentPrinter.java (100%)
rename src/main/{groovy => java}/groovy/util/MapEntry.java (100%)
rename src/main/{groovy => java}/groovy/util/Node.java (100%)
rename src/main/{groovy => java}/groovy/util/NodeBuilder.java (100%)
rename src/main/{groovy => java}/groovy/util/NodeList.java (100%)
rename src/main/{groovy => java}/groovy/util/NodePrinter.java (100%)
rename src/main/{groovy => java}/groovy/util/ObjectGraphBuilder.java (100%)
rename src/main/{groovy => java}/groovy/util/ObservableList.java (100%)
rename src/main/{groovy => java}/groovy/util/ObservableMap.java (100%)
rename src/main/{groovy => java}/groovy/util/ObservableSet.java (100%)
rename src/main/{groovy => java}/groovy/util/OrderBy.java (100%)
rename src/main/{groovy => java}/groovy/util/PermutationGenerator.java (100%)
rename src/main/{groovy => java}/groovy/util/Proxy.java (100%)
rename src/main/{groovy => java}/groovy/util/ProxyGenerator.java (100%)
rename src/main/{groovy => java}/groovy/util/ResourceConnector.java (100%)
rename src/main/{groovy => java}/groovy/util/ResourceException.java (100%)
rename src/main/{groovy => java}/groovy/util/ScriptException.java (100%)
rename src/main/{groovy => java}/groovy/util/logging/Commons.java (100%)
rename src/main/{groovy => java}/groovy/util/logging/Log.java (100%)
rename src/main/{groovy => java}/groovy/util/logging/Log4j.java (100%)
rename src/main/{groovy => java}/groovy/util/logging/Log4j2.java (100%)
rename src/main/{groovy => java}/groovy/util/logging/Slf4j.java (100%)
rename src/main/{groovy => java}/groovy/util/package.html (100%)
rename src/main/{groovy => java}/groovy/xml/QName.java (100%)
rename {src/test/groovy/util => subprojects/groovy-test/src/test/groovy/groovy/test}/JavadocAssertionTestBuilderTest.groovy (99%)
rename src/main/groovy/groovy/lang/Buildable.java => subprojects/groovy-yaml/src/test/groovy/groovy/yaml/YamlJavadocAssertionTest.groovy (78%)
[groovy] 02/02: move some java files from src/main/groovy to
src/main/java and fix up some Javadoc assertion tests that weren't running
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 86f5c8216b5d0f042408bdc4ae5d6a7baa247c95
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun May 19 19:04:42 2019 +1000
move some java files from src/main/groovy to src/main/java and fix up some Javadoc assertion tests that weren't running
---
gradle/test.gradle | 2 +-
src/main/{groovy => java}/groovy/beans/Bindable.java | 0
.../groovy/beans/BindableASTTransformation.java | 0
.../{groovy => java}/groovy/beans/DefaultPropertyAccessor.java | 0
.../{groovy => java}/groovy/beans/DefaultPropertyReader.java | 0
.../{groovy => java}/groovy/beans/DefaultPropertyWriter.java | 0
src/main/{groovy => java}/groovy/beans/PropertyAccessor.java | 0
src/main/{groovy => java}/groovy/beans/PropertyReader.java | 0
src/main/{groovy => java}/groovy/beans/PropertyWriter.java | 0
src/main/{groovy => java}/groovy/beans/Vetoable.java | 0
.../groovy/beans/VetoableASTTransformation.java | 0
src/main/{groovy => java}/groovy/cli/Option.java | 0
src/main/{groovy => java}/groovy/cli/TypedOption.java | 0
src/main/{groovy => java}/groovy/cli/Unparsed.java | 0
.../groovy/grape/GrabAnnotationTransformation.java | 0
src/main/{groovy => java}/groovy/grape/Grape.java | 0
src/main/{groovy => java}/groovy/grape/GrapeEngine.java | 0
src/main/{groovy => java}/groovy/inspect/Inspector.java | 0
src/main/{groovy => java}/groovy/inspect/package.html | 0
.../groovy/io/EncodingAwareBufferedWriter.java | 0
src/main/{groovy => java}/groovy/io/FileType.java | 0
src/main/{groovy => java}/groovy/io/FileVisitResult.java | 0
src/main/{groovy => java}/groovy/io/GroovyPrintStream.java | 0
src/main/{groovy => java}/groovy/io/GroovyPrintWriter.java | 0
src/main/{groovy => java}/groovy/io/LineColumnReader.java | 0
src/main/{groovy => java}/groovy/io/PlatformLineWriter.java | 0
src/main/{groovy => java}/groovy/io/package.html | 0
src/main/{groovy => java}/groovy/lang/AdaptingMetaClass.java | 0
.../{groovy => java}/groovy/lang/BenchmarkInterceptor.java | 0
src/main/{groovy => java}/groovy/lang/Binding.java | 0
src/main/{groovy => java}/groovy/lang/Buildable.java | 0
src/main/{groovy => java}/groovy/lang/Category.java | 0
src/main/{groovy => java}/groovy/lang/Closure.java | 2 +-
src/main/{groovy => java}/groovy/lang/ClosureException.java | 0
.../{groovy => java}/groovy/lang/ClosureInvokingMethod.java | 0
src/main/{groovy => java}/groovy/lang/Delegate.java | 0
src/main/{groovy => java}/groovy/lang/DelegatesTo.java | 0
src/main/{groovy => java}/groovy/lang/DelegatingMetaClass.java | 0
.../{groovy => java}/groovy/lang/DeprecationException.java | 0
src/main/{groovy => java}/groovy/lang/EmptyRange.java | 0
src/main/{groovy => java}/groovy/lang/ExpandoMetaClass.java | 0
.../groovy/lang/ExpandoMetaClassCreationHandle.java | 0
src/main/{groovy => java}/groovy/lang/GString.java | 0
.../{groovy => java}/groovy/lang/GeneratedGroovyProxy.java | 0
src/main/{groovy => java}/groovy/lang/Grab.java | 0
src/main/{groovy => java}/groovy/lang/GrabConfig.java | 0
src/main/{groovy => java}/groovy/lang/GrabExclude.java | 0
src/main/{groovy => java}/groovy/lang/GrabResolver.java | 0
src/main/{groovy => java}/groovy/lang/Grapes.java | 0
src/main/{groovy => java}/groovy/lang/GroovyCallable.java | 0
src/main/{groovy => java}/groovy/lang/GroovyClassLoader.java | 0
src/main/{groovy => java}/groovy/lang/GroovyCodeSource.java | 0
src/main/{groovy => java}/groovy/lang/GroovyInterceptable.java | 0
src/main/{groovy => java}/groovy/lang/GroovyObject.java | 0
src/main/{groovy => java}/groovy/lang/GroovyObjectSupport.java | 0
.../{groovy => java}/groovy/lang/GroovyResourceLoader.java | 0
.../{groovy => java}/groovy/lang/GroovyRuntimeException.java | 0
src/main/{groovy => java}/groovy/lang/GroovyShell.java | 0
src/main/{groovy => java}/groovy/lang/GroovySystem.java | 0
src/main/{groovy => java}/groovy/lang/Groovydoc.java | 0
.../groovy/lang/IllegalPropertyAccessException.java | 0
.../groovy/lang/IncorrectClosureArgumentsException.java | 0
src/main/{groovy => java}/groovy/lang/IntRange.java | 0
src/main/{groovy => java}/groovy/lang/Interceptor.java | 0
src/main/{groovy => java}/groovy/lang/Lazy.java | 0
src/main/{groovy => java}/groovy/lang/ListWithDefault.java | 0
src/main/{groovy => java}/groovy/lang/MapWithDefault.java | 0
.../{groovy => java}/groovy/lang/MetaArrayLengthProperty.java | 0
src/main/{groovy => java}/groovy/lang/MetaBeanProperty.java | 0
src/main/{groovy => java}/groovy/lang/MetaClass.java | 0
src/main/{groovy => java}/groovy/lang/MetaClassImpl.java | 0
src/main/{groovy => java}/groovy/lang/MetaClassRegistry.java | 0
.../groovy/lang/MetaClassRegistryChangeEvent.java | 0
.../groovy/lang/MetaClassRegistryChangeEventListener.java | 0
src/main/{groovy => java}/groovy/lang/MetaExpandoProperty.java | 0
src/main/{groovy => java}/groovy/lang/MetaMethod.java | 0
src/main/{groovy => java}/groovy/lang/MetaObjectProtocol.java | 0
src/main/{groovy => java}/groovy/lang/MetaProperty.java | 0
.../{groovy => java}/groovy/lang/MissingClassException.java | 0
.../{groovy => java}/groovy/lang/MissingFieldException.java | 0
.../{groovy => java}/groovy/lang/MissingMethodException.java | 0
.../{groovy => java}/groovy/lang/MissingPropertyException.java | 0
src/main/{groovy => java}/groovy/lang/Mixin.java | 0
src/main/{groovy => java}/groovy/lang/MutableMetaClass.java | 0
src/main/{groovy => java}/groovy/lang/Newify.java | 0
src/main/{groovy => java}/groovy/lang/NonEmptySequence.java | 0
src/main/{groovy => java}/groovy/lang/NumberRange.java | 0
src/main/{groovy => java}/groovy/lang/ObjectRange.java | 0
src/main/{groovy => java}/groovy/lang/ParameterArray.java | 0
.../groovy/lang/PropertyAccessInterceptor.java | 0
src/main/{groovy => java}/groovy/lang/PropertyValue.java | 0
src/main/{groovy => java}/groovy/lang/ProxyMetaClass.java | 0
src/main/{groovy => java}/groovy/lang/Range.java | 0
.../groovy/lang/ReadOnlyPropertyException.java | 0
src/main/{groovy => java}/groovy/lang/Reference.java | 0
src/main/{groovy => java}/groovy/lang/Script.java | 0
src/main/{groovy => java}/groovy/lang/Sequence.java | 0
src/main/{groovy => java}/groovy/lang/Singleton.java | 0
.../groovy/lang/SpreadListEvaluatingException.java | 0
src/main/{groovy => java}/groovy/lang/SpreadMap.java | 0
.../groovy/lang/SpreadMapEvaluatingException.java | 0
.../{groovy => java}/groovy/lang/StringWriterIOException.java | 0
src/main/{groovy => java}/groovy/lang/TracingInterceptor.java | 0
src/main/{groovy => java}/groovy/lang/TrampolineClosure.java | 0
src/main/{groovy => java}/groovy/lang/Tuple.java | 0
src/main/{groovy => java}/groovy/lang/Tuple0.java | 0
src/main/{groovy => java}/groovy/lang/Tuple1.java | 0
src/main/{groovy => java}/groovy/lang/Tuple10.java | 0
src/main/{groovy => java}/groovy/lang/Tuple11.java | 0
src/main/{groovy => java}/groovy/lang/Tuple12.java | 0
src/main/{groovy => java}/groovy/lang/Tuple13.java | 0
src/main/{groovy => java}/groovy/lang/Tuple14.java | 0
src/main/{groovy => java}/groovy/lang/Tuple15.java | 0
src/main/{groovy => java}/groovy/lang/Tuple16.java | 0
src/main/{groovy => java}/groovy/lang/Tuple2.java | 0
src/main/{groovy => java}/groovy/lang/Tuple3.java | 0
src/main/{groovy => java}/groovy/lang/Tuple4.java | 0
src/main/{groovy => java}/groovy/lang/Tuple5.java | 0
src/main/{groovy => java}/groovy/lang/Tuple6.java | 0
src/main/{groovy => java}/groovy/lang/Tuple7.java | 0
src/main/{groovy => java}/groovy/lang/Tuple8.java | 0
src/main/{groovy => java}/groovy/lang/Tuple9.java | 0
src/main/{groovy => java}/groovy/lang/Writable.java | 0
src/main/{groovy => java}/groovy/lang/groovydoc/Groovydoc.java | 0
.../groovy/lang/groovydoc/GroovydocHolder.java | 0
.../{groovy => java}/groovy/lang/groovydoc/GroovydocTag.java | 0
src/main/{groovy => java}/groovy/lang/package.html | 0
src/main/{groovy => java}/groovy/namespace/QName.java | 0
.../groovy/security/GroovyCodeSourcePermission.java | 0
src/main/{groovy => java}/groovy/security/package.html | 0
src/main/{groovy => java}/groovy/time/BaseDuration.java | 0
.../{groovy => java}/groovy/time/DatumDependentDuration.java | 0
src/main/{groovy => java}/groovy/time/Duration.java | 0
src/main/{groovy => java}/groovy/time/TimeCategory.java | 0
.../groovy/time/TimeDatumDependentDuration.java | 0
src/main/{groovy => java}/groovy/time/TimeDuration.java | 0
src/main/{groovy => java}/groovy/time/package.html | 0
src/main/{groovy => java}/groovy/transform/ASTTest.java | 0
.../{groovy => java}/groovy/transform/AnnotationCollector.java | 8 ++++----
.../groovy/transform/AnnotationCollectorMode.java | 0
src/main/{groovy => java}/groovy/transform/AutoClone.java | 0
src/main/{groovy => java}/groovy/transform/AutoCloneStyle.java | 0
src/main/{groovy => java}/groovy/transform/AutoFinal.java | 0
src/main/{groovy => java}/groovy/transform/AutoImplement.java | 0
src/main/{groovy => java}/groovy/transform/BaseScript.java | 0
.../groovy/transform/CompilationUnitAware.java | 0
src/main/{groovy => java}/groovy/transform/CompileStatic.java | 0
.../{groovy => java}/groovy/transform/EqualsAndHashCode.java | 0
.../{groovy => java}/groovy/transform/ExternalizeMethods.java | 0
.../{groovy => java}/groovy/transform/ExternalizeVerifier.java | 0
src/main/{groovy => java}/groovy/transform/Field.java | 0
src/main/{groovy => java}/groovy/transform/Generated.java | 0
src/main/{groovy => java}/groovy/transform/ImmutableBase.java | 0
.../{groovy => java}/groovy/transform/ImmutableOptions.java | 0
.../{groovy => java}/groovy/transform/IndexedProperty.java | 0
.../{groovy => java}/groovy/transform/InheritConstructors.java | 0
src/main/{groovy => java}/groovy/transform/Internal.java | 0
src/main/{groovy => java}/groovy/transform/KnownImmutable.java | 0
src/main/{groovy => java}/groovy/transform/MapConstructor.java | 0
src/main/{groovy => java}/groovy/transform/Memoized.java | 0
src/main/{groovy => java}/groovy/transform/NamedDelegate.java | 0
src/main/{groovy => java}/groovy/transform/NamedParam.java | 0
src/main/{groovy => java}/groovy/transform/NamedParams.java | 0
src/main/{groovy => java}/groovy/transform/NamedVariant.java | 0
src/main/{groovy => java}/groovy/transform/NullCheck.java | 0
src/main/{groovy => java}/groovy/transform/PackageScope.java | 0
.../{groovy => java}/groovy/transform/PackageScopeTarget.java | 0
.../{groovy => java}/groovy/transform/PropertyOptions.java | 0
src/main/{groovy => java}/groovy/transform/SelfType.java | 0
src/main/{groovy => java}/groovy/transform/Sortable.java | 0
src/main/{groovy => java}/groovy/transform/SourceURI.java | 0
src/main/{groovy => java}/groovy/transform/Synchronized.java | 0
src/main/{groovy => java}/groovy/transform/ToString.java | 0
src/main/{groovy => java}/groovy/transform/Trait.java | 0
.../{groovy => java}/groovy/transform/TupleConstructor.java | 0
src/main/{groovy => java}/groovy/transform/TypeChecked.java | 0
.../{groovy => java}/groovy/transform/TypeCheckingMode.java | 0
src/main/{groovy => java}/groovy/transform/Undefined.java | 0
.../{groovy => java}/groovy/transform/VisibilityOptions.java | 0
src/main/{groovy => java}/groovy/transform/WithReadLock.java | 0
src/main/{groovy => java}/groovy/transform/WithWriteLock.java | 0
.../{groovy => java}/groovy/transform/builder/Builder.java | 0
.../groovy/transform/builder/DefaultStrategy.java | 0
.../groovy/transform/builder/ExternalStrategy.java | 0
.../groovy/transform/builder/InitializerStrategy.java | 0
.../groovy/transform/builder/SimpleStrategy.java | 0
.../groovy/transform/options/DefaultPropertyHandler.java | 0
.../groovy/transform/options/ImmutablePropertyHandler.java | 0
.../groovy/transform/options/LegacyHashMapPropertyHandler.java | 0
.../groovy/transform/options/PropertyHandler.java | 0
.../{groovy => java}/groovy/transform/options/Visibility.java | 0
.../{groovy => java}/groovy/transform/stc/ClosureParams.java | 0
.../groovy/transform/stc/ClosureSignatureConflictResolver.java | 0
.../groovy/transform/stc/ClosureSignatureHint.java | 0
src/main/{groovy => java}/groovy/transform/stc/FirstParam.java | 0
.../groovy/transform/stc/FromAbstractTypeMethods.java | 0
src/main/{groovy => java}/groovy/transform/stc/FromString.java | 0
.../groovy/transform/stc/IncorrectTypeHintException.java | 0
.../groovy/transform/stc/MapEntryOrKeyValue.java | 0
.../groovy/transform/stc/PickAnyArgumentHint.java | 0
.../groovy/transform/stc/PickFirstResolver.java | 0
.../{groovy => java}/groovy/transform/stc/SecondParam.java | 0
src/main/{groovy => java}/groovy/transform/stc/SimpleType.java | 0
.../groovy/transform/stc/SingleSignatureClosureHint.java | 0
src/main/{groovy => java}/groovy/transform/stc/ThirdParam.java | 0
src/main/{groovy => java}/groovy/ui/GroovyMain.java | 0
src/main/{groovy => java}/groovy/ui/GroovySocketServer.java | 0
src/main/{groovy => java}/groovy/util/AbstractFactory.java | 0
src/main/{groovy => java}/groovy/util/BufferedIterator.java | 0
src/main/{groovy => java}/groovy/util/BuilderSupport.java | 0
src/main/{groovy => java}/groovy/util/CharsetToolkit.java | 0
src/main/{groovy => java}/groovy/util/ClosureComparator.java | 0
src/main/{groovy => java}/groovy/util/ConfigObject.java | 0
src/main/{groovy => java}/groovy/util/DelegatingScript.java | 0
src/main/{groovy => java}/groovy/util/Eval.java | 0
src/main/{groovy => java}/groovy/util/Expando.java | 0
src/main/{groovy => java}/groovy/util/Factory.java | 0
.../{groovy => java}/groovy/util/FactoryBuilderSupport.java | 0
src/main/{groovy => java}/groovy/util/GroovyCollections.java | 0
src/main/{groovy => java}/groovy/util/GroovyScriptEngine.java | 0
src/main/{groovy => java}/groovy/util/IFileNameFinder.java | 0
src/main/{groovy => java}/groovy/util/IndentPrinter.java | 0
src/main/{groovy => java}/groovy/util/MapEntry.java | 0
src/main/{groovy => java}/groovy/util/Node.java | 0
src/main/{groovy => java}/groovy/util/NodeBuilder.java | 0
src/main/{groovy => java}/groovy/util/NodeList.java | 0
src/main/{groovy => java}/groovy/util/NodePrinter.java | 0
src/main/{groovy => java}/groovy/util/ObjectGraphBuilder.java | 0
src/main/{groovy => java}/groovy/util/ObservableList.java | 0
src/main/{groovy => java}/groovy/util/ObservableMap.java | 0
src/main/{groovy => java}/groovy/util/ObservableSet.java | 0
src/main/{groovy => java}/groovy/util/OrderBy.java | 0
.../{groovy => java}/groovy/util/PermutationGenerator.java | 0
src/main/{groovy => java}/groovy/util/Proxy.java | 0
src/main/{groovy => java}/groovy/util/ProxyGenerator.java | 0
src/main/{groovy => java}/groovy/util/ResourceConnector.java | 0
src/main/{groovy => java}/groovy/util/ResourceException.java | 0
src/main/{groovy => java}/groovy/util/ScriptException.java | 0
src/main/{groovy => java}/groovy/util/logging/Commons.java | 0
src/main/{groovy => java}/groovy/util/logging/Log.java | 0
src/main/{groovy => java}/groovy/util/logging/Log4j.java | 0
src/main/{groovy => java}/groovy/util/logging/Log4j2.java | 0
src/main/{groovy => java}/groovy/util/logging/Slf4j.java | 0
src/main/{groovy => java}/groovy/util/package.html | 0
src/main/{groovy => java}/groovy/xml/QName.java | 0
src/test/MainJavadocAssertionTest.groovy | 3 ++-
subprojects/groovy-json/build.gradle | 2 +-
.../test/groovy/groovy/json/JsonJavadocAssertionTest.groovy | 2 ++
.../main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy | 5 ++---
.../main/groovy/groovy/test/JavadocAssertionTestSuite.groovy | 2 +-
.../groovy/groovy/test}/JavadocAssertionTestBuilderTest.groovy | 2 +-
.../src/test/groovy/groovy/xml/XmlJavadocAssertionTest.groovy | 4 ++--
subprojects/groovy-yaml/build.gradle | 1 +
.../test/groovy/groovy/yaml/YamlJavadocAssertionTest.groovy | 10 +++++++---
254 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index d121b37..4d3d282 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -34,6 +34,7 @@ allprojects {
if (headless == 'true') {
systemProperties 'java.awt.headless': 'true'
}
+ systemProperties 'apple.awt.UIElement': 'true', 'javadocAssertion.src.dir': './src/main'
forkEvery = 50
maxParallelForks = isRunningOnCI() ? 1 : Runtime.runtime.availableProcessors()
@@ -84,7 +85,6 @@ tasks.withType(Test) {
if (testdb) {
systemProperties 'groovy.testdb.props': testdb
}
- systemProperties 'apple.awt.UIElement': 'true', 'javadocAssertion.src.dir': './src/main/java'
systemProperties 'gradle.home': gradle.gradleHomeDir // this is needed by the security.policy
classpath = files('src/test') + classpath
diff --git a/src/main/groovy/groovy/beans/Bindable.java b/src/main/java/groovy/beans/Bindable.java
similarity index 100%
rename from src/main/groovy/groovy/beans/Bindable.java
rename to src/main/java/groovy/beans/Bindable.java
diff --git a/src/main/groovy/groovy/beans/BindableASTTransformation.java b/src/main/java/groovy/beans/BindableASTTransformation.java
similarity index 100%
rename from src/main/groovy/groovy/beans/BindableASTTransformation.java
rename to src/main/java/groovy/beans/BindableASTTransformation.java
diff --git a/src/main/groovy/groovy/beans/DefaultPropertyAccessor.java b/src/main/java/groovy/beans/DefaultPropertyAccessor.java
similarity index 100%
rename from src/main/groovy/groovy/beans/DefaultPropertyAccessor.java
rename to src/main/java/groovy/beans/DefaultPropertyAccessor.java
diff --git a/src/main/groovy/groovy/beans/DefaultPropertyReader.java b/src/main/java/groovy/beans/DefaultPropertyReader.java
similarity index 100%
rename from src/main/groovy/groovy/beans/DefaultPropertyReader.java
rename to src/main/java/groovy/beans/DefaultPropertyReader.java
diff --git a/src/main/groovy/groovy/beans/DefaultPropertyWriter.java b/src/main/java/groovy/beans/DefaultPropertyWriter.java
similarity index 100%
rename from src/main/groovy/groovy/beans/DefaultPropertyWriter.java
rename to src/main/java/groovy/beans/DefaultPropertyWriter.java
diff --git a/src/main/groovy/groovy/beans/PropertyAccessor.java b/src/main/java/groovy/beans/PropertyAccessor.java
similarity index 100%
rename from src/main/groovy/groovy/beans/PropertyAccessor.java
rename to src/main/java/groovy/beans/PropertyAccessor.java
diff --git a/src/main/groovy/groovy/beans/PropertyReader.java b/src/main/java/groovy/beans/PropertyReader.java
similarity index 100%
rename from src/main/groovy/groovy/beans/PropertyReader.java
rename to src/main/java/groovy/beans/PropertyReader.java
diff --git a/src/main/groovy/groovy/beans/PropertyWriter.java b/src/main/java/groovy/beans/PropertyWriter.java
similarity index 100%
rename from src/main/groovy/groovy/beans/PropertyWriter.java
rename to src/main/java/groovy/beans/PropertyWriter.java
diff --git a/src/main/groovy/groovy/beans/Vetoable.java b/src/main/java/groovy/beans/Vetoable.java
similarity index 100%
rename from src/main/groovy/groovy/beans/Vetoable.java
rename to src/main/java/groovy/beans/Vetoable.java
diff --git a/src/main/groovy/groovy/beans/VetoableASTTransformation.java b/src/main/java/groovy/beans/VetoableASTTransformation.java
similarity index 100%
rename from src/main/groovy/groovy/beans/VetoableASTTransformation.java
rename to src/main/java/groovy/beans/VetoableASTTransformation.java
diff --git a/src/main/groovy/groovy/cli/Option.java b/src/main/java/groovy/cli/Option.java
similarity index 100%
rename from src/main/groovy/groovy/cli/Option.java
rename to src/main/java/groovy/cli/Option.java
diff --git a/src/main/groovy/groovy/cli/TypedOption.java b/src/main/java/groovy/cli/TypedOption.java
similarity index 100%
rename from src/main/groovy/groovy/cli/TypedOption.java
rename to src/main/java/groovy/cli/TypedOption.java
diff --git a/src/main/groovy/groovy/cli/Unparsed.java b/src/main/java/groovy/cli/Unparsed.java
similarity index 100%
rename from src/main/groovy/groovy/cli/Unparsed.java
rename to src/main/java/groovy/cli/Unparsed.java
diff --git a/src/main/groovy/groovy/grape/GrabAnnotationTransformation.java b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
similarity index 100%
rename from src/main/groovy/groovy/grape/GrabAnnotationTransformation.java
rename to src/main/java/groovy/grape/GrabAnnotationTransformation.java
diff --git a/src/main/groovy/groovy/grape/Grape.java b/src/main/java/groovy/grape/Grape.java
similarity index 100%
rename from src/main/groovy/groovy/grape/Grape.java
rename to src/main/java/groovy/grape/Grape.java
diff --git a/src/main/groovy/groovy/grape/GrapeEngine.java b/src/main/java/groovy/grape/GrapeEngine.java
similarity index 100%
rename from src/main/groovy/groovy/grape/GrapeEngine.java
rename to src/main/java/groovy/grape/GrapeEngine.java
diff --git a/src/main/groovy/groovy/inspect/Inspector.java b/src/main/java/groovy/inspect/Inspector.java
similarity index 100%
rename from src/main/groovy/groovy/inspect/Inspector.java
rename to src/main/java/groovy/inspect/Inspector.java
diff --git a/src/main/groovy/groovy/inspect/package.html b/src/main/java/groovy/inspect/package.html
similarity index 100%
rename from src/main/groovy/groovy/inspect/package.html
rename to src/main/java/groovy/inspect/package.html
diff --git a/src/main/groovy/groovy/io/EncodingAwareBufferedWriter.java b/src/main/java/groovy/io/EncodingAwareBufferedWriter.java
similarity index 100%
rename from src/main/groovy/groovy/io/EncodingAwareBufferedWriter.java
rename to src/main/java/groovy/io/EncodingAwareBufferedWriter.java
diff --git a/src/main/groovy/groovy/io/FileType.java b/src/main/java/groovy/io/FileType.java
similarity index 100%
rename from src/main/groovy/groovy/io/FileType.java
rename to src/main/java/groovy/io/FileType.java
diff --git a/src/main/groovy/groovy/io/FileVisitResult.java b/src/main/java/groovy/io/FileVisitResult.java
similarity index 100%
rename from src/main/groovy/groovy/io/FileVisitResult.java
rename to src/main/java/groovy/io/FileVisitResult.java
diff --git a/src/main/groovy/groovy/io/GroovyPrintStream.java b/src/main/java/groovy/io/GroovyPrintStream.java
similarity index 100%
rename from src/main/groovy/groovy/io/GroovyPrintStream.java
rename to src/main/java/groovy/io/GroovyPrintStream.java
diff --git a/src/main/groovy/groovy/io/GroovyPrintWriter.java b/src/main/java/groovy/io/GroovyPrintWriter.java
similarity index 100%
rename from src/main/groovy/groovy/io/GroovyPrintWriter.java
rename to src/main/java/groovy/io/GroovyPrintWriter.java
diff --git a/src/main/groovy/groovy/io/LineColumnReader.java b/src/main/java/groovy/io/LineColumnReader.java
similarity index 100%
rename from src/main/groovy/groovy/io/LineColumnReader.java
rename to src/main/java/groovy/io/LineColumnReader.java
diff --git a/src/main/groovy/groovy/io/PlatformLineWriter.java b/src/main/java/groovy/io/PlatformLineWriter.java
similarity index 100%
rename from src/main/groovy/groovy/io/PlatformLineWriter.java
rename to src/main/java/groovy/io/PlatformLineWriter.java
diff --git a/src/main/groovy/groovy/io/package.html b/src/main/java/groovy/io/package.html
similarity index 100%
rename from src/main/groovy/groovy/io/package.html
rename to src/main/java/groovy/io/package.html
diff --git a/src/main/groovy/groovy/lang/AdaptingMetaClass.java b/src/main/java/groovy/lang/AdaptingMetaClass.java
similarity index 100%
rename from src/main/groovy/groovy/lang/AdaptingMetaClass.java
rename to src/main/java/groovy/lang/AdaptingMetaClass.java
diff --git a/src/main/groovy/groovy/lang/BenchmarkInterceptor.java b/src/main/java/groovy/lang/BenchmarkInterceptor.java
similarity index 100%
rename from src/main/groovy/groovy/lang/BenchmarkInterceptor.java
rename to src/main/java/groovy/lang/BenchmarkInterceptor.java
diff --git a/src/main/groovy/groovy/lang/Binding.java b/src/main/java/groovy/lang/Binding.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Binding.java
rename to src/main/java/groovy/lang/Binding.java
diff --git a/src/main/groovy/groovy/lang/Buildable.java b/src/main/java/groovy/lang/Buildable.java
similarity index 100%
copy from src/main/groovy/groovy/lang/Buildable.java
copy to src/main/java/groovy/lang/Buildable.java
diff --git a/src/main/groovy/groovy/lang/Category.java b/src/main/java/groovy/lang/Category.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Category.java
rename to src/main/java/groovy/lang/Category.java
diff --git a/src/main/groovy/groovy/lang/Closure.java b/src/main/java/groovy/lang/Closure.java
similarity index 99%
rename from src/main/groovy/groovy/lang/Closure.java
rename to src/main/java/groovy/lang/Closure.java
index d59744d..6464a2d 100644
--- a/src/main/groovy/groovy/lang/Closure.java
+++ b/src/main/java/groovy/lang/Closure.java
@@ -662,7 +662,7 @@ public abstract class Closure<V> extends GroovyObjectSupport implements Cloneabl
* Typical usage:
* <pre class="groovyTestCase">
* def times2 = { a {@code ->} a * 2 }
- * def add3 = { a {@code ->} a * 3 }
+ * def add3 = { a {@code ->} a + 3 }
* assert add3 {@code <<} times2 {@code <<} 3 == 9
* </pre>
*
diff --git a/src/main/groovy/groovy/lang/ClosureException.java b/src/main/java/groovy/lang/ClosureException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/ClosureException.java
rename to src/main/java/groovy/lang/ClosureException.java
diff --git a/src/main/groovy/groovy/lang/ClosureInvokingMethod.java b/src/main/java/groovy/lang/ClosureInvokingMethod.java
similarity index 100%
rename from src/main/groovy/groovy/lang/ClosureInvokingMethod.java
rename to src/main/java/groovy/lang/ClosureInvokingMethod.java
diff --git a/src/main/groovy/groovy/lang/Delegate.java b/src/main/java/groovy/lang/Delegate.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Delegate.java
rename to src/main/java/groovy/lang/Delegate.java
diff --git a/src/main/groovy/groovy/lang/DelegatesTo.java b/src/main/java/groovy/lang/DelegatesTo.java
similarity index 100%
rename from src/main/groovy/groovy/lang/DelegatesTo.java
rename to src/main/java/groovy/lang/DelegatesTo.java
diff --git a/src/main/groovy/groovy/lang/DelegatingMetaClass.java b/src/main/java/groovy/lang/DelegatingMetaClass.java
similarity index 100%
rename from src/main/groovy/groovy/lang/DelegatingMetaClass.java
rename to src/main/java/groovy/lang/DelegatingMetaClass.java
diff --git a/src/main/groovy/groovy/lang/DeprecationException.java b/src/main/java/groovy/lang/DeprecationException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/DeprecationException.java
rename to src/main/java/groovy/lang/DeprecationException.java
diff --git a/src/main/groovy/groovy/lang/EmptyRange.java b/src/main/java/groovy/lang/EmptyRange.java
similarity index 100%
rename from src/main/groovy/groovy/lang/EmptyRange.java
rename to src/main/java/groovy/lang/EmptyRange.java
diff --git a/src/main/groovy/groovy/lang/ExpandoMetaClass.java b/src/main/java/groovy/lang/ExpandoMetaClass.java
similarity index 100%
rename from src/main/groovy/groovy/lang/ExpandoMetaClass.java
rename to src/main/java/groovy/lang/ExpandoMetaClass.java
diff --git a/src/main/groovy/groovy/lang/ExpandoMetaClassCreationHandle.java b/src/main/java/groovy/lang/ExpandoMetaClassCreationHandle.java
similarity index 100%
rename from src/main/groovy/groovy/lang/ExpandoMetaClassCreationHandle.java
rename to src/main/java/groovy/lang/ExpandoMetaClassCreationHandle.java
diff --git a/src/main/groovy/groovy/lang/GString.java b/src/main/java/groovy/lang/GString.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GString.java
rename to src/main/java/groovy/lang/GString.java
diff --git a/src/main/groovy/groovy/lang/GeneratedGroovyProxy.java b/src/main/java/groovy/lang/GeneratedGroovyProxy.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GeneratedGroovyProxy.java
rename to src/main/java/groovy/lang/GeneratedGroovyProxy.java
diff --git a/src/main/groovy/groovy/lang/Grab.java b/src/main/java/groovy/lang/Grab.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Grab.java
rename to src/main/java/groovy/lang/Grab.java
diff --git a/src/main/groovy/groovy/lang/GrabConfig.java b/src/main/java/groovy/lang/GrabConfig.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GrabConfig.java
rename to src/main/java/groovy/lang/GrabConfig.java
diff --git a/src/main/groovy/groovy/lang/GrabExclude.java b/src/main/java/groovy/lang/GrabExclude.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GrabExclude.java
rename to src/main/java/groovy/lang/GrabExclude.java
diff --git a/src/main/groovy/groovy/lang/GrabResolver.java b/src/main/java/groovy/lang/GrabResolver.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GrabResolver.java
rename to src/main/java/groovy/lang/GrabResolver.java
diff --git a/src/main/groovy/groovy/lang/Grapes.java b/src/main/java/groovy/lang/Grapes.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Grapes.java
rename to src/main/java/groovy/lang/Grapes.java
diff --git a/src/main/groovy/groovy/lang/GroovyCallable.java b/src/main/java/groovy/lang/GroovyCallable.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovyCallable.java
rename to src/main/java/groovy/lang/GroovyCallable.java
diff --git a/src/main/groovy/groovy/lang/GroovyClassLoader.java b/src/main/java/groovy/lang/GroovyClassLoader.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovyClassLoader.java
rename to src/main/java/groovy/lang/GroovyClassLoader.java
diff --git a/src/main/groovy/groovy/lang/GroovyCodeSource.java b/src/main/java/groovy/lang/GroovyCodeSource.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovyCodeSource.java
rename to src/main/java/groovy/lang/GroovyCodeSource.java
diff --git a/src/main/groovy/groovy/lang/GroovyInterceptable.java b/src/main/java/groovy/lang/GroovyInterceptable.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovyInterceptable.java
rename to src/main/java/groovy/lang/GroovyInterceptable.java
diff --git a/src/main/groovy/groovy/lang/GroovyObject.java b/src/main/java/groovy/lang/GroovyObject.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovyObject.java
rename to src/main/java/groovy/lang/GroovyObject.java
diff --git a/src/main/groovy/groovy/lang/GroovyObjectSupport.java b/src/main/java/groovy/lang/GroovyObjectSupport.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovyObjectSupport.java
rename to src/main/java/groovy/lang/GroovyObjectSupport.java
diff --git a/src/main/groovy/groovy/lang/GroovyResourceLoader.java b/src/main/java/groovy/lang/GroovyResourceLoader.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovyResourceLoader.java
rename to src/main/java/groovy/lang/GroovyResourceLoader.java
diff --git a/src/main/groovy/groovy/lang/GroovyRuntimeException.java b/src/main/java/groovy/lang/GroovyRuntimeException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovyRuntimeException.java
rename to src/main/java/groovy/lang/GroovyRuntimeException.java
diff --git a/src/main/groovy/groovy/lang/GroovyShell.java b/src/main/java/groovy/lang/GroovyShell.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovyShell.java
rename to src/main/java/groovy/lang/GroovyShell.java
diff --git a/src/main/groovy/groovy/lang/GroovySystem.java b/src/main/java/groovy/lang/GroovySystem.java
similarity index 100%
rename from src/main/groovy/groovy/lang/GroovySystem.java
rename to src/main/java/groovy/lang/GroovySystem.java
diff --git a/src/main/groovy/groovy/lang/Groovydoc.java b/src/main/java/groovy/lang/Groovydoc.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Groovydoc.java
rename to src/main/java/groovy/lang/Groovydoc.java
diff --git a/src/main/groovy/groovy/lang/IllegalPropertyAccessException.java b/src/main/java/groovy/lang/IllegalPropertyAccessException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/IllegalPropertyAccessException.java
rename to src/main/java/groovy/lang/IllegalPropertyAccessException.java
diff --git a/src/main/groovy/groovy/lang/IncorrectClosureArgumentsException.java b/src/main/java/groovy/lang/IncorrectClosureArgumentsException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/IncorrectClosureArgumentsException.java
rename to src/main/java/groovy/lang/IncorrectClosureArgumentsException.java
diff --git a/src/main/groovy/groovy/lang/IntRange.java b/src/main/java/groovy/lang/IntRange.java
similarity index 100%
rename from src/main/groovy/groovy/lang/IntRange.java
rename to src/main/java/groovy/lang/IntRange.java
diff --git a/src/main/groovy/groovy/lang/Interceptor.java b/src/main/java/groovy/lang/Interceptor.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Interceptor.java
rename to src/main/java/groovy/lang/Interceptor.java
diff --git a/src/main/groovy/groovy/lang/Lazy.java b/src/main/java/groovy/lang/Lazy.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Lazy.java
rename to src/main/java/groovy/lang/Lazy.java
diff --git a/src/main/groovy/groovy/lang/ListWithDefault.java b/src/main/java/groovy/lang/ListWithDefault.java
similarity index 100%
rename from src/main/groovy/groovy/lang/ListWithDefault.java
rename to src/main/java/groovy/lang/ListWithDefault.java
diff --git a/src/main/groovy/groovy/lang/MapWithDefault.java b/src/main/java/groovy/lang/MapWithDefault.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MapWithDefault.java
rename to src/main/java/groovy/lang/MapWithDefault.java
diff --git a/src/main/groovy/groovy/lang/MetaArrayLengthProperty.java b/src/main/java/groovy/lang/MetaArrayLengthProperty.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaArrayLengthProperty.java
rename to src/main/java/groovy/lang/MetaArrayLengthProperty.java
diff --git a/src/main/groovy/groovy/lang/MetaBeanProperty.java b/src/main/java/groovy/lang/MetaBeanProperty.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaBeanProperty.java
rename to src/main/java/groovy/lang/MetaBeanProperty.java
diff --git a/src/main/groovy/groovy/lang/MetaClass.java b/src/main/java/groovy/lang/MetaClass.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaClass.java
rename to src/main/java/groovy/lang/MetaClass.java
diff --git a/src/main/groovy/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaClassImpl.java
rename to src/main/java/groovy/lang/MetaClassImpl.java
diff --git a/src/main/groovy/groovy/lang/MetaClassRegistry.java b/src/main/java/groovy/lang/MetaClassRegistry.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaClassRegistry.java
rename to src/main/java/groovy/lang/MetaClassRegistry.java
diff --git a/src/main/groovy/groovy/lang/MetaClassRegistryChangeEvent.java b/src/main/java/groovy/lang/MetaClassRegistryChangeEvent.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaClassRegistryChangeEvent.java
rename to src/main/java/groovy/lang/MetaClassRegistryChangeEvent.java
diff --git a/src/main/groovy/groovy/lang/MetaClassRegistryChangeEventListener.java b/src/main/java/groovy/lang/MetaClassRegistryChangeEventListener.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaClassRegistryChangeEventListener.java
rename to src/main/java/groovy/lang/MetaClassRegistryChangeEventListener.java
diff --git a/src/main/groovy/groovy/lang/MetaExpandoProperty.java b/src/main/java/groovy/lang/MetaExpandoProperty.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaExpandoProperty.java
rename to src/main/java/groovy/lang/MetaExpandoProperty.java
diff --git a/src/main/groovy/groovy/lang/MetaMethod.java b/src/main/java/groovy/lang/MetaMethod.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaMethod.java
rename to src/main/java/groovy/lang/MetaMethod.java
diff --git a/src/main/groovy/groovy/lang/MetaObjectProtocol.java b/src/main/java/groovy/lang/MetaObjectProtocol.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaObjectProtocol.java
rename to src/main/java/groovy/lang/MetaObjectProtocol.java
diff --git a/src/main/groovy/groovy/lang/MetaProperty.java b/src/main/java/groovy/lang/MetaProperty.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MetaProperty.java
rename to src/main/java/groovy/lang/MetaProperty.java
diff --git a/src/main/groovy/groovy/lang/MissingClassException.java b/src/main/java/groovy/lang/MissingClassException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MissingClassException.java
rename to src/main/java/groovy/lang/MissingClassException.java
diff --git a/src/main/groovy/groovy/lang/MissingFieldException.java b/src/main/java/groovy/lang/MissingFieldException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MissingFieldException.java
rename to src/main/java/groovy/lang/MissingFieldException.java
diff --git a/src/main/groovy/groovy/lang/MissingMethodException.java b/src/main/java/groovy/lang/MissingMethodException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MissingMethodException.java
rename to src/main/java/groovy/lang/MissingMethodException.java
diff --git a/src/main/groovy/groovy/lang/MissingPropertyException.java b/src/main/java/groovy/lang/MissingPropertyException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MissingPropertyException.java
rename to src/main/java/groovy/lang/MissingPropertyException.java
diff --git a/src/main/groovy/groovy/lang/Mixin.java b/src/main/java/groovy/lang/Mixin.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Mixin.java
rename to src/main/java/groovy/lang/Mixin.java
diff --git a/src/main/groovy/groovy/lang/MutableMetaClass.java b/src/main/java/groovy/lang/MutableMetaClass.java
similarity index 100%
rename from src/main/groovy/groovy/lang/MutableMetaClass.java
rename to src/main/java/groovy/lang/MutableMetaClass.java
diff --git a/src/main/groovy/groovy/lang/Newify.java b/src/main/java/groovy/lang/Newify.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Newify.java
rename to src/main/java/groovy/lang/Newify.java
diff --git a/src/main/groovy/groovy/lang/NonEmptySequence.java b/src/main/java/groovy/lang/NonEmptySequence.java
similarity index 100%
rename from src/main/groovy/groovy/lang/NonEmptySequence.java
rename to src/main/java/groovy/lang/NonEmptySequence.java
diff --git a/src/main/groovy/groovy/lang/NumberRange.java b/src/main/java/groovy/lang/NumberRange.java
similarity index 100%
rename from src/main/groovy/groovy/lang/NumberRange.java
rename to src/main/java/groovy/lang/NumberRange.java
diff --git a/src/main/groovy/groovy/lang/ObjectRange.java b/src/main/java/groovy/lang/ObjectRange.java
similarity index 100%
rename from src/main/groovy/groovy/lang/ObjectRange.java
rename to src/main/java/groovy/lang/ObjectRange.java
diff --git a/src/main/groovy/groovy/lang/ParameterArray.java b/src/main/java/groovy/lang/ParameterArray.java
similarity index 100%
rename from src/main/groovy/groovy/lang/ParameterArray.java
rename to src/main/java/groovy/lang/ParameterArray.java
diff --git a/src/main/groovy/groovy/lang/PropertyAccessInterceptor.java b/src/main/java/groovy/lang/PropertyAccessInterceptor.java
similarity index 100%
rename from src/main/groovy/groovy/lang/PropertyAccessInterceptor.java
rename to src/main/java/groovy/lang/PropertyAccessInterceptor.java
diff --git a/src/main/groovy/groovy/lang/PropertyValue.java b/src/main/java/groovy/lang/PropertyValue.java
similarity index 100%
rename from src/main/groovy/groovy/lang/PropertyValue.java
rename to src/main/java/groovy/lang/PropertyValue.java
diff --git a/src/main/groovy/groovy/lang/ProxyMetaClass.java b/src/main/java/groovy/lang/ProxyMetaClass.java
similarity index 100%
rename from src/main/groovy/groovy/lang/ProxyMetaClass.java
rename to src/main/java/groovy/lang/ProxyMetaClass.java
diff --git a/src/main/groovy/groovy/lang/Range.java b/src/main/java/groovy/lang/Range.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Range.java
rename to src/main/java/groovy/lang/Range.java
diff --git a/src/main/groovy/groovy/lang/ReadOnlyPropertyException.java b/src/main/java/groovy/lang/ReadOnlyPropertyException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/ReadOnlyPropertyException.java
rename to src/main/java/groovy/lang/ReadOnlyPropertyException.java
diff --git a/src/main/groovy/groovy/lang/Reference.java b/src/main/java/groovy/lang/Reference.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Reference.java
rename to src/main/java/groovy/lang/Reference.java
diff --git a/src/main/groovy/groovy/lang/Script.java b/src/main/java/groovy/lang/Script.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Script.java
rename to src/main/java/groovy/lang/Script.java
diff --git a/src/main/groovy/groovy/lang/Sequence.java b/src/main/java/groovy/lang/Sequence.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Sequence.java
rename to src/main/java/groovy/lang/Sequence.java
diff --git a/src/main/groovy/groovy/lang/Singleton.java b/src/main/java/groovy/lang/Singleton.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Singleton.java
rename to src/main/java/groovy/lang/Singleton.java
diff --git a/src/main/groovy/groovy/lang/SpreadListEvaluatingException.java b/src/main/java/groovy/lang/SpreadListEvaluatingException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/SpreadListEvaluatingException.java
rename to src/main/java/groovy/lang/SpreadListEvaluatingException.java
diff --git a/src/main/groovy/groovy/lang/SpreadMap.java b/src/main/java/groovy/lang/SpreadMap.java
similarity index 100%
rename from src/main/groovy/groovy/lang/SpreadMap.java
rename to src/main/java/groovy/lang/SpreadMap.java
diff --git a/src/main/groovy/groovy/lang/SpreadMapEvaluatingException.java b/src/main/java/groovy/lang/SpreadMapEvaluatingException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/SpreadMapEvaluatingException.java
rename to src/main/java/groovy/lang/SpreadMapEvaluatingException.java
diff --git a/src/main/groovy/groovy/lang/StringWriterIOException.java b/src/main/java/groovy/lang/StringWriterIOException.java
similarity index 100%
rename from src/main/groovy/groovy/lang/StringWriterIOException.java
rename to src/main/java/groovy/lang/StringWriterIOException.java
diff --git a/src/main/groovy/groovy/lang/TracingInterceptor.java b/src/main/java/groovy/lang/TracingInterceptor.java
similarity index 100%
rename from src/main/groovy/groovy/lang/TracingInterceptor.java
rename to src/main/java/groovy/lang/TracingInterceptor.java
diff --git a/src/main/groovy/groovy/lang/TrampolineClosure.java b/src/main/java/groovy/lang/TrampolineClosure.java
similarity index 100%
rename from src/main/groovy/groovy/lang/TrampolineClosure.java
rename to src/main/java/groovy/lang/TrampolineClosure.java
diff --git a/src/main/groovy/groovy/lang/Tuple.java b/src/main/java/groovy/lang/Tuple.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple.java
rename to src/main/java/groovy/lang/Tuple.java
diff --git a/src/main/groovy/groovy/lang/Tuple0.java b/src/main/java/groovy/lang/Tuple0.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple0.java
rename to src/main/java/groovy/lang/Tuple0.java
diff --git a/src/main/groovy/groovy/lang/Tuple1.java b/src/main/java/groovy/lang/Tuple1.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple1.java
rename to src/main/java/groovy/lang/Tuple1.java
diff --git a/src/main/groovy/groovy/lang/Tuple10.java b/src/main/java/groovy/lang/Tuple10.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple10.java
rename to src/main/java/groovy/lang/Tuple10.java
diff --git a/src/main/groovy/groovy/lang/Tuple11.java b/src/main/java/groovy/lang/Tuple11.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple11.java
rename to src/main/java/groovy/lang/Tuple11.java
diff --git a/src/main/groovy/groovy/lang/Tuple12.java b/src/main/java/groovy/lang/Tuple12.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple12.java
rename to src/main/java/groovy/lang/Tuple12.java
diff --git a/src/main/groovy/groovy/lang/Tuple13.java b/src/main/java/groovy/lang/Tuple13.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple13.java
rename to src/main/java/groovy/lang/Tuple13.java
diff --git a/src/main/groovy/groovy/lang/Tuple14.java b/src/main/java/groovy/lang/Tuple14.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple14.java
rename to src/main/java/groovy/lang/Tuple14.java
diff --git a/src/main/groovy/groovy/lang/Tuple15.java b/src/main/java/groovy/lang/Tuple15.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple15.java
rename to src/main/java/groovy/lang/Tuple15.java
diff --git a/src/main/groovy/groovy/lang/Tuple16.java b/src/main/java/groovy/lang/Tuple16.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple16.java
rename to src/main/java/groovy/lang/Tuple16.java
diff --git a/src/main/groovy/groovy/lang/Tuple2.java b/src/main/java/groovy/lang/Tuple2.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple2.java
rename to src/main/java/groovy/lang/Tuple2.java
diff --git a/src/main/groovy/groovy/lang/Tuple3.java b/src/main/java/groovy/lang/Tuple3.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple3.java
rename to src/main/java/groovy/lang/Tuple3.java
diff --git a/src/main/groovy/groovy/lang/Tuple4.java b/src/main/java/groovy/lang/Tuple4.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple4.java
rename to src/main/java/groovy/lang/Tuple4.java
diff --git a/src/main/groovy/groovy/lang/Tuple5.java b/src/main/java/groovy/lang/Tuple5.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple5.java
rename to src/main/java/groovy/lang/Tuple5.java
diff --git a/src/main/groovy/groovy/lang/Tuple6.java b/src/main/java/groovy/lang/Tuple6.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple6.java
rename to src/main/java/groovy/lang/Tuple6.java
diff --git a/src/main/groovy/groovy/lang/Tuple7.java b/src/main/java/groovy/lang/Tuple7.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple7.java
rename to src/main/java/groovy/lang/Tuple7.java
diff --git a/src/main/groovy/groovy/lang/Tuple8.java b/src/main/java/groovy/lang/Tuple8.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple8.java
rename to src/main/java/groovy/lang/Tuple8.java
diff --git a/src/main/groovy/groovy/lang/Tuple9.java b/src/main/java/groovy/lang/Tuple9.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Tuple9.java
rename to src/main/java/groovy/lang/Tuple9.java
diff --git a/src/main/groovy/groovy/lang/Writable.java b/src/main/java/groovy/lang/Writable.java
similarity index 100%
rename from src/main/groovy/groovy/lang/Writable.java
rename to src/main/java/groovy/lang/Writable.java
diff --git a/src/main/groovy/groovy/lang/groovydoc/Groovydoc.java b/src/main/java/groovy/lang/groovydoc/Groovydoc.java
similarity index 100%
rename from src/main/groovy/groovy/lang/groovydoc/Groovydoc.java
rename to src/main/java/groovy/lang/groovydoc/Groovydoc.java
diff --git a/src/main/groovy/groovy/lang/groovydoc/GroovydocHolder.java b/src/main/java/groovy/lang/groovydoc/GroovydocHolder.java
similarity index 100%
rename from src/main/groovy/groovy/lang/groovydoc/GroovydocHolder.java
rename to src/main/java/groovy/lang/groovydoc/GroovydocHolder.java
diff --git a/src/main/groovy/groovy/lang/groovydoc/GroovydocTag.java b/src/main/java/groovy/lang/groovydoc/GroovydocTag.java
similarity index 100%
rename from src/main/groovy/groovy/lang/groovydoc/GroovydocTag.java
rename to src/main/java/groovy/lang/groovydoc/GroovydocTag.java
diff --git a/src/main/groovy/groovy/lang/package.html b/src/main/java/groovy/lang/package.html
similarity index 100%
rename from src/main/groovy/groovy/lang/package.html
rename to src/main/java/groovy/lang/package.html
diff --git a/src/main/groovy/groovy/namespace/QName.java b/src/main/java/groovy/namespace/QName.java
similarity index 100%
rename from src/main/groovy/groovy/namespace/QName.java
rename to src/main/java/groovy/namespace/QName.java
diff --git a/src/main/groovy/groovy/security/GroovyCodeSourcePermission.java b/src/main/java/groovy/security/GroovyCodeSourcePermission.java
similarity index 100%
rename from src/main/groovy/groovy/security/GroovyCodeSourcePermission.java
rename to src/main/java/groovy/security/GroovyCodeSourcePermission.java
diff --git a/src/main/groovy/groovy/security/package.html b/src/main/java/groovy/security/package.html
similarity index 100%
rename from src/main/groovy/groovy/security/package.html
rename to src/main/java/groovy/security/package.html
diff --git a/src/main/groovy/groovy/time/BaseDuration.java b/src/main/java/groovy/time/BaseDuration.java
similarity index 100%
rename from src/main/groovy/groovy/time/BaseDuration.java
rename to src/main/java/groovy/time/BaseDuration.java
diff --git a/src/main/groovy/groovy/time/DatumDependentDuration.java b/src/main/java/groovy/time/DatumDependentDuration.java
similarity index 100%
rename from src/main/groovy/groovy/time/DatumDependentDuration.java
rename to src/main/java/groovy/time/DatumDependentDuration.java
diff --git a/src/main/groovy/groovy/time/Duration.java b/src/main/java/groovy/time/Duration.java
similarity index 100%
rename from src/main/groovy/groovy/time/Duration.java
rename to src/main/java/groovy/time/Duration.java
diff --git a/src/main/groovy/groovy/time/TimeCategory.java b/src/main/java/groovy/time/TimeCategory.java
similarity index 100%
rename from src/main/groovy/groovy/time/TimeCategory.java
rename to src/main/java/groovy/time/TimeCategory.java
diff --git a/src/main/groovy/groovy/time/TimeDatumDependentDuration.java b/src/main/java/groovy/time/TimeDatumDependentDuration.java
similarity index 100%
rename from src/main/groovy/groovy/time/TimeDatumDependentDuration.java
rename to src/main/java/groovy/time/TimeDatumDependentDuration.java
diff --git a/src/main/groovy/groovy/time/TimeDuration.java b/src/main/java/groovy/time/TimeDuration.java
similarity index 100%
rename from src/main/groovy/groovy/time/TimeDuration.java
rename to src/main/java/groovy/time/TimeDuration.java
diff --git a/src/main/groovy/groovy/time/package.html b/src/main/java/groovy/time/package.html
similarity index 100%
rename from src/main/groovy/groovy/time/package.html
rename to src/main/java/groovy/time/package.html
diff --git a/src/main/groovy/groovy/transform/ASTTest.java b/src/main/java/groovy/transform/ASTTest.java
similarity index 100%
rename from src/main/groovy/groovy/transform/ASTTest.java
rename to src/main/java/groovy/transform/ASTTest.java
diff --git a/src/main/groovy/groovy/transform/AnnotationCollector.java b/src/main/java/groovy/transform/AnnotationCollector.java
similarity index 97%
rename from src/main/groovy/groovy/transform/AnnotationCollector.java
rename to src/main/java/groovy/transform/AnnotationCollector.java
index b2476ea..769698d 100644
--- a/src/main/groovy/groovy/transform/AnnotationCollector.java
+++ b/src/main/java/groovy/transform/AnnotationCollector.java
@@ -43,8 +43,8 @@ import java.lang.annotation.Target;
* class Foo {
* Integer a, b
* }
- * assert Foo.class.annotations.size()==3
- * assert new Foo(1,2).toString() == "Foo(2)"
+ * assert Foo.class.annotations.size() == 3
+ * assert new Foo(a: 1, b: 2).toString() == "Foo(2)"
* </pre>
* In the example above we have Alias as the alias annotation and an argument
* excludes which will be mapped to ToString and EqualsAndHashCode. Immutable
@@ -62,8 +62,8 @@ import java.lang.annotation.Target;
* class Foo {
* Integer a, b
* }
- * assert Foo.class.annotations.size()==3
- * assert new Foo(1,2).toString() == "Foo(2)"
+ * assert Foo.class.annotations.size() == 3
+ * assert new Foo(a: 1, b: 2).toString() == "Foo(2)"
* </pre>
* In the example above we have again Alias as the alias annotation, but
* this time the argument is part of the alias. Instead of mapping excludes to
diff --git a/src/main/groovy/groovy/transform/AnnotationCollectorMode.java b/src/main/java/groovy/transform/AnnotationCollectorMode.java
similarity index 100%
rename from src/main/groovy/groovy/transform/AnnotationCollectorMode.java
rename to src/main/java/groovy/transform/AnnotationCollectorMode.java
diff --git a/src/main/groovy/groovy/transform/AutoClone.java b/src/main/java/groovy/transform/AutoClone.java
similarity index 100%
rename from src/main/groovy/groovy/transform/AutoClone.java
rename to src/main/java/groovy/transform/AutoClone.java
diff --git a/src/main/groovy/groovy/transform/AutoCloneStyle.java b/src/main/java/groovy/transform/AutoCloneStyle.java
similarity index 100%
rename from src/main/groovy/groovy/transform/AutoCloneStyle.java
rename to src/main/java/groovy/transform/AutoCloneStyle.java
diff --git a/src/main/groovy/groovy/transform/AutoFinal.java b/src/main/java/groovy/transform/AutoFinal.java
similarity index 100%
rename from src/main/groovy/groovy/transform/AutoFinal.java
rename to src/main/java/groovy/transform/AutoFinal.java
diff --git a/src/main/groovy/groovy/transform/AutoImplement.java b/src/main/java/groovy/transform/AutoImplement.java
similarity index 100%
rename from src/main/groovy/groovy/transform/AutoImplement.java
rename to src/main/java/groovy/transform/AutoImplement.java
diff --git a/src/main/groovy/groovy/transform/BaseScript.java b/src/main/java/groovy/transform/BaseScript.java
similarity index 100%
rename from src/main/groovy/groovy/transform/BaseScript.java
rename to src/main/java/groovy/transform/BaseScript.java
diff --git a/src/main/groovy/groovy/transform/CompilationUnitAware.java b/src/main/java/groovy/transform/CompilationUnitAware.java
similarity index 100%
rename from src/main/groovy/groovy/transform/CompilationUnitAware.java
rename to src/main/java/groovy/transform/CompilationUnitAware.java
diff --git a/src/main/groovy/groovy/transform/CompileStatic.java b/src/main/java/groovy/transform/CompileStatic.java
similarity index 100%
rename from src/main/groovy/groovy/transform/CompileStatic.java
rename to src/main/java/groovy/transform/CompileStatic.java
diff --git a/src/main/groovy/groovy/transform/EqualsAndHashCode.java b/src/main/java/groovy/transform/EqualsAndHashCode.java
similarity index 100%
rename from src/main/groovy/groovy/transform/EqualsAndHashCode.java
rename to src/main/java/groovy/transform/EqualsAndHashCode.java
diff --git a/src/main/groovy/groovy/transform/ExternalizeMethods.java b/src/main/java/groovy/transform/ExternalizeMethods.java
similarity index 100%
rename from src/main/groovy/groovy/transform/ExternalizeMethods.java
rename to src/main/java/groovy/transform/ExternalizeMethods.java
diff --git a/src/main/groovy/groovy/transform/ExternalizeVerifier.java b/src/main/java/groovy/transform/ExternalizeVerifier.java
similarity index 100%
rename from src/main/groovy/groovy/transform/ExternalizeVerifier.java
rename to src/main/java/groovy/transform/ExternalizeVerifier.java
diff --git a/src/main/groovy/groovy/transform/Field.java b/src/main/java/groovy/transform/Field.java
similarity index 100%
rename from src/main/groovy/groovy/transform/Field.java
rename to src/main/java/groovy/transform/Field.java
diff --git a/src/main/groovy/groovy/transform/Generated.java b/src/main/java/groovy/transform/Generated.java
similarity index 100%
rename from src/main/groovy/groovy/transform/Generated.java
rename to src/main/java/groovy/transform/Generated.java
diff --git a/src/main/groovy/groovy/transform/ImmutableBase.java b/src/main/java/groovy/transform/ImmutableBase.java
similarity index 100%
rename from src/main/groovy/groovy/transform/ImmutableBase.java
rename to src/main/java/groovy/transform/ImmutableBase.java
diff --git a/src/main/groovy/groovy/transform/ImmutableOptions.java b/src/main/java/groovy/transform/ImmutableOptions.java
similarity index 100%
rename from src/main/groovy/groovy/transform/ImmutableOptions.java
rename to src/main/java/groovy/transform/ImmutableOptions.java
diff --git a/src/main/groovy/groovy/transform/IndexedProperty.java b/src/main/java/groovy/transform/IndexedProperty.java
similarity index 100%
rename from src/main/groovy/groovy/transform/IndexedProperty.java
rename to src/main/java/groovy/transform/IndexedProperty.java
diff --git a/src/main/groovy/groovy/transform/InheritConstructors.java b/src/main/java/groovy/transform/InheritConstructors.java
similarity index 100%
rename from src/main/groovy/groovy/transform/InheritConstructors.java
rename to src/main/java/groovy/transform/InheritConstructors.java
diff --git a/src/main/groovy/groovy/transform/Internal.java b/src/main/java/groovy/transform/Internal.java
similarity index 100%
rename from src/main/groovy/groovy/transform/Internal.java
rename to src/main/java/groovy/transform/Internal.java
diff --git a/src/main/groovy/groovy/transform/KnownImmutable.java b/src/main/java/groovy/transform/KnownImmutable.java
similarity index 100%
rename from src/main/groovy/groovy/transform/KnownImmutable.java
rename to src/main/java/groovy/transform/KnownImmutable.java
diff --git a/src/main/groovy/groovy/transform/MapConstructor.java b/src/main/java/groovy/transform/MapConstructor.java
similarity index 100%
rename from src/main/groovy/groovy/transform/MapConstructor.java
rename to src/main/java/groovy/transform/MapConstructor.java
diff --git a/src/main/groovy/groovy/transform/Memoized.java b/src/main/java/groovy/transform/Memoized.java
similarity index 100%
rename from src/main/groovy/groovy/transform/Memoized.java
rename to src/main/java/groovy/transform/Memoized.java
diff --git a/src/main/groovy/groovy/transform/NamedDelegate.java b/src/main/java/groovy/transform/NamedDelegate.java
similarity index 100%
rename from src/main/groovy/groovy/transform/NamedDelegate.java
rename to src/main/java/groovy/transform/NamedDelegate.java
diff --git a/src/main/groovy/groovy/transform/NamedParam.java b/src/main/java/groovy/transform/NamedParam.java
similarity index 100%
rename from src/main/groovy/groovy/transform/NamedParam.java
rename to src/main/java/groovy/transform/NamedParam.java
diff --git a/src/main/groovy/groovy/transform/NamedParams.java b/src/main/java/groovy/transform/NamedParams.java
similarity index 100%
rename from src/main/groovy/groovy/transform/NamedParams.java
rename to src/main/java/groovy/transform/NamedParams.java
diff --git a/src/main/groovy/groovy/transform/NamedVariant.java b/src/main/java/groovy/transform/NamedVariant.java
similarity index 100%
rename from src/main/groovy/groovy/transform/NamedVariant.java
rename to src/main/java/groovy/transform/NamedVariant.java
diff --git a/src/main/groovy/groovy/transform/NullCheck.java b/src/main/java/groovy/transform/NullCheck.java
similarity index 100%
rename from src/main/groovy/groovy/transform/NullCheck.java
rename to src/main/java/groovy/transform/NullCheck.java
diff --git a/src/main/groovy/groovy/transform/PackageScope.java b/src/main/java/groovy/transform/PackageScope.java
similarity index 100%
rename from src/main/groovy/groovy/transform/PackageScope.java
rename to src/main/java/groovy/transform/PackageScope.java
diff --git a/src/main/groovy/groovy/transform/PackageScopeTarget.java b/src/main/java/groovy/transform/PackageScopeTarget.java
similarity index 100%
rename from src/main/groovy/groovy/transform/PackageScopeTarget.java
rename to src/main/java/groovy/transform/PackageScopeTarget.java
diff --git a/src/main/groovy/groovy/transform/PropertyOptions.java b/src/main/java/groovy/transform/PropertyOptions.java
similarity index 100%
rename from src/main/groovy/groovy/transform/PropertyOptions.java
rename to src/main/java/groovy/transform/PropertyOptions.java
diff --git a/src/main/groovy/groovy/transform/SelfType.java b/src/main/java/groovy/transform/SelfType.java
similarity index 100%
rename from src/main/groovy/groovy/transform/SelfType.java
rename to src/main/java/groovy/transform/SelfType.java
diff --git a/src/main/groovy/groovy/transform/Sortable.java b/src/main/java/groovy/transform/Sortable.java
similarity index 100%
rename from src/main/groovy/groovy/transform/Sortable.java
rename to src/main/java/groovy/transform/Sortable.java
diff --git a/src/main/groovy/groovy/transform/SourceURI.java b/src/main/java/groovy/transform/SourceURI.java
similarity index 100%
rename from src/main/groovy/groovy/transform/SourceURI.java
rename to src/main/java/groovy/transform/SourceURI.java
diff --git a/src/main/groovy/groovy/transform/Synchronized.java b/src/main/java/groovy/transform/Synchronized.java
similarity index 100%
rename from src/main/groovy/groovy/transform/Synchronized.java
rename to src/main/java/groovy/transform/Synchronized.java
diff --git a/src/main/groovy/groovy/transform/ToString.java b/src/main/java/groovy/transform/ToString.java
similarity index 100%
rename from src/main/groovy/groovy/transform/ToString.java
rename to src/main/java/groovy/transform/ToString.java
diff --git a/src/main/groovy/groovy/transform/Trait.java b/src/main/java/groovy/transform/Trait.java
similarity index 100%
rename from src/main/groovy/groovy/transform/Trait.java
rename to src/main/java/groovy/transform/Trait.java
diff --git a/src/main/groovy/groovy/transform/TupleConstructor.java b/src/main/java/groovy/transform/TupleConstructor.java
similarity index 100%
rename from src/main/groovy/groovy/transform/TupleConstructor.java
rename to src/main/java/groovy/transform/TupleConstructor.java
diff --git a/src/main/groovy/groovy/transform/TypeChecked.java b/src/main/java/groovy/transform/TypeChecked.java
similarity index 100%
rename from src/main/groovy/groovy/transform/TypeChecked.java
rename to src/main/java/groovy/transform/TypeChecked.java
diff --git a/src/main/groovy/groovy/transform/TypeCheckingMode.java b/src/main/java/groovy/transform/TypeCheckingMode.java
similarity index 100%
rename from src/main/groovy/groovy/transform/TypeCheckingMode.java
rename to src/main/java/groovy/transform/TypeCheckingMode.java
diff --git a/src/main/groovy/groovy/transform/Undefined.java b/src/main/java/groovy/transform/Undefined.java
similarity index 100%
rename from src/main/groovy/groovy/transform/Undefined.java
rename to src/main/java/groovy/transform/Undefined.java
diff --git a/src/main/groovy/groovy/transform/VisibilityOptions.java b/src/main/java/groovy/transform/VisibilityOptions.java
similarity index 100%
rename from src/main/groovy/groovy/transform/VisibilityOptions.java
rename to src/main/java/groovy/transform/VisibilityOptions.java
diff --git a/src/main/groovy/groovy/transform/WithReadLock.java b/src/main/java/groovy/transform/WithReadLock.java
similarity index 100%
rename from src/main/groovy/groovy/transform/WithReadLock.java
rename to src/main/java/groovy/transform/WithReadLock.java
diff --git a/src/main/groovy/groovy/transform/WithWriteLock.java b/src/main/java/groovy/transform/WithWriteLock.java
similarity index 100%
rename from src/main/groovy/groovy/transform/WithWriteLock.java
rename to src/main/java/groovy/transform/WithWriteLock.java
diff --git a/src/main/groovy/groovy/transform/builder/Builder.java b/src/main/java/groovy/transform/builder/Builder.java
similarity index 100%
rename from src/main/groovy/groovy/transform/builder/Builder.java
rename to src/main/java/groovy/transform/builder/Builder.java
diff --git a/src/main/groovy/groovy/transform/builder/DefaultStrategy.java b/src/main/java/groovy/transform/builder/DefaultStrategy.java
similarity index 100%
rename from src/main/groovy/groovy/transform/builder/DefaultStrategy.java
rename to src/main/java/groovy/transform/builder/DefaultStrategy.java
diff --git a/src/main/groovy/groovy/transform/builder/ExternalStrategy.java b/src/main/java/groovy/transform/builder/ExternalStrategy.java
similarity index 100%
rename from src/main/groovy/groovy/transform/builder/ExternalStrategy.java
rename to src/main/java/groovy/transform/builder/ExternalStrategy.java
diff --git a/src/main/groovy/groovy/transform/builder/InitializerStrategy.java b/src/main/java/groovy/transform/builder/InitializerStrategy.java
similarity index 100%
rename from src/main/groovy/groovy/transform/builder/InitializerStrategy.java
rename to src/main/java/groovy/transform/builder/InitializerStrategy.java
diff --git a/src/main/groovy/groovy/transform/builder/SimpleStrategy.java b/src/main/java/groovy/transform/builder/SimpleStrategy.java
similarity index 100%
rename from src/main/groovy/groovy/transform/builder/SimpleStrategy.java
rename to src/main/java/groovy/transform/builder/SimpleStrategy.java
diff --git a/src/main/groovy/groovy/transform/options/DefaultPropertyHandler.java b/src/main/java/groovy/transform/options/DefaultPropertyHandler.java
similarity index 100%
rename from src/main/groovy/groovy/transform/options/DefaultPropertyHandler.java
rename to src/main/java/groovy/transform/options/DefaultPropertyHandler.java
diff --git a/src/main/groovy/groovy/transform/options/ImmutablePropertyHandler.java b/src/main/java/groovy/transform/options/ImmutablePropertyHandler.java
similarity index 100%
rename from src/main/groovy/groovy/transform/options/ImmutablePropertyHandler.java
rename to src/main/java/groovy/transform/options/ImmutablePropertyHandler.java
diff --git a/src/main/groovy/groovy/transform/options/LegacyHashMapPropertyHandler.java b/src/main/java/groovy/transform/options/LegacyHashMapPropertyHandler.java
similarity index 100%
rename from src/main/groovy/groovy/transform/options/LegacyHashMapPropertyHandler.java
rename to src/main/java/groovy/transform/options/LegacyHashMapPropertyHandler.java
diff --git a/src/main/groovy/groovy/transform/options/PropertyHandler.java b/src/main/java/groovy/transform/options/PropertyHandler.java
similarity index 100%
rename from src/main/groovy/groovy/transform/options/PropertyHandler.java
rename to src/main/java/groovy/transform/options/PropertyHandler.java
diff --git a/src/main/groovy/groovy/transform/options/Visibility.java b/src/main/java/groovy/transform/options/Visibility.java
similarity index 100%
rename from src/main/groovy/groovy/transform/options/Visibility.java
rename to src/main/java/groovy/transform/options/Visibility.java
diff --git a/src/main/groovy/groovy/transform/stc/ClosureParams.java b/src/main/java/groovy/transform/stc/ClosureParams.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/ClosureParams.java
rename to src/main/java/groovy/transform/stc/ClosureParams.java
diff --git a/src/main/groovy/groovy/transform/stc/ClosureSignatureConflictResolver.java b/src/main/java/groovy/transform/stc/ClosureSignatureConflictResolver.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/ClosureSignatureConflictResolver.java
rename to src/main/java/groovy/transform/stc/ClosureSignatureConflictResolver.java
diff --git a/src/main/groovy/groovy/transform/stc/ClosureSignatureHint.java b/src/main/java/groovy/transform/stc/ClosureSignatureHint.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/ClosureSignatureHint.java
rename to src/main/java/groovy/transform/stc/ClosureSignatureHint.java
diff --git a/src/main/groovy/groovy/transform/stc/FirstParam.java b/src/main/java/groovy/transform/stc/FirstParam.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/FirstParam.java
rename to src/main/java/groovy/transform/stc/FirstParam.java
diff --git a/src/main/groovy/groovy/transform/stc/FromAbstractTypeMethods.java b/src/main/java/groovy/transform/stc/FromAbstractTypeMethods.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/FromAbstractTypeMethods.java
rename to src/main/java/groovy/transform/stc/FromAbstractTypeMethods.java
diff --git a/src/main/groovy/groovy/transform/stc/FromString.java b/src/main/java/groovy/transform/stc/FromString.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/FromString.java
rename to src/main/java/groovy/transform/stc/FromString.java
diff --git a/src/main/groovy/groovy/transform/stc/IncorrectTypeHintException.java b/src/main/java/groovy/transform/stc/IncorrectTypeHintException.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/IncorrectTypeHintException.java
rename to src/main/java/groovy/transform/stc/IncorrectTypeHintException.java
diff --git a/src/main/groovy/groovy/transform/stc/MapEntryOrKeyValue.java b/src/main/java/groovy/transform/stc/MapEntryOrKeyValue.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/MapEntryOrKeyValue.java
rename to src/main/java/groovy/transform/stc/MapEntryOrKeyValue.java
diff --git a/src/main/groovy/groovy/transform/stc/PickAnyArgumentHint.java b/src/main/java/groovy/transform/stc/PickAnyArgumentHint.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/PickAnyArgumentHint.java
rename to src/main/java/groovy/transform/stc/PickAnyArgumentHint.java
diff --git a/src/main/groovy/groovy/transform/stc/PickFirstResolver.java b/src/main/java/groovy/transform/stc/PickFirstResolver.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/PickFirstResolver.java
rename to src/main/java/groovy/transform/stc/PickFirstResolver.java
diff --git a/src/main/groovy/groovy/transform/stc/SecondParam.java b/src/main/java/groovy/transform/stc/SecondParam.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/SecondParam.java
rename to src/main/java/groovy/transform/stc/SecondParam.java
diff --git a/src/main/groovy/groovy/transform/stc/SimpleType.java b/src/main/java/groovy/transform/stc/SimpleType.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/SimpleType.java
rename to src/main/java/groovy/transform/stc/SimpleType.java
diff --git a/src/main/groovy/groovy/transform/stc/SingleSignatureClosureHint.java b/src/main/java/groovy/transform/stc/SingleSignatureClosureHint.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/SingleSignatureClosureHint.java
rename to src/main/java/groovy/transform/stc/SingleSignatureClosureHint.java
diff --git a/src/main/groovy/groovy/transform/stc/ThirdParam.java b/src/main/java/groovy/transform/stc/ThirdParam.java
similarity index 100%
rename from src/main/groovy/groovy/transform/stc/ThirdParam.java
rename to src/main/java/groovy/transform/stc/ThirdParam.java
diff --git a/src/main/groovy/groovy/ui/GroovyMain.java b/src/main/java/groovy/ui/GroovyMain.java
similarity index 100%
rename from src/main/groovy/groovy/ui/GroovyMain.java
rename to src/main/java/groovy/ui/GroovyMain.java
diff --git a/src/main/groovy/groovy/ui/GroovySocketServer.java b/src/main/java/groovy/ui/GroovySocketServer.java
similarity index 100%
rename from src/main/groovy/groovy/ui/GroovySocketServer.java
rename to src/main/java/groovy/ui/GroovySocketServer.java
diff --git a/src/main/groovy/groovy/util/AbstractFactory.java b/src/main/java/groovy/util/AbstractFactory.java
similarity index 100%
rename from src/main/groovy/groovy/util/AbstractFactory.java
rename to src/main/java/groovy/util/AbstractFactory.java
diff --git a/src/main/groovy/groovy/util/BufferedIterator.java b/src/main/java/groovy/util/BufferedIterator.java
similarity index 100%
rename from src/main/groovy/groovy/util/BufferedIterator.java
rename to src/main/java/groovy/util/BufferedIterator.java
diff --git a/src/main/groovy/groovy/util/BuilderSupport.java b/src/main/java/groovy/util/BuilderSupport.java
similarity index 100%
rename from src/main/groovy/groovy/util/BuilderSupport.java
rename to src/main/java/groovy/util/BuilderSupport.java
diff --git a/src/main/groovy/groovy/util/CharsetToolkit.java b/src/main/java/groovy/util/CharsetToolkit.java
similarity index 100%
rename from src/main/groovy/groovy/util/CharsetToolkit.java
rename to src/main/java/groovy/util/CharsetToolkit.java
diff --git a/src/main/groovy/groovy/util/ClosureComparator.java b/src/main/java/groovy/util/ClosureComparator.java
similarity index 100%
rename from src/main/groovy/groovy/util/ClosureComparator.java
rename to src/main/java/groovy/util/ClosureComparator.java
diff --git a/src/main/groovy/groovy/util/ConfigObject.java b/src/main/java/groovy/util/ConfigObject.java
similarity index 100%
rename from src/main/groovy/groovy/util/ConfigObject.java
rename to src/main/java/groovy/util/ConfigObject.java
diff --git a/src/main/groovy/groovy/util/DelegatingScript.java b/src/main/java/groovy/util/DelegatingScript.java
similarity index 100%
rename from src/main/groovy/groovy/util/DelegatingScript.java
rename to src/main/java/groovy/util/DelegatingScript.java
diff --git a/src/main/groovy/groovy/util/Eval.java b/src/main/java/groovy/util/Eval.java
similarity index 100%
rename from src/main/groovy/groovy/util/Eval.java
rename to src/main/java/groovy/util/Eval.java
diff --git a/src/main/groovy/groovy/util/Expando.java b/src/main/java/groovy/util/Expando.java
similarity index 100%
rename from src/main/groovy/groovy/util/Expando.java
rename to src/main/java/groovy/util/Expando.java
diff --git a/src/main/groovy/groovy/util/Factory.java b/src/main/java/groovy/util/Factory.java
similarity index 100%
rename from src/main/groovy/groovy/util/Factory.java
rename to src/main/java/groovy/util/Factory.java
diff --git a/src/main/groovy/groovy/util/FactoryBuilderSupport.java b/src/main/java/groovy/util/FactoryBuilderSupport.java
similarity index 100%
rename from src/main/groovy/groovy/util/FactoryBuilderSupport.java
rename to src/main/java/groovy/util/FactoryBuilderSupport.java
diff --git a/src/main/groovy/groovy/util/GroovyCollections.java b/src/main/java/groovy/util/GroovyCollections.java
similarity index 100%
rename from src/main/groovy/groovy/util/GroovyCollections.java
rename to src/main/java/groovy/util/GroovyCollections.java
diff --git a/src/main/groovy/groovy/util/GroovyScriptEngine.java b/src/main/java/groovy/util/GroovyScriptEngine.java
similarity index 100%
rename from src/main/groovy/groovy/util/GroovyScriptEngine.java
rename to src/main/java/groovy/util/GroovyScriptEngine.java
diff --git a/src/main/groovy/groovy/util/IFileNameFinder.java b/src/main/java/groovy/util/IFileNameFinder.java
similarity index 100%
rename from src/main/groovy/groovy/util/IFileNameFinder.java
rename to src/main/java/groovy/util/IFileNameFinder.java
diff --git a/src/main/groovy/groovy/util/IndentPrinter.java b/src/main/java/groovy/util/IndentPrinter.java
similarity index 100%
rename from src/main/groovy/groovy/util/IndentPrinter.java
rename to src/main/java/groovy/util/IndentPrinter.java
diff --git a/src/main/groovy/groovy/util/MapEntry.java b/src/main/java/groovy/util/MapEntry.java
similarity index 100%
rename from src/main/groovy/groovy/util/MapEntry.java
rename to src/main/java/groovy/util/MapEntry.java
diff --git a/src/main/groovy/groovy/util/Node.java b/src/main/java/groovy/util/Node.java
similarity index 100%
rename from src/main/groovy/groovy/util/Node.java
rename to src/main/java/groovy/util/Node.java
diff --git a/src/main/groovy/groovy/util/NodeBuilder.java b/src/main/java/groovy/util/NodeBuilder.java
similarity index 100%
rename from src/main/groovy/groovy/util/NodeBuilder.java
rename to src/main/java/groovy/util/NodeBuilder.java
diff --git a/src/main/groovy/groovy/util/NodeList.java b/src/main/java/groovy/util/NodeList.java
similarity index 100%
rename from src/main/groovy/groovy/util/NodeList.java
rename to src/main/java/groovy/util/NodeList.java
diff --git a/src/main/groovy/groovy/util/NodePrinter.java b/src/main/java/groovy/util/NodePrinter.java
similarity index 100%
rename from src/main/groovy/groovy/util/NodePrinter.java
rename to src/main/java/groovy/util/NodePrinter.java
diff --git a/src/main/groovy/groovy/util/ObjectGraphBuilder.java b/src/main/java/groovy/util/ObjectGraphBuilder.java
similarity index 100%
rename from src/main/groovy/groovy/util/ObjectGraphBuilder.java
rename to src/main/java/groovy/util/ObjectGraphBuilder.java
diff --git a/src/main/groovy/groovy/util/ObservableList.java b/src/main/java/groovy/util/ObservableList.java
similarity index 100%
rename from src/main/groovy/groovy/util/ObservableList.java
rename to src/main/java/groovy/util/ObservableList.java
diff --git a/src/main/groovy/groovy/util/ObservableMap.java b/src/main/java/groovy/util/ObservableMap.java
similarity index 100%
rename from src/main/groovy/groovy/util/ObservableMap.java
rename to src/main/java/groovy/util/ObservableMap.java
diff --git a/src/main/groovy/groovy/util/ObservableSet.java b/src/main/java/groovy/util/ObservableSet.java
similarity index 100%
rename from src/main/groovy/groovy/util/ObservableSet.java
rename to src/main/java/groovy/util/ObservableSet.java
diff --git a/src/main/groovy/groovy/util/OrderBy.java b/src/main/java/groovy/util/OrderBy.java
similarity index 100%
rename from src/main/groovy/groovy/util/OrderBy.java
rename to src/main/java/groovy/util/OrderBy.java
diff --git a/src/main/groovy/groovy/util/PermutationGenerator.java b/src/main/java/groovy/util/PermutationGenerator.java
similarity index 100%
rename from src/main/groovy/groovy/util/PermutationGenerator.java
rename to src/main/java/groovy/util/PermutationGenerator.java
diff --git a/src/main/groovy/groovy/util/Proxy.java b/src/main/java/groovy/util/Proxy.java
similarity index 100%
rename from src/main/groovy/groovy/util/Proxy.java
rename to src/main/java/groovy/util/Proxy.java
diff --git a/src/main/groovy/groovy/util/ProxyGenerator.java b/src/main/java/groovy/util/ProxyGenerator.java
similarity index 100%
rename from src/main/groovy/groovy/util/ProxyGenerator.java
rename to src/main/java/groovy/util/ProxyGenerator.java
diff --git a/src/main/groovy/groovy/util/ResourceConnector.java b/src/main/java/groovy/util/ResourceConnector.java
similarity index 100%
rename from src/main/groovy/groovy/util/ResourceConnector.java
rename to src/main/java/groovy/util/ResourceConnector.java
diff --git a/src/main/groovy/groovy/util/ResourceException.java b/src/main/java/groovy/util/ResourceException.java
similarity index 100%
rename from src/main/groovy/groovy/util/ResourceException.java
rename to src/main/java/groovy/util/ResourceException.java
diff --git a/src/main/groovy/groovy/util/ScriptException.java b/src/main/java/groovy/util/ScriptException.java
similarity index 100%
rename from src/main/groovy/groovy/util/ScriptException.java
rename to src/main/java/groovy/util/ScriptException.java
diff --git a/src/main/groovy/groovy/util/logging/Commons.java b/src/main/java/groovy/util/logging/Commons.java
similarity index 100%
rename from src/main/groovy/groovy/util/logging/Commons.java
rename to src/main/java/groovy/util/logging/Commons.java
diff --git a/src/main/groovy/groovy/util/logging/Log.java b/src/main/java/groovy/util/logging/Log.java
similarity index 100%
rename from src/main/groovy/groovy/util/logging/Log.java
rename to src/main/java/groovy/util/logging/Log.java
diff --git a/src/main/groovy/groovy/util/logging/Log4j.java b/src/main/java/groovy/util/logging/Log4j.java
similarity index 100%
rename from src/main/groovy/groovy/util/logging/Log4j.java
rename to src/main/java/groovy/util/logging/Log4j.java
diff --git a/src/main/groovy/groovy/util/logging/Log4j2.java b/src/main/java/groovy/util/logging/Log4j2.java
similarity index 100%
rename from src/main/groovy/groovy/util/logging/Log4j2.java
rename to src/main/java/groovy/util/logging/Log4j2.java
diff --git a/src/main/groovy/groovy/util/logging/Slf4j.java b/src/main/java/groovy/util/logging/Slf4j.java
similarity index 100%
rename from src/main/groovy/groovy/util/logging/Slf4j.java
rename to src/main/java/groovy/util/logging/Slf4j.java
diff --git a/src/main/groovy/groovy/util/package.html b/src/main/java/groovy/util/package.html
similarity index 100%
rename from src/main/groovy/groovy/util/package.html
rename to src/main/java/groovy/util/package.html
diff --git a/src/main/groovy/groovy/xml/QName.java b/src/main/java/groovy/xml/QName.java
similarity index 100%
rename from src/main/groovy/groovy/xml/QName.java
rename to src/main/java/groovy/xml/QName.java
diff --git a/src/test/MainJavadocAssertionTest.groovy b/src/test/MainJavadocAssertionTest.groovy
index 7ff8712..714be7e 100644
--- a/src/test/MainJavadocAssertionTest.groovy
+++ b/src/test/MainJavadocAssertionTest.groovy
@@ -17,8 +17,9 @@
* under the License.
*/
-import org.junit.runners.Suite
+import groovy.test.JavadocAssertionTestSuite
import org.junit.runner.RunWith
+import org.junit.runners.Suite
@RunWith(Suite)
@Suite.SuiteClasses(JavadocAssertionTestSuite)
diff --git a/subprojects/groovy-json/build.gradle b/subprojects/groovy-json/build.gradle
index c9bf97a..7ef5902 100644
--- a/subprojects/groovy-json/build.gradle
+++ b/subprojects/groovy-json/build.gradle
@@ -19,6 +19,6 @@
dependencies {
compile rootProject
testCompile project(':groovy-test')
- testRuntime project(':groovy-ant')
+ testRuntime project(':groovy-ant') // for JavadocAssertionTests
testCompile project(':groovy-dateutil')
}
diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonJavadocAssertionTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonJavadocAssertionTest.groovy
index e1ff1a8..a4477f0 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonJavadocAssertionTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonJavadocAssertionTest.groovy
@@ -18,6 +18,8 @@
*/
package groovy.json
+import groovy.test.JavadocAssertionTestSuite
+
import org.junit.runners.Suite
import org.junit.runner.RunWith
diff --git a/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy
index 0a1a58c..8693454 100644
--- a/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy
+++ b/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy
@@ -90,14 +90,13 @@ class JavadocAssertionTestBuilder {
private String getAssertion(String tag) {
String tagInner = tag.substring(tag.indexOf(">")+1, tag.lastIndexOf("<"))
- String htmlAssertion = tagInner.replaceAll("(?m)^\\s*\\*", "")
+ String htmlAssertion = tagInner.replaceAll("(?m)^\\s*\\*\\s?", "")
String assertion = htmlAssertion
// TODO improve on this
[nbsp:' ', gt:'>', lt:'<', quot:'"', apos:"'", at:'@', '#64':'@', ndash:'-', amp:'&'].each { key, value ->
assertion = assertion.replaceAll("(?i)&$key;", value)
}
assertion = assertion.replaceAll(/(?i)\{@code ([^}]*)\}/, '$1')
-
return assertion
}
@@ -132,7 +131,7 @@ class JavadocAssertionTestBuilder {
private String getTestCode(String testName, List testMethods) {
return """
class $testName extends junit.framework.TestCase {
- """+testMethods.join("\r\n")+"""
+ """+testMethods.join("\n")+"""
}
"""
}
diff --git a/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestSuite.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestSuite.groovy
index d66440a..ad30eb5 100644
--- a/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestSuite.groovy
+++ b/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestSuite.groovy
@@ -39,7 +39,7 @@ import junit.textui.TestRunner
* are on the classpath). As an example:
* <p>
* <code>
- * java groovy.util.JavadocAssertionTestSuite src/main
+ * java groovy.test.JavadocAssertionTestSuite src/main
* </code>
*
* <b>Note: this class requires the Ant module at runtime.</b>
diff --git a/src/test/groovy/util/JavadocAssertionTestBuilderTest.groovy b/subprojects/groovy-test/src/test/groovy/groovy/test/JavadocAssertionTestBuilderTest.groovy
similarity index 99%
rename from src/test/groovy/util/JavadocAssertionTestBuilderTest.groovy
rename to subprojects/groovy-test/src/test/groovy/groovy/test/JavadocAssertionTestBuilderTest.groovy
index fcf8e6d..f1d5117 100644
--- a/src/test/groovy/util/JavadocAssertionTestBuilderTest.groovy
+++ b/subprojects/groovy-test/src/test/groovy/groovy/test/JavadocAssertionTestBuilderTest.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.util
+package groovy.test
import junit.framework.TestCase
import org.codehaus.groovy.control.MultipleCompilationErrorsException
diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlJavadocAssertionTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlJavadocAssertionTest.groovy
index 60f80c9..8e77ccb 100644
--- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlJavadocAssertionTest.groovy
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlJavadocAssertionTest.groovy
@@ -18,9 +18,9 @@
*/
package groovy.xml
-import org.junit.runners.Suite
-import org.junit.runner.RunWith
import groovy.test.JavadocAssertionTestSuite
+import org.junit.runner.RunWith
+import org.junit.runners.Suite
@RunWith(Suite)
@Suite.SuiteClasses(JavadocAssertionTestSuite)
diff --git a/subprojects/groovy-yaml/build.gradle b/subprojects/groovy-yaml/build.gradle
index 3d6e89c..df56336 100644
--- a/subprojects/groovy-yaml/build.gradle
+++ b/subprojects/groovy-yaml/build.gradle
@@ -28,4 +28,5 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-databind:$jacksondatabindVersion"
compile project(':groovy-json')
testCompile project(':groovy-test')
+ testRuntime project(':groovy-ant') // for JavadocAssertionTests
}
diff --git a/src/main/groovy/groovy/lang/Buildable.java b/subprojects/groovy-yaml/src/test/groovy/groovy/yaml/YamlJavadocAssertionTest.groovy
similarity index 78%
rename from src/main/groovy/groovy/lang/Buildable.java
rename to subprojects/groovy-yaml/src/test/groovy/groovy/yaml/YamlJavadocAssertionTest.groovy
index af22958..1a9ba46 100644
--- a/src/main/groovy/groovy/lang/Buildable.java
+++ b/subprojects/groovy-yaml/src/test/groovy/groovy/yaml/YamlJavadocAssertionTest.groovy
@@ -16,9 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.lang;
+package groovy.yaml
+import groovy.test.JavadocAssertionTestSuite
+import org.junit.runner.RunWith
+import org.junit.runners.Suite
-public interface Buildable {
- void build(GroovyObject builder);
+@RunWith(Suite)
+@Suite.SuiteClasses(JavadocAssertionTestSuite)
+class YamlJavadocAssertionTest {
}
[groovy] 01/02: GROOVY-8647: Split package renaming (fix a broken
link)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3c1d89556a82e2c0dce05c1f4536f6c167d6b7ca
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun May 19 15:08:04 2019 +1000
GROOVY-8647: Split package renaming (fix a broken link)
---
.../groovy-test/src/main/java/groovy/transform/NotYetImplemented.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java b/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
index 986ef99..0f9ddf3 100644
--- a/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
+++ b/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
@@ -36,7 +36,7 @@ import java.lang.annotation.Target;
* The idea for this AST transformation originated in {@link groovy.test.GroovyTestCase#notYetImplemented()}.
*
* @since 2.0.0
- * @deprecated use {@link groovy.test.transform.NotYetImplemented}
+ * @deprecated use {@link groovy.test.NotYetImplemented}
*/
@Deprecated
@java.lang.annotation.Documented