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 2018/04/01 17:07:12 UTC
freemarker git commit: Removed "incubating" and "incubator"
references. Updated copyright end year. Upgraded converter FM dependency to
2.3.28.
Repository: freemarker
Updated Branches:
refs/heads/3 b0825190f -> 55557af21
Removed "incubating" and "incubator" references. Updated copyright end year. Upgraded converter FM dependency to 2.3.28.
Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/55557af2
Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/55557af2
Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/55557af2
Branch: refs/heads/3
Commit: 55557af210730ddaa959b09b00739fc8f94ea742
Parents: b082519
Author: ddekany <dd...@apache.org>
Authored: Sun Apr 1 19:05:43 2018 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Apr 1 19:05:43 2018 +0200
----------------------------------------------------------------------
LICENSE | 6 ++--
NOTICE | 4 +--
README.md | 10 +++---
build.gradle | 34 +++++++++++---------
freemarker-converter/build.gradle | 2 +-
.../src/main/resources/META-INF/DISCLAIMER | 8 -----
.../src/main/resources/META-INF/DISCLAIMER | 8 -----
.../src/main/docgen/en_US/docgen.cjson | 18 +++++------
.../src/main/resources/META-INF/DISCLAIMER | 8 -----
src/dist/bin/documentation/index.html | 4 +--
10 files changed, 40 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7164877..1850343 100644
--- a/LICENSE
+++ b/LICENSE
@@ -203,9 +203,9 @@
==============================================================================
-The Apache FreeMarker (incubating) source code contains the following
-binaries, which were created at the Apache FreeMarker (incubating) project,
-and hence are covered by the same license as the other source files of it:
+The Apache FreeMarker source code contains the following binaries, which were
+created at the Apache FreeMarker project, and hence are covered by the same
+license as the other source files of it:
freemarker-core/src/main/misc/overloadedNumberRules/prices.ods
freemarker-core/src/manual/en_US/docgen-originals/figures/overview.odg
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index c14c3fa..929539f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
-Apache FreeMarker (incubating)
-Copyright 2015-2017 The Apache Software Foundation
+Apache FreeMarker
+Copyright 2015-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 45acb6b..15a5f33 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Apache FreeMarker {version}
===========================
-[](https://travis-ci.org/apache/incubator-freemarker)
+[](https://travis-ci.org/apache/freemarker)
For the latest version or to report bugs visit:
https://freemarker.apache.org/
@@ -213,7 +213,7 @@ Last tested on IntelliJ IDEA Community 2017.1.5.
- On the next screen, select "Use gradle wrapper task configuration" [TODO: or keep default?].
Be sure at least Java 8 is selected for Gradle. Other defaults should be fine.
- On the next window, all modules will be selected, that's fine, go on
- - On the next window, it will prompt to remove the `incubator-freemarker` from the project.
+ - On the next window, it will prompt to remove the `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 Project tree view.
- "File" -> "Project Structure..."
@@ -222,9 +222,9 @@ Last tested on IntelliJ IDEA Community 2017.1.5.
"freemarker-core-test-java8_test", change the "Module SDK" to 1.8 (on the "Dependencies" tab).
- "File" -> "Settings"
- Under "Editor" / "Code style", import and use
- incubator-freemarker/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
+ freemarker/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
- Under "Editor" / "Inspections", import and use
- incubator-freemarker/src/ide-settings/IntelliJ-IDEA/Editor-Inspections-FreeMarker.xml
+ freemarker/src/ide-settings/IntelliJ-IDEA/Editor-Inspections-FreeMarker.xml
- Copy the copyright header comment from some of the java files, then
under "Editor" / "Copyrigth" / "Copyrigth Profiles" click "+", enter "ASL2" as name,
then pase the copyright header. Delete the `/*` and ` */` lines, and the ` *`
@@ -236,6 +236,6 @@ Last tested on IntelliJ IDEA Community 2017.1.5.
expected. To do that from IntelliJ, create a run configuration:
"Run" \ "Run Configurations..." \ "+" \ "Gradle" then:
- Set "Name" to `All tests` for example
- - Set "Gradle project" to the root project (`freemarker` aka. `incubator-freemarker`)
+ - Set "Gradle project" to the root project (`freemarker`)
- Set "Tasks" to `test`
- TODO Setting up the FindBugs plugin
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c5951c4..45be0ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,9 +18,9 @@
*/
// TODO: Versions should come form src/main/resource/o/a/f/c/version.properties
-ext.versionCanonical = "3.0.0-nightly-incubating"
+ext.versionCanonical = "3.0.0-nightly"
ext.versionForMaven = "3.0.0-SNAPSHOT"
-ext.versionForOSGi = "3.0.0.nightly-incubating"
+ext.versionForOSGi = "3.0.0.nightly"
ext.versionForMf = "2.97.0"
allprojects {
@@ -58,6 +58,7 @@ ext.bannedLibraries = [
repositories {
mavenLocal()
mavenCentral()
+ // You don't want to repos here usually, but to `subproject { ... repositories {...} ... }` below
}
configurations {
@@ -216,10 +217,13 @@ subprojects {
mavenLocal()
mavenCentral()
- // This is only needed temporarily (remove before first stable release):
+ // These are only needed temporarily (remove before first stable release):
maven {
url "https://repository.apache.org/content/repositories/snapshots"
}
+ maven {
+ url "https://repository.apache.org/content/repositories/staging"
+ }
}
// Dependencies used in all subprojects:
@@ -309,9 +313,9 @@ subprojects {
}
}
scm {
- connection "scm:git:https://git-wip-us.apache.org/repos/asf/incubator-freemarker.git"
- developerConnection "scm:git:https://git-wip-us.apache.org/repos/asf/incubator-freemarker.git"
- url "https://git-wip-us.apache.org/repos/asf?p=incubator-freemarker.git"
+ connection "scm:git:https://git-wip-us.apache.org/repos/asf/freemarker.git"
+ developerConnection "scm:git:https://git-wip-us.apache.org/repos/asf/freemarker.git"
+ url "https://git-wip-us.apache.org/repos/asf?p=freemarker.git"
if (versionForOSGi.contains('.stable')) {
tag "v${version}"
}
@@ -323,21 +327,21 @@ subprojects {
mailingLists {
mailingList {
name "FreeMarker developer list"
- post "dev@freemarker.incubator.apache.org"
- subscribe "dev-subscribe@freemarker.incubator.apache.org"
- unsubscribe "dev-unsubscribe@freemarker.incubator.apache.org"
- archive "http://mail-archives.apache.org/mod_mbox/incubator-freemarker-dev/"
+ post "dev@freemarker.apache.org"
+ subscribe "dev-subscribe@freemarker.apache.org"
+ unsubscribe "dev-unsubscribe@freemarker.apache.org"
+ archive "http://mail-archives.apache.org/mod_mbox/freemarker-dev/"
}
mailingList {
name "FreeMarker commit and Jira notifications list"
- post "notifications@freemarker.incubator.apache.org"
- subscribe "notifications-subscribe@freemarker.incubator.apache.org"
- unsubscribe "notifications-unsubscribe@freemarker.incubator.apache.org"
- archive "http://mail-archives.apache.org/mod_mbox/incubator-freemarker-notifications/"
+ post "notifications@freemarker.apache.org"
+ subscribe "notifications-subscribe@freemarker.apache.org"
+ unsubscribe "notifications-unsubscribe@freemarker.apache.org"
+ archive "http://mail-archives.apache.org/mod_mbox/freemarker-notifications/"
}
mailingList {
name "FreeMarker management private"
- post "private@freemarker.incubator.apache.org"
+ post "private@freemarker.apache.org"
}
}
}
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/freemarker-converter/build.gradle
----------------------------------------------------------------------
diff --git a/freemarker-converter/build.gradle b/freemarker-converter/build.gradle
index f8ee507..6726cf1 100644
--- a/freemarker-converter/build.gradle
+++ b/freemarker-converter/build.gradle
@@ -25,7 +25,7 @@ inAggregateJavadoc = false
dependencies {
compile project(":freemarker-core")
- compile "org.freemarker:freemarker-gae:2.3.28-incubating-SNAPSHOT"
+ compile "org.freemarker:freemarker-gae:2.3.28"
compile libraries.commonsCli
compile libraries.commonsLang
compile libraries.commonsIo
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/freemarker-core-test-java8/src/main/resources/META-INF/DISCLAIMER
----------------------------------------------------------------------
diff --git a/freemarker-core-test-java8/src/main/resources/META-INF/DISCLAIMER b/freemarker-core-test-java8/src/main/resources/META-INF/DISCLAIMER
deleted file mode 100644
index 569ba05..0000000
--- a/freemarker-core-test-java8/src/main/resources/META-INF/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache FreeMarker is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of
-all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized in
-a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the
-ASF.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/freemarker-core/src/main/resources/META-INF/DISCLAIMER
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/resources/META-INF/DISCLAIMER b/freemarker-core/src/main/resources/META-INF/DISCLAIMER
deleted file mode 100644
index 569ba05..0000000
--- a/freemarker-core/src/main/resources/META-INF/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache FreeMarker is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of
-all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized in
-a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the
-ASF.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/freemarker-manual/src/main/docgen/en_US/docgen.cjson
----------------------------------------------------------------------
diff --git a/freemarker-manual/src/main/docgen/en_US/docgen.cjson b/freemarker-manual/src/main/docgen/en_US/docgen.cjson
index 076e8f3..7020811 100644
--- a/freemarker-manual/src/main/docgen/en_US/docgen.cjson
+++ b/freemarker-manual/src/main/docgen/en_US/docgen.cjson
@@ -17,7 +17,7 @@
// specific language governing permissions and limitations
// under the License.
-deployUrl: "http://freemarker.org/docs/"
+deployUrl: "https://freemarker.apache.org/docs/"
onlineTrackerHTML: "docgen-misc/googleAnalytics.html"
searchKey: "003127866208504630097:arjqbv_znfw"
validation: {
@@ -49,24 +49,24 @@ seoMeta: {
}
logo: {
- href: "http://freemarker.org"
+ href: "https://freemarker.apache.org"
src: logo.png,
alt: "FreeMarker"
}
olinks: {
- homepage: "http://freemarker.org/"
+ homepage: "https://freemarker.apache.org"
api: "api/index.html"
// Homepage links:
- freemarkerdownload: "http://freemarker.org/freemarkerdownload.html"
- contribute: "http://freemarker.org/contribute.html"
- history: "http://freemarker.org/history.html"
- what-is-freemarker: "http://freemarker.org/"
- mailing-lists: "http://freemarker.org/mailing-lists.html"
+ freemarkerdownload: "https://freemarker.apache.org/freemarkerdownload.html"
+ contribute: "https://freemarker.apache.org/contribute.html"
+ history: "https://freemarker.apache.org/history.html"
+ what-is-freemarker: "https://freemarker.apache.org/"
+ mailing-lists: "https://freemarker.apache.org/mailing-lists.html"
// External URL-s:
- onlineTemplateTester: "http://freemarker-online.kenshoo.com/"
+ onlineTemplateTester: "http://try.freemarker.org/"
twitter: "https://twitter.com/freemarker"
sourceforgeProject: "https://sourceforge.net/projects/freemarker/"
githubProject: "https://github.com/freemarker/freemarker"
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/freemarker-servlet/src/main/resources/META-INF/DISCLAIMER
----------------------------------------------------------------------
diff --git a/freemarker-servlet/src/main/resources/META-INF/DISCLAIMER b/freemarker-servlet/src/main/resources/META-INF/DISCLAIMER
deleted file mode 100644
index 569ba05..0000000
--- a/freemarker-servlet/src/main/resources/META-INF/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache FreeMarker is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of
-all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized in
-a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the
-ASF.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/freemarker/blob/55557af2/src/dist/bin/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html
index a482423..1930cf3 100644
--- a/src/dist/bin/documentation/index.html
+++ b/src/dist/bin/documentation/index.html
@@ -60,8 +60,6 @@
<li><a href="_html/api/index.html">Java API</a></li>
</ul>
- <p><a href="http://freemarker.org/">Visit the FreeMarker home page</a> (help, editor plugins, latest downloads, etc.)</p>
-
- <p><i><b>Disclaimer:</b> Apache FreeMarker is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</i></p>
+ <p><a href="https://freemarker.apache.org/">Visit the FreeMarker home page</a> (help, editor plugins, latest downloads, etc.)</p>
</body>
</html>
\ No newline at end of file