incubator-freemarker git commit: (Added TODO to build.gradle)

[ddekany]

Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 d2d7d9842 -> efa000c9c


(Added TODO to build.gradle)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/efa000c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/efa000c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/efa000c9

Branch: refs/heads/3
Commit: efa000c9c3e8ccf46ca87a3df49c8155cc2c378c
Parents: d2d7d98
Author: ddekany 
Authored: Sat Dec 16 21:03:29 2017 +0100
Committer: ddekany 
Committed: Sat Dec 16 21:03:29 2017 +0100

--
 build.gradle | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/efa000c9/build.gradle
--
diff --git a/build.gradle b/build.gradle
index d8cbdd0..9cc3c6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -275,6 +275,7 @@ subprojects {
 archives jar
 archives sourcesJar
 archives javadocJar
+// TODO Archies must contain META-INF/{LICENSE,NOTICE,DISCLAIMER}; see 
in 2.3.x
 }
 
 // The identical parts of Maven "deployer" and "installer" configuration:

[jira] [Commented] (FREEMARKER-56) FM3 Gradle build TODO-s

[ASF GitHub Bot (JIRA)]

[ 
https://issues.apache.org/jira/browse/FREEMARKER-56?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16293928#comment-16293928
 ] 

ASF GitHub Bot commented on FREEMARKER-56:
--

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-freemarker/pull/40


> FM3 Gradle build TODO-s
> ---
>
> Key: FREEMARKER-56
> URL: https://issues.apache.org/jira/browse/FREEMARKER-56
> Project: Apache Freemarker
>  Issue Type: Task
>Reporter: Daniel Dekany
>
> There are various TODO comments in our FreeMarker 3 Gradle build scripts...



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[GitHub] incubator-freemarker pull request #40: FREEMARKER-56 publish source and Java...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-freemarker/pull/40


---

[3/3] incubator-freemarker git commit: Merged: FREEMARKER-56 publish source and JavaDoc JARs

[ddekany]

Merged: FREEMARKER-56 publish source and JavaDoc JARs

Merge commit 'refs/pull/40/head' of 
https://github.com/apache/incubator-freemarker into 3


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d2d7d984
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d2d7d984
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d2d7d984

Branch: refs/heads/3
Commit: d2d7d9842ce5a397de53c1505238db4193a84f4f
Parents: d4c7ab9 7620a24
Author: ddekany 
Authored: Sat Dec 16 20:51:28 2017 +0100
Committer: ddekany 
Committed: Sat Dec 16 20:58:47 2017 +0100

--
 build.gradle| 18 --
 freemarker-core-test-java8/build.gradle |  2 ++
 freemarker-core-test/build.gradle   |  2 ++
 freemarker-manual/build.gradle  |  2 ++
 4 files changed, 22 insertions(+), 2 deletions(-)
--

[1/3] incubator-freemarker git commit: FREEMARKER-56 publish source and JavaDoc JARs

[ddekany]

Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 55b567638 -> d2d7d9842


FREEMARKER-56 publish source and JavaDoc JARs


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/7620a249
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/7620a249
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/7620a249

Branch: refs/heads/3
Commit: 7620a24948de7438d71dd9123611e78875f45ac8
Parents: 55b5676
Author: george thomas 
Authored: Fri Dec 15 12:54:15 2017 -0500
Committer: george thomas 
Committed: Fri Dec 15 22:40:44 2017 -0500

--
 build.gradle| 18 --
 freemarker-core-test-java8/build.gradle |  2 ++
 freemarker-core-test/build.gradle   |  2 ++
 freemarker-manual/build.gradle  |  2 ++
 4 files changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7620a249/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 15e20be..d8cbdd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -261,6 +261,22 @@ subprojects {
 }
 }
 
+task sourcesJar(type: Jar) {
+from sourceSets.main.allSource
+classifier = 'sources'
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+from javadoc.destinationDir
+classifier = 'javadoc'
+}
+
+artifacts {
+archives jar
+archives sourcesJar
+archives javadocJar
+}
+
 // The identical parts of Maven "deployer" and "installer" configuration:
 def mavenCommons = { callerDelegate ->
 delegate = callerDelegate
@@ -315,7 +331,6 @@ subprojects {
 
 uploadArchives {
 repositories {
-// TODO We must deploy source and javadoc artifact as well; see 
old Ant build.xml
 mavenDeployer {
 mavenCommons(delegate)
 repository(
@@ -331,7 +346,6 @@ subprojects {
 }
 
 install {
-// TODO We must deploy source and javadoc artifact as well; see old 
Ant build.xml
 repositories {
 mavenInstaller {
 mavenCommons(delegate)

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7620a249/freemarker-core-test-java8/build.gradle
--
diff --git a/freemarker-core-test-java8/build.gradle 
b/freemarker-core-test-java8/build.gradle
index 49e2dfc..f919f6d 100644
--- a/freemarker-core-test-java8/build.gradle
+++ b/freemarker-core-test-java8/build.gradle
@@ -16,8 +16,10 @@ dependencies {
 
 // 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7620a249/freemarker-core-test/build.gradle
--
diff --git a/freemarker-core-test/build.gradle 
b/freemarker-core-test/build.gradle
index 0ce..10aec30 100644
--- a/freemarker-core-test/build.gradle
+++ b/freemarker-core-test/build.gradle
@@ -29,8 +29,10 @@ dependencies {
 
 // 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7620a249/freemarker-manual/build.gradle
--
diff --git a/freemarker-manual/build.gradle b/freemarker-manual/build.gradle
index 6a12983..5ea49d3 100644
--- a/freemarker-manual/build.gradle
+++ b/freemarker-manual/build.gradle
@@ -17,8 +17,10 @@ dependencies {
 
 // 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

[2/3] incubator-freemarker git commit: (Change log update)

[ddekany]

(Change log update)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d4c7ab9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d4c7ab9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d4c7ab9f

Branch: refs/heads/3
Commit: d4c7ab9f802824cc51b0f90e60a950271b22e6b7
Parents: 55b5676
Author: ddekany 
Authored: Sat Dec 16 20:16:07 2017 +0100
Committer: ddekany 
Committed: Sat Dec 16 20:16:07 2017 +0100

--
 FM3-CHANGE-LOG.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d4c7ab9f/FM3-CHANGE-LOG.txt
--
diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt
index ec78803..2be3d10 100644
--- a/FM3-CHANGE-LOG.txt
+++ b/FM3-CHANGE-LOG.txt
@@ -525,7 +525,8 @@ models by default like FreemarkerServlet does.
 Core / Miscellaneous
 
 
-- Minimum Java version increased to 7, but without try-with-resource as that's 
unavailable before Android 4.4 KitKat.
+- Minimum Java version increased to 7 (including try-with-resources, as 
Android Studio 3.0 supports it on all
+  Android API levels).
 - 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).