You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/08 17:53:39 UTC
[1/3] incubator-netbeans git commit: [NETBEANS-54] Module Review
libs.freemarker
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 85cd0e995 -> c7feafa62
[NETBEANS-54] Module Review libs.freemarker
- Added maven coordinates to external/binaries_list for freemarker 2.3.19
- Added notice as required by freemarker license
- Added headers to two source files (FreemarkerEngine.java & FreemarkerFactory.java) and to one test file.
- All unit tests passing.
- Not adding license headers to the following test files (as some tests would fail):
- ./test/unit/data/golden/GeneratedMethodBody.java
- ./test/unit/data/golden/ClassWithoutReplacements.java
- ./test/unit/data/golden/GeneratedMethodBody2.java
- ./test/unit/data/golden/ForceNoReplacements.java
- ./test/unit/data/golden/SimpleReplacements.java
- ./test/unit/data/licenseheader.txt
- ./test/unit/data/templates/GeneratedMethodBody.java
- ./test/unit/data/templates/ClassWithoutReplacements.java
- ./test/unit/data/templates/SimpleReplacements.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/28d26c1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/28d26c1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/28d26c1a
Branch: refs/heads/master
Commit: 28d26c1a25b3a9163c177dbc3b62188ab41da38d
Parents: 85cd0e9
Author: Antonio Vieiro <an...@vieiro.net>
Authored: Sun Oct 8 08:33:35 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 19:44:36 2017 +0200
----------------------------------------------------------------------
libs.freemarker/external/binaries-list | 2 +-
.../external/freemarker-2.3.19-notice.txt | 2 +
.../libs/freemarker/FreemarkerEngine.java | 46 +++++++-------------
.../libs/freemarker/FreemarkerFactory.java | 46 +++++++-------------
.../org/netbeans/freemarker/templates/utf8.xml | 20 +++++++++
5 files changed, 53 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/28d26c1a/libs.freemarker/external/binaries-list
----------------------------------------------------------------------
diff --git a/libs.freemarker/external/binaries-list b/libs.freemarker/external/binaries-list
index de10122..7671051 100644
--- a/libs.freemarker/external/binaries-list
+++ b/libs.freemarker/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80 freemarker-2.3.19.jar
+A251045E5FADD02824D17F1AA8C412ACCF1AA1C9 org.freemarker:freemarker:2.3.19
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/28d26c1a/libs.freemarker/external/freemarker-2.3.19-notice.txt
----------------------------------------------------------------------
diff --git a/libs.freemarker/external/freemarker-2.3.19-notice.txt b/libs.freemarker/external/freemarker-2.3.19-notice.txt
new file mode 100644
index 0000000..5fa6447
--- /dev/null
+++ b/libs.freemarker/external/freemarker-2.3.19-notice.txt
@@ -0,0 +1,2 @@
+This product includes software developed by the Visigoth Software Society (http://www.visigoths.org/).
+
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/28d26c1a/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java
----------------------------------------------------------------------
diff --git a/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java b/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java
index a9a2512..472e593 100644
--- a/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java
+++ b/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java
@@ -1,37 +1,21 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * 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
*
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is scripting.dev.java.net. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc.
- *
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * 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.
*/
-
package org.netbeans.libs.freemarker;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/28d26c1a/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java
----------------------------------------------------------------------
diff --git a/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java b/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java
index e8e8038..c5ef57e 100644
--- a/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java
+++ b/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java
@@ -1,37 +1,21 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+/**
+ * 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
*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Contributor(s):
- *
- * The Original Software is scripting.dev.java.net. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc.
- *
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * 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.
*/
-
/*
* @author A. Sundararajan
*/
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/28d26c1a/libs.freemarker/test/unit/src/org/netbeans/freemarker/templates/utf8.xml
----------------------------------------------------------------------
diff --git a/libs.freemarker/test/unit/src/org/netbeans/freemarker/templates/utf8.xml b/libs.freemarker/test/unit/src/org/netbeans/freemarker/templates/utf8.xml
index 9ab4094..c854b5f 100644
--- a/libs.freemarker/test/unit/src/org/netbeans/freemarker/templates/utf8.xml
+++ b/libs.freemarker/test/unit/src/org/netbeans/freemarker/templates/utf8.xml
@@ -1,4 +1,24 @@
<?xml version="1.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.
+
+-->
<root>
Žluťoučký kůň skákal přes čtvero mezí.
</root>
[3/3] incubator-netbeans git commit: Merge branch 'pr/91'
Posted by ma...@apache.org.
Merge branch 'pr/91'
This closes #91
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c7feafa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c7feafa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c7feafa6
Branch: refs/heads/master
Commit: c7feafa6287a09cb9c726a3c010ed325245d7167
Parents: 85cd0e9 e016b53
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 19:53:13 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 19:53:13 2017 +0200
----------------------------------------------------------------------
libs.freemarker/external/binaries-list | 2 +-
.../external/freemarker-2.3.19-notice.txt | 2 +
.../libs/freemarker/FreemarkerEngine.java | 46 +++++++-------------
.../libs/freemarker/FreemarkerFactory.java | 46 +++++++-------------
.../org/netbeans/freemarker/templates/utf8.xml | 20 +++++++++
nbbuild/build.xml | 1 +
6 files changed, 54 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-netbeans git commit: [NETBEANS-54] Module review
libs.freemarker
Posted by ma...@apache.org.
[NETBEANS-54] Module review libs.freemarker
- added test-data to rat exclusion list
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/e016b53c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/e016b53c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/e016b53c
Branch: refs/heads/master
Commit: e016b53c2ee2d2dfa0b483c52fe52055c5448199
Parents: 28d26c1
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 19:50:27 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 19:50:27 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/e016b53c/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 63b34df..359e55d 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1976,6 +1976,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="editor.fold/test/unit/data/goldenfiles/hierarchy/update-hierarchy.folds" /> <!--test data-->
<exclude name="editor.fold/test/unit/data/hierarchy/update-hierarchy.folds" /> <!--test data-->
<exclude name="editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldContentReader.txt" /> <!--test data-->
+ <exclude name="libs.freemarker/test/unit/data/**" /> <!--test data-->
</fileset>
</rat:report>
</target>