Up to date with master

enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java

@@ -844,7 +844,7 @@ static private void addSubprojects( Project project, List<Project> result ) {
             return;
         }
 
-        for( Iterator/*<Project>*/ it = spp.getSubprojects().iterator(); it.hasNext(); ) {
+        for( Iterator<? extends Project> it = spp.getSubprojects().iterator(); it.hasNext(); ) {
             Project sp = (Project) it.next();
             if (ProjectUtils.hasSubprojectCycles(project, sp)) {
                 Logger.getLogger("global").log(Level.WARNING, "There would be cyclic " + // NOI18N

enterprise/j2ee.genericserver/nbproject/project.properties

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 javac.compilerargs=-Xlint:unchecked
-javac.source=1.6
+javac.source=1.8

enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java

@@ -123,7 +123,8 @@ public boolean isAddBeanToConfig() {
         }
         return component.isAddBeanToConfig();
     }
-    private final Set/*<ChangeListener>*/ listeners = new HashSet(1);
+
+    private final Set<ChangeListener> listeners = new HashSet<>(1);
 
     @Override
     public final void addChangeListener(ChangeListener l) {

enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientSetupPanel.java

@@ -72,7 +72,7 @@ public boolean isValid() {
         return component.valid(wizardDescriptor);
     }
 
-    private final Set/*<ChangeListener>*/ listeners = new HashSet(1);
+    private final Set<ChangeListener> listeners = new HashSet<>(1);
 
     public final void addChangeListener(ChangeListener l) {
         synchronized (listeners) {

enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/TemplateClientPanelVisual.java

@@ -75,7 +75,7 @@ public class TemplateClientPanelVisual extends javax.swing.JPanel implements Hel
 
     private WizardDescriptor wizardDescriptor;
 
-    private final Set/*<ChangeListener>*/ listeners = new HashSet(1);
+    private final Set<ChangeListener> listeners = new HashSet<>(1);
 
     private final static String VALUE_NAME = "name";    //NOI18N
 

ide/libs.git/src/org/netbeans/libs/git/jgit/commands/TransportCommand.java

@@ -285,5 +285,10 @@ public long getCurrentTime () {
         public int getTimezone (long l) {
             return instance.getTimezone(l);
         }
+
+        @Override
+        public FileBasedConfig openJGitConfig(Config config, FS fs) {
+            return instance.openJGitConfig(config, fs);
+        }
     }
 }

ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/ConnectionTest.java

@@ -445,5 +445,10 @@ public long getCurrentTime () {
         public int getTimezone (long l) {
             return instance.getTimezone(l);
         }
+
+        @Override
+        public FileBasedConfig openJGitConfig(Config config, FS fs) {
+            return instance.openJGitConfig(config, fs);
+        }
     }
 }

ide/libs.jaxb/external/binaries-list

@@ -14,7 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-387BE740EAEF52B3F6E6EE2F140757E7632584CE com.sun.xml.bind:jaxb-impl:2.2.5-2
-F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3 com.sun.xml.bind:jaxb1-impl:2.2.5-2
-C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7 com.sun.xml.bind:jaxb-xjc:2.2.5-2
-DEA09C627DA5AA8FB0E6B1E39F85B2AE6AE9C3E7 javax.xml.bind:jaxb-api:2.2.5:javadoc
+3758E8C1664979749E647A9CA8C7EA1CD83C9B1E com.sun.xml.bind:jaxb-impl:2.3.3
+77E5784F53E865904BF91CFCD72CFC0AFD070486 com.sun.xml.bind:jaxb-xjc:2.3.3
+5685A1E75F9135DCC71E73A690B378E90FCD3B53 jakarta.xml.bind:jakarta.xml.bind-api:2.3.3:javadoc

ide/libs.jaxb/external/jakarta.xml.bind-api-2.3.3-javadoc-license.txt

@@ -0,0 +1,36 @@
+Name: JAXB
+Description: Jakarta XML Binding API
+Version: 2.3.3
+Origin: Eclipse Foundation
+URL: https://projects.eclipse.org/projects/ee4j.jaxb-impl
+License: EDL-1.0
+Files: jakarta.xml.bind-api-2.3.3-javadoc.jar
+
+Eclipse Distribution License - v 1.0
+
+Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the Eclipse Foundation, Inc. nor the names of its
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.