This is an automated email from the ASF dual-hosted git repository. ddekany pushed a change to branch 3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
from 71e75860 Merge pull request #78 from jido/patch-1 new f79f07ba Forward ported from 2.3-gae: JIRA-204 Gradle build. new ed54d888 SimpleCharStream (generated by javacc) is no longer public. Configured the Javacc task to fail: new 425a09bd Merge pull request #80 from kelemen/3 The 2363 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: .gitignore | 9 +- .travis.yml | 5 +- build.gradle | 443 -------- build.gradle.kts | 210 ++++ .../PublicAll.java => buildSrc/build.gradle.kts | 7 +- .../core/build.gradle.kts | 11 +- .../freemarker/build/core/ChecksumFileTask.kt | 81 ++ .../freemarker/build/core/CompileJavaccTask.kt | 228 ++++ .../build/core/FreemarkerCommonPlugin.kt | 30 +- .../build/core/FreemarkerPathExtensions.kt | 9 +- .../build/core/FreemarkerRootExtension.kt | 64 ++ .../freemarker/build/core/FreemarkerRootPlugin.kt | 142 +++ .../build/core/FreemarkerVersionService.kt | 99 ++ .../build/core/JavadocStyleAdjustments.kt | 66 ++ .../freemarker/build/core/ManualBuildTask.kt | 69 ++ .../apache/freemarker/build/core/SignatureTask.kt | 59 ++ .../gradle-plugins/freemarker-common.properties | 12 +- .../gradle-plugins/freemarker-root.properties | 6 +- .../module-common/build.gradle.kts | 11 +- .../module/common/DependencyEnforcementConfig.kt | 56 + .../build/module/common/FreemarkerJavaExtension.kt | 23 +- .../build/module/common/FreemarkerJavaPlugin.kt | 85 ++ .../module/common/FreemarkerPublishedJavaPlugin.kt | 216 ++++ .../build/module/common/JavadocStyleAdjustments.kt | 93 ++ .../gradle-plugins/freemarker-java.properties | 5 +- .../freemarker-published-java.properties | 5 +- .../settings.gradle.kts | 9 +- freemarker-converter/build.gradle | 74 -- .../build.gradle.kts | 34 +- freemarker-core-test/build.gradle | 41 - ...faultObjectWrapperInc.java => build.gradle.kts} | 18 +- .../freemarker/core/GetOptionalTemplateTest.java | 19 + .../freemarker/core/TruncateBuiltInTest.java | 19 + freemarker-core/build.gradle | 138 --- freemarker-core/build.gradle.kts | 83 ++ .../freemarker/core/ASTDynamicTopLevelCall.java | 2 - .../org/apache/freemarker/core/Configuration.java | 2 - .../org/apache/freemarker/core/Environment.java | 2 - ...SpecialBuiltIn.java => SuppressFBWarnings.java} | 12 +- .../java/org/apache/freemarker/core/Template.java | 2 - .../core/debug/RmiDebuggedEnvironmentImpl.java | 2 - .../freemarker/core/debug/RmiDebuggerService.java | 2 - .../freemarker/core/debug/SuppressFBWarnings.java | 11 +- .../core/model/impl/DefaultEnumerationAdapter.java | 2 - .../core/model/impl/DefaultIteratorAdapter.java | 2 - .../core/model/impl/OverloadedMethodsSubset.java | 2 - .../core/model/impl/SuppressFBWarnings.java | 15 +- .../pluggablebuiltin/TruncateBuiltinAlgorithm.java | 19 + .../impl/DefaultTruncateBuiltinAlgorithm.java | 19 + .../templateresolver/impl/SuppressFBWarnings.java | 11 +- .../impl/URLTemplateLoadingSource.java | 2 - .../impl/ISOLikeTemplateDateFormat.java | 2 - .../core/valueformat/impl/SuppressFBWarnings.java | 11 +- .../javacc/{ => org/apache/freemarker/core}/FTL.jj | 0 .../org/apache/freemarker/core/version.properties | 0 freemarker-dom/build.gradle | 85 -- .../build.gradle.kts | 29 +- freemarker-manual/build.gradle | 48 - .../build.gradle.kts | 34 +- freemarker-servlet/build.gradle | 113 -- freemarker-servlet/build.gradle.kts | 69 ++ .../freemarker/servlet/FreemarkerServlet.java | 2 - .../freemarker/servlet/SuppressFBWarnings.java | 11 +- .../src/main/resources/META-INF/LICENSE | 202 ---- freemarker-spring/build.gradle | 131 --- freemarker-spring/build.gradle.kts | 61 ++ freemarker-test-utils/build.gradle | 77 -- .../build.gradle.kts | 31 +- .../repositories.gradle.kts | 36 +- gradle/wrapper/gradle-wrapper.jar | Bin 50518 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 357 +++---- gradlew.bat | 53 +- old-ant-build/README.txt | 1 - old-ant-build/build.properties | 23 - old-ant-build/build.xml | 1093 -------------------- old-ant-build/ivy.xml | 152 --- old-ant-build/ivysettings.xml | 54 - old-ant-build/osgi.bnd => osgi.bnd | 20 +- rat-excludes | 4 + settings.gradle | 29 - settings.gradle.kts | 68 ++ .../dist/bin/rat-excludes | 27 +- .../resources => src/dist/jar}/META-INF/LICENSE | 0 src/dist/javadoc/META-INF/LICENSE | 202 ---- 85 files changed, 2281 insertions(+), 3333 deletions(-) delete mode 100644 build.gradle create mode 100644 build.gradle.kts copy freemarker-core-test/src/test/java/org/apache/freemarker/core/userpkg/PublicAll.java => buildSrc/build.gradle.kts (91%) copy freemarker-core-test/src/test/java/org/apache/freemarker/core/userpkg/PackageVisibleAll.java => buildSrc/core/build.gradle.kts (80%) create mode 100644 buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/ChecksumFileTask.kt create mode 100644 buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/CompileJavaccTask.kt copy freemarker-core-test/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java => buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/FreemarkerCommonPlugin.kt (56%) copy freemarker-core-test/src/test/java/org/apache/freemarker/core/userpkg/PackageVisibleWithPublicConstructor.java => buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/FreemarkerPathExtensions.kt (80%) create mode 100644 buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/FreemarkerRootExtension.kt create mode 100644 buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/FreemarkerRootPlugin.kt create mode 100644 buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/FreemarkerVersionService.kt create mode 100644 buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/JavadocStyleAdjustments.kt create mode 100644 buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/ManualBuildTask.kt create mode 100644 buildSrc/core/src/main/kotlin/org/apache/freemarker/build/core/SignatureTask.kt rename old-ant-build/.travis.yml => buildSrc/core/src/main/resources/META-INF/gradle-plugins/freemarker-common.properties (90%) rename gradle.properties.sample => buildSrc/core/src/main/resources/META-INF/gradle-plugins/freemarker-root.properties (90%) copy freemarker-core-test/src/test/java/org/apache/freemarker/core/userpkg/PackageVisibleAll.java => buildSrc/module-common/build.gradle.kts (86%) create mode 100644 buildSrc/module-common/src/main/kotlin/org/apache/freemarker/build/module/common/DependencyEnforcementConfig.kt copy freemarker-core/src/main/java/org/apache/freemarker/core/TemplatePostProcessorException.java => buildSrc/module-common/src/main/kotlin/org/apache/freemarker/build/module/common/FreemarkerJavaExtension.kt (61%) create mode 100644 buildSrc/module-common/src/main/kotlin/org/apache/freemarker/build/module/common/FreemarkerJavaPlugin.kt create mode 100644 buildSrc/module-common/src/main/kotlin/org/apache/freemarker/build/module/common/FreemarkerPublishedJavaPlugin.kt create mode 100644 buildSrc/module-common/src/main/kotlin/org/apache/freemarker/build/module/common/JavadocStyleAdjustments.kt copy freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/models/BeansTestResources.properties => buildSrc/module-common/src/main/resources/META-INF/gradle-plugins/freemarker-java.properties (89%) copy freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/models/BeansTestResources.properties => buildSrc/module-common/src/main/resources/META-INF/gradle-plugins/freemarker-published-java.properties (89%) copy freemarker-core-test/src/test/java/org/apache/freemarker/core/userpkg/PackageVisibleAllWithBuilder.java => buildSrc/settings.gradle.kts (82%) delete mode 100644 freemarker-converter/build.gradle copy freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/NonPrimitiveArrayBackedReadOnlyList.java => freemarker-converter/build.gradle.kts (64%) delete mode 100644 freemarker-core-test/build.gradle copy freemarker-core-test/{src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperInc.java => build.gradle.kts} (65%) delete mode 100644 freemarker-core/build.gradle create mode 100644 freemarker-core/build.gradle.kts copy freemarker-core/src/main/java/org/apache/freemarker/core/{SpecialBuiltIn.java => SuppressFBWarnings.java} (79%) copy freemarker-core-test/src/test/java/org/apache/freemarker/core/userpkg/PackageVisibleAll.java => freemarker-core/src/main/java/org/apache/freemarker/core/debug/SuppressFBWarnings.java (75%) copy freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java => freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SuppressFBWarnings.java (79%) copy freemarker-core-test/src/test/java/org/apache/freemarker/core/userpkg/PackageVisibleAll.java => freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/SuppressFBWarnings.java (74%) copy freemarker-core-test/src/test/java/org/apache/freemarker/core/userpkg/PackageVisibleAll.java => freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/SuppressFBWarnings.java (74%) rename freemarker-core/src/main/javacc/{ => org/apache/freemarker/core}/FTL.jj (100%) rename freemarker-core/src/main/{resources => resource-templates}/org/apache/freemarker/core/version.properties (100%) delete mode 100644 freemarker-dom/build.gradle copy freemarker-core-test/src/test/java/org/apache/freemarker/core/EvalJsonBuiltInTest.java => freemarker-dom/build.gradle.kts (56%) delete mode 100644 freemarker-manual/build.gradle copy freemarker-core/src/main/java/org/apache/freemarker/core/NativeTemplateModelIterator.java => freemarker-manual/build.gradle.kts (55%) delete mode 100644 freemarker-servlet/build.gradle create mode 100644 freemarker-servlet/build.gradle.kts copy freemarker-core-test/src/test/java/org/apache/freemarker/core/userpkg/PackageVisibleAll.java => freemarker-servlet/src/main/java/org/apache/freemarker/servlet/SuppressFBWarnings.java (75%) delete mode 100644 freemarker-servlet/src/main/resources/META-INF/LICENSE delete mode 100644 freemarker-spring/build.gradle create mode 100644 freemarker-spring/build.gradle.kts delete mode 100644 freemarker-test-utils/build.gradle copy freemarker-core-test/src/test/java/org/apache/freemarker/core/EvalJsonBuiltInTest.java => freemarker-test-utils/build.gradle.kts (59%) copy freemarker-core/src/main/java/org/apache/freemarker/core/_DelayedGetCanonicalForm.java => gradle/repositories.gradle.kts (56%) delete mode 100644 old-ant-build/README.txt delete mode 100644 old-ant-build/build.properties delete mode 100644 old-ant-build/build.xml delete mode 100644 old-ant-build/ivy.xml delete mode 100644 old-ant-build/ivysettings.xml rename old-ant-build/osgi.bnd => osgi.bnd (84%) delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts rename old-ant-build/build.properties.sample => src/dist/bin/rat-excludes (51%) rename {freemarker-core/src/main/resources => src/dist/jar}/META-INF/LICENSE (100%) delete mode 100644 src/dist/javadoc/META-INF/LICENSE