This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch jdk-javac
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit ba0de5d9c8f43ede6549460450386def13eb9a01
Author: Jan Lahoda <jlah...@netbeans.org>
AuthorDate: Sun Dec 17 07:34:48 2017 +0100
Various improvements.
---
.../modules/java/source/NoJavacHelper.java | 51 +++++++---------------
java.source.nbjavac/build.xml | 20 +++++++++
java.source.nbjavac/nbproject/project.properties | 17 ++++++++
java.source.nbjavac/nbproject/project.xml | 20 +++++++++
.../modules/java/source/nbjavac/Bundle.properties | 17 ++++++++
jshell.support/nbproject/project.properties | 1 -
libs.javacapi/external/binaries-list | 2 +-
...-api-license.txt => nb-javac-9-api-license.txt} | 9 ++--
libs.javacapi/nbproject/project.properties | 1 -
libs.javacapi/nbproject/project.xml | 8 ++--
libs.javacimpl/external/binaries-list | 2 +-
...mpl-license.txt => nb-javac-9-impl-license.txt} | 9 ++--
libs.javacimpl/nbproject/project.xml | 32 ++------------
nbbuild/build.xml | 3 +-
nbbuild/external/binaries-list | 2 +-
.../external/langtools-9-license.txt | 13 +++---
16 files changed, 118 insertions(+), 89 deletions(-)
diff --git
a/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
b/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
index 27c612e..d60f6a8 100644
--- a/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
+++ b/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
@@ -1,41 +1,20 @@
- /*
- * 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 (c) 2017 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]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
+ * 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.modules.java.source;
diff --git a/java.source.nbjavac/build.xml b/java.source.nbjavac/build.xml
index 28b8f66..da36c62 100644
--- a/java.source.nbjavac/build.xml
+++ b/java.source.nbjavac/build.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<project basedir="." default="netbeans" name="java.source.nbjavac">
<description>Builds, tests, and runs the project
org.netbeans.modules.java.source.nbjavac</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/java.source.nbjavac/nbproject/project.properties
b/java.source.nbjavac/nbproject/project.properties
index 8942dda..b688af1 100644
--- a/java.source.nbjavac/nbproject/project.properties
+++ b/java.source.nbjavac/nbproject/project.properties
@@ -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.
+
is.eager=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java.source.nbjavac/nbproject/project.xml
b/java.source.nbjavac/nbproject/project.xml
index 75f5402..5adc7ac 100644
--- a/java.source.nbjavac/nbproject/project.xml
+++ b/java.source.nbjavac/nbproject/project.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<project xmlns="http://www.netbeans.org/ns/project/1";>
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git
a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/Bundle.properties
b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/Bundle.properties
index ae5ccca..01c54b7 100644
---
a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/Bundle.properties
+++
b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/Bundle.properties
@@ -1 +1,18 @@
+# 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.
+
OpenIDE-Module-Name=Java Source nb-javac Bridge
diff --git a/jshell.support/nbproject/project.properties
b/jshell.support/nbproject/project.properties
index 89fa9ac..d97a998 100644
--- a/jshell.support/nbproject/project.properties
+++ b/jshell.support/nbproject/project.properties
@@ -19,6 +19,5 @@ javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
spec.version.base=1.0
cp.extra=${tools.jar}
-bootclasspath.prepend=${nb_all}/libs.javacapi/external/nb-javac-api.jar${path.separator}${nb_all}/libs.javacimpl/external/nb-javac-impl.jar
is.eager=true
requires.nb.javac=true
diff --git a/libs.javacapi/external/binaries-list
b/libs.javacapi/external/binaries-list
index 3f4d181..b64ae08 100644
--- a/libs.javacapi/external/binaries-list
+++ b/libs.javacapi/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.
-184D809687180CF321C724B8E8EA1C3945E8C208 nb-javac-api.jar
+184D809687180CF321C724B8E8EA1C3945E8C208 nb-javac-9-api.jar
diff --git a/libs.javacapi/external/nb-javac-api-license.txt
b/libs.javacapi/external/nb-javac-9-api-license.txt
similarity index 99%
copy from libs.javacapi/external/nb-javac-api-license.txt
copy to libs.javacapi/external/nb-javac-9-api-license.txt
index a41f309..051f9df 100644
--- a/libs.javacapi/external/nb-javac-api-license.txt
+++ b/libs.javacapi/external/nb-javac-9-api-license.txt
@@ -1,10 +1,11 @@
-Version: nb-7.2
Name: Javac Compiler API
-License: GPL-2-CP
Description: Javac Compiler API
-OSR: 6273
-Origin: Oracle (http://hg.openjdk.java.net/)
+Version: 9
+License: GPL-2-CP
+Origin: OpenJDK (http://hg.openjdk.java.net/)
Source: http://hg.netbeans.org/main/nb-javac/
+Type: compile-time,optional
+Comment: Used at design time to compile against; optional at runtime.
The GNU General Public License (GPL)
Version 2, June 1991
diff --git a/libs.javacapi/nbproject/project.properties
b/libs.javacapi/nbproject/project.properties
index 37020c4..bc0609b 100644
--- a/libs.javacapi/nbproject/project.properties
+++ b/libs.javacapi/nbproject/project.properties
@@ -22,6 +22,5 @@ javadoc.title=Javac API
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk
spec.version.base=8.22.0
-#release.external/nb-javac-api.jar=modules/ext/nb-javac-api.jar
javadoc.arch=${basedir}/arch.xml
module.javadoc.packages=com.sun.source.tree,com.sun.source.util
diff --git a/libs.javacapi/nbproject/project.xml
b/libs.javacapi/nbproject/project.xml
index e068833..1ac7783 100644
--- a/libs.javacapi/nbproject/project.xml
+++ b/libs.javacapi/nbproject/project.xml
@@ -39,10 +39,10 @@
<package>javax.lang.model.util</package>
<package>javax.tools</package>
</public-packages>
-<!-- <class-path-extension>
-
<runtime-relative-path>ext/nb-javac-api.jar</runtime-relative-path>
- <binary-origin>external/nb-javac-api.jar</binary-origin>
- </class-path-extension>-->
+ <class-path-extension>
+ <runtime-relative-path />
+ <binary-origin>external/nb-javac-9-api.jar</binary-origin>
+ </class-path-extension>
</data>
</configuration>
</project>
diff --git a/libs.javacimpl/external/binaries-list
b/libs.javacimpl/external/binaries-list
index e835c03..dfc235c 100644
--- a/libs.javacimpl/external/binaries-list
+++ b/libs.javacimpl/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.
-EA8670918AF969E28B53ABA8574A661BA36A402A nb-javac-impl.jar
+EA8670918AF969E28B53ABA8574A661BA36A402A nb-javac-9-impl.jar
diff --git a/libs.javacimpl/external/nb-javac-impl-license.txt
b/libs.javacimpl/external/nb-javac-9-impl-license.txt
similarity index 99%
rename from libs.javacimpl/external/nb-javac-impl-license.txt
rename to libs.javacimpl/external/nb-javac-9-impl-license.txt
index 7e128d7..1bc66db 100644
--- a/libs.javacimpl/external/nb-javac-impl-license.txt
+++ b/libs.javacimpl/external/nb-javac-9-impl-license.txt
@@ -1,10 +1,11 @@
-Version: nb-7.2
Name: Javac Compiler Implementation
-License: GPL-2-CP
Description: Javac Compiler Implementation
-OSR: 6273
-Origin: Oracle (http://hg.openjdk.java.net/)
+Version: 9
+License: GPL-2-CP
+Origin: OpenJDK (http://hg.openjdk.java.net/)
Source: http://hg.netbeans.org/main/nb-javac/
+Type: compile-time,optional
+Comment: Used at compile and design time to compile against; optional at
runtime.
The GNU General Public License (GPL)
Version 2, June 1991
diff --git a/libs.javacimpl/nbproject/project.xml
b/libs.javacimpl/nbproject/project.xml
index ff0f1ba..b018ea3 100644
--- a/libs.javacimpl/nbproject/project.xml
+++ b/libs.javacimpl/nbproject/project.xml
@@ -34,35 +34,11 @@
</run-dependency>
</dependency>
</module-dependencies>
-<!-- <friend-packages>
- <friend>org.netbeans.modules.jackpot.rules</friend>
- <friend>org.netbeans.modules.java.hints</friend>
- <friend>org.netbeans.modules.java.source</friend>
- <friend>org.netbeans.modules.javadoc</friend>
- <friend>org.netbeans.modules.java.module.graph</friend>
- <friend>org.netbeans.lib.nbjshell</friend>
- <friend>org.netbeans.libs.jshell</friend>
- <friend>org.netbeans.libs.jshell.compile</friend>
- <friend>org.netbeans.modules.jdk.jshell</friend>
- <friend>org.netbeans.modules.jshell.support</friend>
- <package>com.sun.tools.javac</package>
- <package>com.sun.tools.javac.api</package>
- <package>com.sun.tools.javac.code</package>
- <package>com.sun.tools.javac.comp</package>
- <package>com.sun.tools.javac.jvm</package>
- <package>com.sun.tools.javac.main</package>
- <package>com.sun.tools.javac.model</package>
- <package>com.sun.tools.javac.parser</package>
- <package>com.sun.tools.javac.processing</package>
- <package>com.sun.tools.javac.tree</package>
- <package>com.sun.tools.javac.util</package>
- <package>com.sun.tools.javadoc</package>
- </friend-packages>-->
<public-packages/>
-<!-- <class-path-extension>
-
<runtime-relative-path>ext/nb-javac-impl.jar</runtime-relative-path>
- <binary-origin>external/nb-javac-impl.jar</binary-origin>
- </class-path-extension>-->
+ <class-path-extension>
+ <runtime-relative-path />
+ <binary-origin>external/nb-javac-9-impl.jar</binary-origin>
+ </class-path-extension>
</data>
</configuration>
</project>
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index b444e31..cb7eb5f 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -137,8 +137,7 @@
<target name="prepare-vanilla-javac" depends="-check-vanilla-javac"
unless="vanilla.javac.exists">
<delete dir="${nb_all}/nbbuild/build/langtools" />
<mkdir dir="${nb_all}/nbbuild/build/langtools" />
- <get src="http://hg.openjdk.java.net/jdk9/jdk9/langtools/archive/tip.zip";
dest="${nb_all}/nbbuild/build/langtools.zip" skipexisting="true"/>
- <unzip src="${nb_all}/nbbuild/build/langtools.zip"
dest="${nb_all}/nbbuild/build/langtools">
+ <unzip src="${nb_all}/nbbuild/external/langtools-9.zip"
dest="${nb_all}/nbbuild/build/langtools">
<cutdirsmapper dirs="1"/>
</unzip>
<ant antfile="${nb_all}/nbbuild/build/langtools/make/build.xml"
dir="${nb_all}/nbbuild/build/langtools/" target="generate-sources">
diff --git a/nbbuild/external/binaries-list b/nbbuild/external/binaries-list
index 3a0989f..0bdc516 100644
--- a/nbbuild/external/binaries-list
+++ b/nbbuild/external/binaries-list
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
A7674A6D78B7FEA58AF76B357DAE6EA5E3FDFBE9 apitest.jar
-071355012BD9E174619F838E72F1869277E24B69 nb-javac-impl.jar
16398550402B27F81CD0D508CEF54B3E47A4A6DA org.apache.rat:apache-rat:0.12
+AB396EE119BFAD809CC9F09950CC22E2BCE2FE35 langtools-9.zip
diff --git a/libs.javacapi/external/nb-javac-api-license.txt
b/nbbuild/external/langtools-9-license.txt
similarity index 98%
rename from libs.javacapi/external/nb-javac-api-license.txt
rename to nbbuild/external/langtools-9-license.txt
index a41f309..d28fbb2 100644
--- a/libs.javacapi/external/nb-javac-api-license.txt
+++ b/nbbuild/external/langtools-9-license.txt
@@ -1,10 +1,11 @@
-Version: nb-7.2
-Name: Javac Compiler API
+Name: Javac Compiler
+Description: Javac Compiler
+Version: 9
License: GPL-2-CP
-Description: Javac Compiler API
-OSR: 6273
-Origin: Oracle (http://hg.openjdk.java.net/)
-Source: http://hg.netbeans.org/main/nb-javac/
+Origin: OpenJDK (http://hg.openjdk.java.net/)
+Source: http://hg.openjdk.java.net/jdk9/jdk9/langtools/archive/tip.zip
+Type: compile-time
+Comment: Used at compile to compile code that runs either against JDK 9+ or
(optional) nb-javac library.
The GNU General Public License (GPL)
Version 2, June 1991
--
To stop receiving notification emails like this one, please contact
"comm...@netbeans.apache.org" <comm...@netbeans.apache.org>.
