freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: Seems that most projects don't lists images and such that are created in the project, so let's not go overboard.
Date Fri, 09 Feb 2018 13:28:24 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 607c42732 -> 5065cfe86


Seems that most projects don't lists images and such that are created in the project, so let's
not go overboard.


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

Branch: refs/heads/2.3-gae
Commit: 5065cfe863a1eeab4fa96320e31c2c353d6dea40
Parents: 607c427
Author: ddekany <ddekany@apache.org>
Authored: Fri Feb 9 14:28:11 2018 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Fri Feb 9 14:28:11 2018 +0100

----------------------------------------------------------------------
 LICENSE      | 33 ---------------------------------
 rat-excludes | 10 +++++++---
 2 files changed, 7 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5065cfe8/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 5b74a8a..d645695 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,36 +200,3 @@
    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.
-
-=========================================================================
-
-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:
-
-    src/main/misc/overloadedNumberRules/prices.ods
-    src/manual/en_US/docgen-originals/figures/overview.odg
-    src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png
-    src/manual/en_US/docgen-originals/figures/tree_with_alpha.png
-    src/manual/en_US/favicon.png
-    src/manual/en_US/figures/model2sketch.png
-    src/manual/en_US/figures/overview.png
-    src/manual/en_US/figures/tree.png
-    src/manual/en_US/logo.png
-    src/manual/zh_CN/favicon.png
-    src/manual/zh_CN/figures/model2sketch.png
-    src/manual/zh_CN/figures/overview.png
-    src/manual/zh_CN/figures/tree.png
-    src/manual/zh_CN/logo.png
-    
-=========================================================================
-
-The Apache FreeMarker (incubating) source code contains the following
-binaries, which were created at the Apache Incubator project, and hence
-are covered by the same license as Apache FreeMarker (incubating):
-    
-    src/manual/en_US/apache-incubator.png
-    src/manual/zh_CN/apache-incubator.png
-
-=========================================================================

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5065cfe8/rat-excludes
----------------------------------------------------------------------
diff --git a/rat-excludes b/rat-excludes
index adcc8fa..cdc8ffc 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -21,11 +21,10 @@
 # Generated files basically; see details in the files:
 src/manual/en_US/docgen-misc/googleAnalytics.html
 src/manual/zh_CN/docgen-misc/googleAnalytics.html
-# Binaries/archives covered in LICENSE:
+
+# Binaries/archives created in the FreeMarker project:
 src/main/misc/overloadedNumberRules/prices.ods
 src/manual/en_US/docgen-originals/figures/overview.odg
-src/manual/en_US/apache-incubator.png
-src/manual/zh_CN/apache-incubator.png
 src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png
 src/manual/en_US/docgen-originals/figures/tree_with_alpha.png
 src/manual/en_US/favicon.png
@@ -38,6 +37,11 @@ src/manual/zh_CN/figures/model2sketch.png
 src/manual/zh_CN/figures/overview.png
 src/manual/zh_CN/figures/tree.png
 src/manual/zh_CN/logo.png
+
+# Binaries/archives created in the Incubatir project:
+src/manual/en_US/apache-incubator.png
+src/manual/zh_CN/apache-incubator.png
+
 # Rat thinks it's a binary, but it's UTF-16 text:
 src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
 


Mime
View raw message