freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [3/3] incubator-freemarker-docgen git commit: Some license related clarifications
Date Thu, 01 Feb 2018 10:21:00 GMT
Some license related clarifications


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

Branch: refs/heads/master
Commit: fcd3269d2a3d07033389db8ea9ac5de483f21794
Parents: 1fe002a
Author: ddekany <ddekany@apache.org>
Authored: Thu Feb 1 11:20:48 2018 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Thu Feb 1 11:20:48 2018 +0100

----------------------------------------------------------------------
 .travis.yml                                     |   17 +
 LICENSE                                         |   34 +-
 build.properties.sample                         |   17 +
 build.xml                                       |   41 +
 checkstyle.xml                                  |   18 +
 gulpfile.js                                     |   19 +
 ivy.xml                                         |   24 +
 ivysettings.xml                                 |   18 +
 package-lock.json                               | 6777 ++++++++++++++++++
 src/main/org/freemarker/docgen/Transform.java   |    4 -
 .../docgen/statics/img/callouts/1.gif           |  Bin 968 -> 0 bytes
 .../docgen/statics/img/callouts/10.gif          |  Bin 968 -> 0 bytes
 .../docgen/statics/img/callouts/11.gif          |  Bin 244 -> 0 bytes
 .../docgen/statics/img/callouts/12.gif          |  Bin 244 -> 0 bytes
 .../docgen/statics/img/callouts/13.gif          |  Bin 244 -> 0 bytes
 .../docgen/statics/img/callouts/14.gif          |  Bin 244 -> 0 bytes
 .../docgen/statics/img/callouts/15.gif          |  Bin 244 -> 0 bytes
 .../docgen/statics/img/callouts/2.gif           |  Bin 968 -> 0 bytes
 .../docgen/statics/img/callouts/3.gif           |  Bin 968 -> 0 bytes
 .../docgen/statics/img/callouts/4.gif           |  Bin 968 -> 0 bytes
 .../docgen/statics/img/callouts/5.gif           |  Bin 968 -> 0 bytes
 .../docgen/statics/img/callouts/6.gif           |  Bin 968 -> 0 bytes
 .../docgen/statics/img/callouts/7.gif           |  Bin 968 -> 0 bytes
 .../docgen/statics/img/callouts/8.gif           |  Bin 968 -> 0 bytes
 .../docgen/statics/img/callouts/9.gif           |  Bin 968 -> 0 bytes
 src/test/1/docgen.cjson                         |   19 +-
 src/test/2/docgen.cjson                         |   18 +
 src/test/3/docgen.cjson                         |   17 +
 src/test/4/docgen.cjson                         |   17 +
 src/test/5/docgen.cjson                         |   17 +
 src/test/6/docgen.cjson                         |   18 +-
 src/test/7/docgen.cjson                         |   17 +
 src/test/8/docgen.cjson                         |   17 +
 src/test/9/docgen.cjson                         |   19 +-
 test.xml                                        |   18 +
 35 files changed, 7136 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index ea62c86..2bb7c54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,20 @@
+# 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.
+
 language: java
 before_install: ant download-ivy
 install: ant all

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 2e99cb8..e014df3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -202,11 +202,34 @@
    limitations under the License.
 
 ==============================================================================
-END LICENSE
 
+The Apache FreeMarker (incubating) source code contains the following
+files without copyright header for technical reasons, which were created
+at the Apache FreeMarker (incubating) project, and hence are covered by
+the same license as the other source files of it:
+
+    package.json
+    package-lock.json
+    src/main/org/freemarker/docgen/statics/fonts/selection.json
+    src/main/org/freemarker/docgen/statics/img/patterned-bg.png
+    src/main/org/freemarker/docgen/statics/img/xxe.gif
+    src/main/org/freemarker/docgen/statics/img/xxe.png
+    src/test/1/bat.jpg
+    src/test/1/figures/model2sketch.png
+    src/test/1/figures/overview.png
+    src/test/1/figures/tree.png
+    src/test/1/logo.png
+    src/test/2/logo.png
+    src/test/2/test.gif
+    src/test/3/logo.png
+    src/test/4/logo.png
+    src/test/5/logo.png
+    src/test/6/logo.png
+    src/test/7/logo.png
+    src/test/8/logo.png
+    src/test/9/logo.png
 
