You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2019/08/05 19:54:55 UTC
[freemarker] branch 3 updated (763fab1 -> 60944fc)
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 763fab1 (Small README fix)
new 6542f0a (JavaDoc error fix)
new 60944fc Increased minimum Java version to 8
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:
.travis.yml | 3 +-
FM3-CHANGE-LOG.txt | 3 +-
README.md | 12 +-
build.gradle | 31 ++--
freemarker-core-test-java8/build.gradle | 47 -----
.../src/main/resources/META-INF/LICENSE | 202 ---------------------
.../core/model/impl/BridgeMethodsBean.java | 0
.../core/model/impl/BridgeMethodsBeanBase.java | 0
.../Java8BridgeMethodsWithDefaultMethodBean.java | 0
.../Java8BridgeMethodsWithDefaultMethodBean2.java | 0
...ava8BridgeMethodsWithDefaultMethodBeanBase.java | 0
...va8BridgeMethodsWithDefaultMethodBeanBase2.java | 0
.../core/model/impl/Java8DefaultMethodsBean.java | 0
.../model/impl/Java8DefaultMethodsBeanBase.java | 0
...Java8DefaultObjectWrapperBridgeMethodsTest.java | 0
.../model/impl/Java8DefaultObjectWrapperTest.java | 2 +-
.../pluggablebuiltin/TruncateBuiltinAlgorithm.java | 4 +-
gradle.properties.sample | 3 +-
settings.gradle | 1 -
19 files changed, 30 insertions(+), 278 deletions(-)
delete mode 100644 freemarker-core-test-java8/build.gradle
delete mode 100644 freemarker-core-test-java8/src/main/resources/META-INF/LICENSE
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java (100%)
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java (100%)
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java (100%)
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java (100%)
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java (100%)
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java (100%)
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java (100%)
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java (100%)
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java (100%)
rename {freemarker-core-test-java8 => freemarker-core-test}/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java (99%)
[freemarker] 01/02: (JavaDoc error fix)
Posted by dd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 6542f0a3716e07610562a2194ae02cad2e106dc6
Author: ddekany <dd...@apache.org>
AuthorDate: Mon Aug 5 21:53:33 2019 +0200
(JavaDoc error fix)
---
.../java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java | 0
.../org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java | 0
.../core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java | 0
.../core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java | 0
.../core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java | 0
.../core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java | 0
.../apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java | 0
.../freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java | 0
.../core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java | 0
.../freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java | 2 +-
.../freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java | 4 +++-
11 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java
similarity index 100%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java
similarity index 100%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java
similarity index 100%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java
similarity index 100%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java
similarity index 100%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java
similarity index 100%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java
similarity index 100%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java
similarity index 100%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java
similarity index 100%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java
diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java
similarity index 99%
rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java
rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java
index fdeac75..7ff1aab 100644
--- a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
public class Java8DefaultObjectWrapperTest {
- private static final DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build();
+ private static final DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build();
@Test
public void testDefaultMethodRecognized() throws TemplateException {
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java b/freemarker-core/src/main/java/org/apache/freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java
index b142649..f193683 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java
@@ -1,10 +1,12 @@
package org.apache.freemarker.core.pluggablebuiltin;
import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.MutableProcessingConfiguration;
import org.apache.freemarker.core.TemplateException;
import org.apache.freemarker.core.model.TemplateMarkupOutputModel;
import org.apache.freemarker.core.model.TemplateModel;
import org.apache.freemarker.core.model.TemplateStringModel;
+import org.apache.freemarker.core.pluggablebuiltin.impl.DefaultTruncateBuiltinAlgorithm;
/**
* Used for implementing the "truncate" family of built-ins. There are several variations of the "truncate" built-ins,
@@ -14,7 +16,7 @@ import org.apache.freemarker.core.model.TemplateStringModel;
*
* <p>New methods may be added in later versions, whoever they won't be abstract for backward compatibility.
*
- * @see Configurable#setTruncateBuiltinAlgorithm(TruncateBuiltinAlgorithm)
+ * @see MutableProcessingConfiguration#setTruncateBuiltinAlgorithm(TruncateBuiltinAlgorithm)
*
* @since 2.3.29
*/
[freemarker] 02/02: Increased minimum Java version to 8
Posted by dd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 60944fc1e26c86ad45d2da123d0feefab5f53c6e
Author: ddekany <dd...@apache.org>
AuthorDate: Mon Aug 5 21:54:03 2019 +0200
Increased minimum Java version to 8
---
.travis.yml | 3 +-
FM3-CHANGE-LOG.txt | 3 +-
README.md | 12 +-
build.gradle | 31 ++--
freemarker-core-test-java8/build.gradle | 47 -----
.../src/main/resources/META-INF/LICENSE | 202 ---------------------
gradle.properties.sample | 3 +-
settings.gradle | 1 -
8 files changed, 26 insertions(+), 276 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d673ccd..c9a4c5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,12 +18,11 @@
language: java
#before_install:
# - sudo apt-get -qq update
-# - sudo apt-get install -y openjdk-7-jre
+# - sudo apt-get install -y openjdk-8-jre
jdk:
- openjdk8
env:
global:
- - freemarker_build_boot_classpath_java_7=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar
- freemarker_build_boot_classpath_java_8=/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar
install:
- ./gradlew assemble aggregateJavadoc javadoc
diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt
index 54bb96d..c532c5c 100644
--- a/FM3-CHANGE-LOG.txt
+++ b/FM3-CHANGE-LOG.txt
@@ -566,8 +566,7 @@ models by default like FreemarkerServlet does.
Core / Miscellaneous
....................
-- Minimum Java version increased to 7 (including try-with-resources, as Android Studio 3.0 supports it on all
- Android API levels).
+- Minimum Java version increased to 8
- Removed support for incompatibleImprovements before 3.0.0. So currently 3.0.0 is the only support value.
- Removed legacy extensions (so these has no module): rhyno, jython, xml (not to be confused with dom), jdom, ant.
- Servlet 3.0 and JSP 2.2 and is the minimum requirement now (if Serlvet/JSP features are used at all).
diff --git a/README.md b/README.md
index 17d727e..9128660 100644
--- a/README.md
+++ b/README.md
@@ -163,8 +163,8 @@ Last tested Eclipse Oxygen (4.7.0)
Number of imports required for .*: 99
Number of static imports needed for .*: 1
- Java -> Installed JRE-s:
- Ensure that you have JDK 7 and JDK 8 installed, and that it was added to
- Eclipse. Note that it's not JRE, but JDK.
+ Ensure that you have JDK 8 installed, and that it was added to Eclipse.
+ Note that it's not JRE, but JDK.
- Java -> Compiler -> Javadoc:
"Malformed Javadoc comments": Error
"Only consider members as visible": Private
@@ -208,7 +208,7 @@ Last tested Eclipse Oxygen (4.7.0)
### IntelliJ IDEA
Last tested on IntelliJ IDEA Community 2017.1.5.
-
+
- First, build the project with Gradle if you haven't yet (see earlier how).
- "New..." -> "Project from existing source" (or if you start on the Welcome screen: "Import project")
- Point to the project root directory
@@ -219,12 +219,6 @@ Last tested on IntelliJ IDEA Community 2017.1.5.
- On the next window (if there's one), it will prompt to remove `freemarker` from the project.
Let it do it (as it's an incorrect duplication of the `freemarker` root project).
- At the end of this process you should have all modules in the Project tree view.
-- "File" -> "Project Structure..."
- Under "Project", set the SDK to 1.7, and the language level to 7.
- Under "Modules", expand the "freemarker" module in the tree view, and select
- "freemarker-core-test-java8", and change the "Module SDK" to 1.8 (on the "Dependencies" tab).
- Do the same with the "main" and "test" submodules under that (they are maybe shown as
- "freemarker-core-test-java8_main" and "freemarker-core-test-java8_test" instead).
- "File" -> "Settings"
- Under "Editor" / "Code style", import and use
freemarker/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
diff --git a/build.gradle b/build.gradle
index 45be0ef..c6e912f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ ext.bannedLibraries = [
repositories {
mavenLocal()
mavenCentral()
- // You don't want to repos here usually, but to `subproject { ... repositories {...} ... }` below
+ // You don't want to add repos here usually, but to `subproject { ... repositories {...} ... }` below
}
configurations {
@@ -69,8 +69,9 @@ dependencies {
rat "org.apache.rat:apache-rat-tasks:0.12"
}
-// Java boot-classpath setup:
-[7, 8].each { javaVersion ->
+// Java boot-classpath setup (add numbers to the array to support additional Java versions):
+int minJavaVersion = 8
+[minJavaVersion].each { javaVersion ->
// Name used in gradle.properties:
String propName = "bootClasspathJava${javaVersion}"
@@ -130,9 +131,9 @@ def javadocCommons = { callerDelegate ->
options.docEncoding = "UTF-8"
options.charSet = "UTF-8"
options.locale = "en_US"
- options.links = [ "http://docs.oracle.com/javase/8/docs/api/" ]
+ options.links = [ "https://docs.oracle.com/javase/" + minJavaVersion + "/docs/api/" ]
doLast {
- // We will fix low quality typography of JDK 8 Javadoc here. Bascially we make it look like JDK 7.
+ // We will fix low quality typography of JDK 8 Javadoc here. Basically we make it look like JDK 7.
File cssFile = new File(outputDirectory, "stylesheet.css")
assert cssFile.exists()
@@ -206,12 +207,20 @@ subprojects {
apply plugin: "idea"
// Default java compiler configuration (might be overridden in subprojects):
- sourceCompatibility = "1.7"
- targetCompatibility = "1.7"
- [compileJava, compileTestJava]*.options*.bootClasspath = bootClasspathJava7
+ sourceCompatibility = "1." + minJavaVersion
+ targetCompatibility = "1." + minJavaVersion
+ [compileJava, compileTestJava]*.options*.bootClasspath = project.property("bootClasspathJava" + minJavaVersion)
+ /*
+ If a subproject needs a Java version X instead of minJavaVersion, it meant to do the below in its build.gradle. This
+ approach was only tried till Java 8 though, and Java 9 is quite different.
+
+ // Override inherited default Java version:
+ sourceCompatibility = "1.X"
+ targetCompatibility = "1.X"
+ [compileJava, compileTestJava]*.options*.bootClasspath = bootClasspathJavaX
+ */
[compileJava, compileTestJava]*.options*.encoding = "UTF-8"
// TODO Remove SuppressFBWarning-s from compileJava output somehow
- // TODO Ensure that JUnit tests run on Java 7, except for the modules that were made for later versions.
repositories {
mavenLocal()
@@ -265,7 +274,7 @@ subprojects {
version versionForOSGi
license "Apache License, Version 2.0" // Has no effect on Gradle 3.5; see issues/2056 below
vendor "Apache Software Foundation"
- // TODO The autogenerated Bundle-SymbolicName is weird, esp. for freemarker-core-java8. How should it look?
+ // TODO The autogenerated Bundle-SymbolicName is weird. How should it look?
attributes(
"Specification-Version": versionForMf,
@@ -292,7 +301,7 @@ subprojects {
archives jar
archives sourcesJar
archives javadocJar
- // TODO Archies must contain META-INF/{LICENSE,NOTICE,DISCLAIMER}; see in 2.3.x
+ // TODO Archives must contain META-INF/{LICENSE,NOTICE,DISCLAIMER}; see in 2.3.x
}
// The identical parts of Maven "deployer" and "installer" configuration:
diff --git a/freemarker-core-test-java8/build.gradle b/freemarker-core-test-java8/build.gradle
deleted file mode 100644
index a8a1aec..0000000
--- a/freemarker-core-test-java8/build.gradle
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-description = """\
-The unit tests of freemarker-core that need Java 8 features. These were moved to a separate project to avoid \
-a project that contains java files that require varous Java versions.
-"""
-published = false
-
-// Override inherited default Java version:
-sourceCompatibility = "1.8"
-targetCompatibility = "1.8"
-[compileJava, compileTestJava]*.options*.bootClasspath = bootClasspathJava8
-
-dependencies {
- compile project(":freemarker-core")
- compile project(":freemarker-test-utils")
-}
-
-// We have nothing to put into the jar, as we have test classes only
-jar.enabled = false
-sourcesJar.enabled = false
-
-javadoc.enabled = false
-javadocJar.enabled = false
-
-// Must not be deployed to a public Maven repository
-uploadArchives.enabled = false
-
-// Doesn't make sense to Maven "install" this, as the artifact won't contain test classes
-install.enabled = false
diff --git a/freemarker-core-test-java8/src/main/resources/META-INF/LICENSE b/freemarker-core-test-java8/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/freemarker-core-test-java8/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/gradle.properties.sample b/gradle.properties.sample
index 6f3df54..ce83e6e 100644
--- a/gradle.properties.sample
+++ b/gradle.properties.sample
@@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-bootClasspathJava7=C:/Program Files/Java/jdk1.7.0_25/jre/lib/rt.jar
-bootClasspathJava8=C:/Program Files/Java/jdk1.8.0_66/jre/lib/rt.jar
\ No newline at end of file
+bootClasspathJava8=C:/Program Files/Java/jdk1.8.0_212/jre/lib/rt.jar
diff --git a/settings.gradle b/settings.gradle
index f8f9b47..e610ee8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,7 +21,6 @@ rootProject.name = 'freemarker'
include 'freemarker-core'
include 'freemarker-core-test'
-include 'freemarker-core-test-java8'
include 'freemarker-servlet'
include 'freemarker-test-utils'
include 'freemarker-manual'