-Docgen subcomponents with different copyright owners
-----------------------------------------------------
+==============================================================================
 
 The "icomoon" font files (icomoon.eot, icomoon.svg, icomoon.ttf, and
 icomoon.woff) under the "documentation" directory of the FreeMarker
@@ -228,3 +251,8 @@ the binary, freemarker.jar. The fonts are:
   (http://google.github.io/material-design-icons/), licensed under
   Creative Common Attribution 4.0 International License (CC-BY 4.0)
   (https://creativecommons.org/licenses/by/4.0/).
+    
+==============================================================================
+
+See the license of the src/main/org/freemarker/docgen/schema/docbook.rng file
+in the following file: LICENSE-DOCBOOK-RNG

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/build.properties.sample
----------------------------------------------------------------------
diff --git a/build.properties.sample b/build.properties.sample
index 8741114..a78d741 100644
--- a/build.properties.sample
+++ b/build.properties.sample
@@ -1,3 +1,20 @@
+# 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.
+
 # Should point to the rt.jar of Java 8.
 # You may comment this property out, but for releases it should be set,
 # so Java 8 incompatibilities will cause compilation-time errors.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7083dad..053880f 100644
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,28 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  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.
+-->
 
 <project basedir="." default="jar" name="docgen"
     xmlns:ivy="antlib:org.apache.ivy.ant"
     xmlns:docgen="http://freemarker.org/docgen"
     xmlns:u="http://freemarker.org/ant-utils"
+    xmlns:rat="antlib:org.apache.rat.anttasks"
 >
 
   <!-- ================================================================== -->
@@ -415,4 +434,26 @@
     </ivy:publish>
   </target>
 
+  <target name="rat" description="Generates Apache RAT report">
+    <ivy:cachepath conf="rat" pathid="ivy.dep" />
+    <taskdef
+      uri="antlib:org.apache.rat.anttasks"
+      resource="org/apache/rat/anttasks/antlib.xml"
+      classpathref="ivy.dep"
+    />  
+    
+    <rat:report reportFile="build/rat-report.txt">
+      <fileset dir="">
+        <exclude name="build/**"/>
+        <exclude name="ide-dependencies/**"/>
+        <exclude name="node_modules/**"/>
+        <exclude name=".*"/>
+        <exclude name=".*/**"/>
+      </fileset>
+    </rat:report>
+    <echo level="info"><!--
+    -->Rat reports were written into build/rat-report.txt<!--
+    --></echo>
+  </target>
+  
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/checkstyle.xml
----------------------------------------------------------------------
diff --git a/checkstyle.xml b/checkstyle.xml
index 9ad09d2..3f6d38b 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  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.
+-->
+<!--
     This configuration file was written by the eclipse-cs plugin configuration editor
 -->
 <!--

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 405c6be..1def2e2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,5 +1,24 @@
 'use strict';
 
+/*
+ * 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.
+ */
+
 var path = require('path');
 var fs = require('fs');
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 5d35b27..64b08a0 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -1,8 +1,30 @@
 <!--
+  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.
+-->
+<!--
   AFTER CHANGING THIS FILE don't forget to issue: ant update-deps
 -->
 <ivy-module version="2.0">
     <info organisation="org.freemarker" module="docgen" />
+    <configurations>
+      <conf name="default" />
+      <conf name="rat" description="for generating the Rat report" />
+    </configurations>
     <publications>
         <artifact name="docgen" type="jar" ext="jar"/>
     </publications>
@@ -16,5 +38,7 @@
             <exclude org="xml-apis" name="xml-apis" />
         </dependency>
         <dependency org="org.apache.ant" name="ant" rev="1.9.3" conf="default->default"
/>
+        
+        <dependency org="org.apache.rat" name="apache-rat-tasks" rev="0.11" conf="rat->default"
/>
     </dependencies>
 </ivy-module>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/fcd3269d/ivysettings.xml
----------------------------------------------------------------------
diff --git a/ivysettings.xml b/ivysettings.xml
index 0eda602..eafd89f 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -1,3 +1,21 @@
+<!--
+  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.
+-->
 <ivysettings>
   <!-- Prevent IvyDE error: -->
   <property name="server.ivy.repo.root" value="${ivy.project.dir}/NOT_SET" override="false"
/>


Mime
View raw message