apache · matthiasblaesing · Jun 20, 2026 · Jun 23, 2026 · Jun 20, 2026 · Jun 20, 2026
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1117,19 +1117,6 @@ jobs:
       - name: platform/openide.util.ui
         run: ant $OPTS -f platform/openide.util.ui test
 
-      # isolation required by netbinox tests
-      - name: isolate platform build
-        run: |
-          cp -r platform/ _platform/ && cp -r harness/ _harness/ && cp nbbuild/build/nbantext.jar .
-          cp -r nbbuild/netbeans/platform/ _nb_platform/ && cp -r nbbuild/netbeans/harness/ _nb_harness/
-          ant $OPTS -quiet clean && rm -Rf platform/ && rm -Rf harness/
-          mkdir nbbuild/build && mkdir nbbuild/netbeans
-          mv _platform/ platform/ && mv _harness/ harness/ && mv nbantext.jar nbbuild/build/
-          mv _nb_platform/ nbbuild/netbeans/platform/ && mv _nb_harness/ nbbuild/netbeans/harness/
-
-      - name: platform/netbinox
-        run: ant $OPTS -f platform/netbinox test -Dtest.config=stableBTD
-
       - name: Create Test Summary
         uses: test-summary/action@37b508cfee6d4d080eedd00b5bb240a6a784a6a5 # v2.6
         if: failure()

diff --git a/platform/netbinox/build.xml → contrib/netbinox/build.xml b/platform/netbinox/build.xml → contrib/netbinox/build.xml
diff --git a/...rm/netbinox/external/M20140115-0800.patch → ...ib/netbinox/external/M20140115-0800.patch b/...rm/netbinox/external/M20140115-0800.patch → ...ib/netbinox/external/M20140115-0800.patch
diff --git a/platform/netbinox/external/binaries-list → contrib/netbinox/external/binaries-list b/platform/netbinox/external/binaries-list → contrib/netbinox/external/binaries-list
diff --git a/...pse.osgi_3.9.1.v20140110-1610-license.txt → ...pse.osgi_3.9.1.v20140110-1610-license.txt b/...pse.osgi_3.9.1.v20140110-1610-license.txt → ...pse.osgi_3.9.1.v20140110-1610-license.txt
diff --git a/...form/netbinox/external/rebuild-equinox.sh → contrib/netbinox/external/rebuild-equinox.sh b/...form/netbinox/external/rebuild-equinox.sh → contrib/netbinox/external/rebuild-equinox.sh
diff --git a/platform/netbinox/manifest.mf → contrib/netbinox/manifest.mf b/platform/netbinox/manifest.mf → contrib/netbinox/manifest.mf
diff --git a/...project/org-netbeans-modules-netbinox.sig → ...project/org-netbeans-modules-netbinox.sig b/...project/org-netbeans-modules-netbinox.sig → ...project/org-netbeans-modules-netbinox.sig
diff --git a/...orm/netbinox/nbproject/project.properties → ...rib/netbinox/nbproject/project.properties b/...orm/netbinox/nbproject/project.properties → ...rib/netbinox/nbproject/project.properties
diff --git a/platform/netbinox/nbproject/project.xml → contrib/netbinox/nbproject/project.xml b/platform/netbinox/nbproject/project.xml → contrib/netbinox/nbproject/project.xml
diff --git a/...tbeans/modules/netbinox/Bundle.properties → ...tbeans/modules/netbinox/Bundle.properties b/...tbeans/modules/netbinox/Bundle.properties → ...tbeans/modules/netbinox/Bundle.properties
diff --git a/...ans/modules/netbinox/EmptyBundleFile.java → ...ans/modules/netbinox/EmptyBundleFile.java b/...ans/modules/netbinox/EmptyBundleFile.java → ...ans/modules/netbinox/EmptyBundleFile.java
diff --git a/...beans/modules/netbinox/JarBundleFile.java → ...beans/modules/netbinox/JarBundleFile.java b/...beans/modules/netbinox/JarBundleFile.java → ...beans/modules/netbinox/JarBundleFile.java
diff --git a/...etbeans/modules/netbinox/ModuleEntry.java → ...etbeans/modules/netbinox/ModuleEntry.java b/...etbeans/modules/netbinox/ModuleEntry.java → ...etbeans/modules/netbinox/ModuleEntry.java
diff --git a/...g/netbeans/modules/netbinox/Netbinox.java → ...g/netbeans/modules/netbinox/Netbinox.java b/...g/netbeans/modules/netbinox/Netbinox.java → ...g/netbeans/modules/netbinox/Netbinox.java
diff --git a/...ans/modules/netbinox/NetbinoxFactory.java → ...ans/modules/netbinox/NetbinoxFactory.java b/...ans/modules/netbinox/NetbinoxFactory.java → ...ans/modules/netbinox/NetbinoxFactory.java
diff --git a/...beans/modules/netbinox/NetbinoxHooks.java → ...beans/modules/netbinox/NetbinoxHooks.java b/...beans/modules/netbinox/NetbinoxHooks.java → ...beans/modules/netbinox/NetbinoxHooks.java
diff --git a/...eans/modules/netbinox/NetbinoxLoader.java → ...eans/modules/netbinox/NetbinoxLoader.java b/...eans/modules/netbinox/NetbinoxLoader.java → ...eans/modules/netbinox/NetbinoxLoader.java
diff --git a/...s/modules/netbinox/NetigsoBaseLoader.java → ...s/modules/netbinox/NetigsoBaseLoader.java b/...s/modules/netbinox/NetigsoBaseLoader.java → ...s/modules/netbinox/NetigsoBaseLoader.java
diff --git a/...s/modules/netbinox/NetigsoBundleFile.java → ...s/modules/netbinox/NetigsoBundleFile.java b/...s/modules/netbinox/NetigsoBundleFile.java → ...s/modules/netbinox/NetigsoBundleFile.java
diff --git a/.../netbeans/modules/netbinox/RootEntry.java → .../netbeans/modules/netbinox/RootEntry.java b/.../netbeans/modules/netbinox/RootEntry.java → .../netbeans/modules/netbinox/RootEntry.java
diff --git a/...i/annotation/versioning/ConsumerType.java → ...i/annotation/versioning/ConsumerType.java b/...i/annotation/versioning/ConsumerType.java → ...i/annotation/versioning/ConsumerType.java
diff --git a/...i/annotation/versioning/ProviderType.java → ...i/annotation/versioning/ProviderType.java b/...i/annotation/versioning/ProviderType.java → ...i/annotation/versioning/ProviderType.java
diff --git a/.../netbinox/test/unit/data/jars/activate.mf → .../netbinox/test/unit/data/jars/activate.mf b/.../netbinox/test/unit/data/jars/activate.mf → .../netbinox/test/unit/data/jars/activate.mf
diff --git a/...data/jars/activate/org/activate/Main.java → ...data/jars/activate/org/activate/Main.java b/...data/jars/activate/org/activate/Main.java → ...data/jars/activate/org/activate/Main.java
diff --git a/...data/jars/activate/org/activate/entry.txt → ...data/jars/activate/org/activate/entry.txt b/...data/jars/activate/org/activate/entry.txt → ...data/jars/activate/org/activate/entry.txt
diff --git a/...data/jars/activate/org/activate/layer.xml → ...data/jars/activate/org/activate/layer.xml b/...data/jars/activate/org/activate/layer.xml → ...data/jars/activate/org/activate/layer.xml
diff --git a/...orm/netbinox/test/unit/data/jars/agent.mf → ...rib/netbinox/test/unit/data/jars/agent.mf b/...orm/netbinox/test/unit/data/jars/agent.mf → ...rib/netbinox/test/unit/data/jars/agent.mf
diff --git a/...data/jars/agent/org/agent/HelloWorld.java → ...data/jars/agent/org/agent/HelloWorld.java b/...data/jars/agent/org/agent/HelloWorld.java → ...data/jars/agent/org/agent/HelloWorld.java
diff --git a/...jars/agent/org/agent/HelloWorldAgent.java → ...jars/agent/org/agent/HelloWorldAgent.java b/...jars/agent/org/agent/HelloWorldAgent.java → ...jars/agent/org/agent/HelloWorldAgent.java
diff --git a/...t/data/jars/depends-on-simple-module-2.mf → ...t/data/jars/depends-on-simple-module-2.mf b/...t/data/jars/depends-on-simple-module-2.mf → ...t/data/jars/depends-on-simple-module-2.mf
diff --git a/...nit/data/jars/depends-on-simple-module.mf → ...nit/data/jars/depends-on-simple-module.mf b/...nit/data/jars/depends-on-simple-module.mf → ...nit/data/jars/depends-on-simple-module.mf
diff --git a/...-simple-module/org/bar/SomethingElse.java → ...-simple-module/org/bar/SomethingElse.java b/...-simple-module/org/bar/SomethingElse.java → ...-simple-module/org/bar/SomethingElse.java
diff --git a/...e-module/org/bar/SomethingReflective.java → ...e-module/org/bar/SomethingReflective.java b/...e-module/org/bar/SomethingReflective.java → ...e-module/org/bar/SomethingReflective.java
diff --git a/...s-on-simple-module/org/bar/impl/layer.xml → ...s-on-simple-module/org/bar/impl/layer.xml b/...s-on-simple-module/org/bar/impl/layer.xml → ...s-on-simple-module/org/bar/impl/layer.xml
diff --git a/...epends-on-simple-module/org/bar/layer.xml → ...epends-on-simple-module/org/bar/layer.xml b/...epends-on-simple-module/org/bar/layer.xml → ...epends-on-simple-module/org/bar/layer.xml
diff --git a/.../netbinox/test/unit/data/jars/external.mf → .../netbinox/test/unit/data/jars/external.mf b/.../netbinox/test/unit/data/jars/external.mf → .../netbinox/test/unit/data/jars/external.mf
diff --git a/...tbinox/test/unit/data/jars/externaldir.mf → ...tbinox/test/unit/data/jars/externaldir.mf b/...tbinox/test/unit/data/jars/externaldir.mf → ...tbinox/test/unit/data/jars/externaldir.mf
diff --git a/...form/netbinox/test/unit/data/jars/hook.mf → contrib/netbinox/test/unit/data/jars/hook.mf b/...form/netbinox/test/unit/data/jars/hook.mf → contrib/netbinox/test/unit/data/jars/hook.mf
diff --git a/...st/unit/data/jars/hook/org/hook/Main.java → ...st/unit/data/jars/hook/org/hook/Main.java b/...st/unit/data/jars/hook/org/hook/Main.java → ...st/unit/data/jars/hook/org/hook/Main.java
diff --git a/...it/data/jars/loading2/org/load2/Load.java → ...it/data/jars/loading2/org/load2/Load.java b/...it/data/jars/loading2/org/load2/Load.java → ...it/data/jars/loading2/org/load2/Load.java
diff --git a/...it/data/jars/loading3/org/load3/Load.java → ...it/data/jars/loading3/org/load3/Load.java b/...it/data/jars/loading3/org/load3/Load.java → ...it/data/jars/loading3/org/load3/Load.java
diff --git a/...inox/test/unit/data/jars/simple-module.mf → ...inox/test/unit/data/jars/simple-module.mf b/...inox/test/unit/data/jars/simple-module.mf → ...inox/test/unit/data/jars/simple-module.mf
diff --git a/...jars/simple-module/org/foo/Something.java → ...jars/simple-module/org/foo/Something.java b/...jars/simple-module/org/foo/Something.java → ...jars/simple-module/org/foo/Something.java
diff --git a/...data/jars/simple-module/org/foo/hello.txt → ...data/jars/simple-module/org/foo/hello.txt b/...data/jars/simple-module/org/foo/hello.txt → ...data/jars/simple-module/org/foo/hello.txt
diff --git a/...etbinox/test/unit/data/jars/uses-swing.mf → ...etbinox/test/unit/data/jars/uses-swing.mf b/...etbinox/test/unit/data/jars/uses-swing.mf → ...etbinox/test/unit/data/jars/uses-swing.mf
diff --git a/...ata/jars/uses-swing/org/barwing/Main.java → ...ata/jars/uses-swing/org/barwing/Main.java b/...ata/jars/uses-swing/org/barwing/Main.java → ...ata/jars/uses-swing/org/barwing/Main.java
diff --git a/...est/unit/src/org/netbeans/MockEvents.java → ...est/unit/src/org/netbeans/MockEvents.java b/...est/unit/src/org/netbeans/MockEvents.java → ...est/unit/src/org/netbeans/MockEvents.java
diff --git a/...src/org/netbeans/MockModuleInstaller.java → ...src/org/netbeans/MockModuleInstaller.java b/...src/org/netbeans/MockModuleInstaller.java → ...src/org/netbeans/MockModuleInstaller.java
diff --git a/.../test/unit/src/org/netbeans/SetupHid.java → .../test/unit/src/org/netbeans/SetupHid.java b/.../test/unit/src/org/netbeans/SetupHid.java → .../test/unit/src/org/netbeans/SetupHid.java
diff --git a/.../netbeans/modules/netbinox/AgentTest.java → .../netbeans/modules/netbinox/AgentTest.java b/.../netbeans/modules/netbinox/AgentTest.java → .../netbeans/modules/netbinox/AgentTest.java
diff --git a/.../modules/netbinox/BundleGetEntryTest.java → .../modules/netbinox/BundleGetEntryTest.java b/.../modules/netbinox/BundleGetEntryTest.java → .../modules/netbinox/BundleGetEntryTest.java
diff --git a/.../modules/netbinox/BundleResourceTest.java → .../modules/netbinox/BundleResourceTest.java b/.../modules/netbinox/BundleResourceTest.java → .../modules/netbinox/BundleResourceTest.java
diff --git a/...les/netbinox/BundleURLConnectionTest.java → ...les/netbinox/BundleURLConnectionTest.java b/...les/netbinox/BundleURLConnectionTest.java → ...les/netbinox/BundleURLConnectionTest.java
diff --git a/...netbinox/CachingAndExternalPathsTest.java → ...netbinox/CachingAndExternalPathsTest.java b/...netbinox/CachingAndExternalPathsTest.java → ...netbinox/CachingAndExternalPathsTest.java
diff --git a/...s/netbinox/CachingAndExternalURLTest.java → ...s/netbinox/CachingAndExternalURLTest.java b/...s/netbinox/CachingAndExternalURLTest.java → ...s/netbinox/CachingAndExternalURLTest.java
diff --git a/...binox/CachingPreventsFileTouchesTest.java → ...binox/CachingPreventsFileTouchesTest.java b/...binox/CachingPreventsFileTouchesTest.java → ...binox/CachingPreventsFileTouchesTest.java
diff --git a/...ules/netbinox/ContextClassLoaderTest.java → ...ules/netbinox/ContextClassLoaderTest.java b/...ules/netbinox/ContextClassLoaderTest.java → ...ules/netbinox/ContextClassLoaderTest.java
diff --git a/...les/netbinox/CountingSecurityManager.java → ...les/netbinox/CountingSecurityManager.java b/...les/netbinox/CountingSecurityManager.java → ...les/netbinox/CountingSecurityManager.java
diff --git a/...modules/netbinox/EnabledAutoloadTest.java → ...modules/netbinox/EnabledAutoloadTest.java b/...modules/netbinox/EnabledAutoloadTest.java → ...modules/netbinox/EnabledAutoloadTest.java
diff --git a/...dules/netbinox/ExternalDirectoryTest.java → ...dules/netbinox/ExternalDirectoryTest.java b/...dules/netbinox/ExternalDirectoryTest.java → ...dules/netbinox/ExternalDirectoryTest.java
diff --git a/...ans/modules/netbinox/ExternalJARTest.java → ...ans/modules/netbinox/ExternalJARTest.java b/...ans/modules/netbinox/ExternalJARTest.java → ...ans/modules/netbinox/ExternalJARTest.java
diff --git a/...odules/netbinox/HookConfiguratorTest.java → ...odules/netbinox/HookConfiguratorTest.java b/...odules/netbinox/HookConfiguratorTest.java → ...odules/netbinox/HookConfiguratorTest.java
diff --git a/...tbeans/modules/netbinox/HookRaceTest.java → ...tbeans/modules/netbinox/HookRaceTest.java b/...tbeans/modules/netbinox/HookRaceTest.java → ...tbeans/modules/netbinox/HookRaceTest.java
diff --git a/...ans/modules/netbinox/IntegrationTest.java → ...ans/modules/netbinox/IntegrationTest.java b/...ans/modules/netbinox/IntegrationTest.java → ...ans/modules/netbinox/IntegrationTest.java
diff --git a/...ans/modules/netbinox/LoadedBytesTest.java → ...ans/modules/netbinox/LoadedBytesTest.java b/...ans/modules/netbinox/LoadedBytesTest.java → ...ans/modules/netbinox/LoadedBytesTest.java
diff --git a/...odules/netbinox/LogReaderServiceTest.java → ...odules/netbinox/LogReaderServiceTest.java b/...odules/netbinox/LogReaderServiceTest.java → ...odules/netbinox/LogReaderServiceTest.java
diff --git a/...etbinox/NetbinoxBuddyClassLoaderTest.java → ...etbinox/NetbinoxBuddyClassLoaderTest.java b/...etbinox/NetbinoxBuddyClassLoaderTest.java → ...etbinox/NetbinoxBuddyClassLoaderTest.java
diff --git a/...x/NetbinoxDuplicatedBuddyForNameTest.java → ...x/NetbinoxDuplicatedBuddyForNameTest.java b/...x/NetbinoxDuplicatedBuddyForNameTest.java → ...x/NetbinoxDuplicatedBuddyForNameTest.java
diff --git a/...x/NetbinoxDuplicatedClassForNameTest.java → ...x/NetbinoxDuplicatedClassForNameTest.java b/...x/NetbinoxDuplicatedClassForNameTest.java → ...x/NetbinoxDuplicatedClassForNameTest.java
diff --git a/...modules/netbinox/NetbinoxFactoryTest.java → ...modules/netbinox/NetbinoxFactoryTest.java b/...modules/netbinox/NetbinoxFactoryTest.java → ...modules/netbinox/NetbinoxFactoryTest.java
diff --git a/...modules/netbinox/NetbinoxLibraryTest.java → ...modules/netbinox/NetbinoxLibraryTest.java b/...modules/netbinox/NetbinoxLibraryTest.java → ...modules/netbinox/NetbinoxLibraryTest.java
diff --git a/...netbinox/NetbinoxMultiversionJarTest.java → ...netbinox/NetbinoxMultiversionJarTest.java b/...netbinox/NetbinoxMultiversionJarTest.java → ...netbinox/NetbinoxMultiversionJarTest.java
diff --git a/.../modules/netbinox/NetbinoxReloadTest.java → .../modules/netbinox/NetbinoxReloadTest.java b/.../modules/netbinox/NetbinoxReloadTest.java → .../modules/netbinox/NetbinoxReloadTest.java
diff --git a/...inox/NetbinoxUseSystemPropertiesTest.java → ...inox/NetbinoxUseSystemPropertiesTest.java b/...inox/NetbinoxUseSystemPropertiesTest.java → ...inox/NetbinoxUseSystemPropertiesTest.java
diff --git a/...dules/netbinox/NetigsoActivationTest.java → ...dules/netbinox/NetigsoActivationTest.java b/...dules/netbinox/NetigsoActivationTest.java → ...dules/netbinox/NetigsoActivationTest.java
diff --git a/...nox/NetigsoActivationWithAllDirsTest.java → ...nox/NetigsoActivationWithAllDirsTest.java b/...nox/NetigsoActivationWithAllDirsTest.java → ...nox/NetigsoActivationWithAllDirsTest.java
diff --git a/...odules/netbinox/NetigsoDashnamesTest.java → ...odules/netbinox/NetigsoDashnamesTest.java b/...odules/netbinox/NetigsoDashnamesTest.java → ...odules/netbinox/NetigsoDashnamesTest.java
diff --git a/...les/netbinox/NetigsoHasSAXParserTest.java → ...les/netbinox/NetigsoHasSAXParserTest.java b/...les/netbinox/NetigsoHasSAXParserTest.java → ...les/netbinox/NetigsoHasSAXParserTest.java
diff --git a/...netbeans/modules/netbinox/NetigsoHid.java → ...netbeans/modules/netbinox/NetigsoHid.java b/...netbeans/modules/netbinox/NetigsoHid.java → ...netbeans/modules/netbinox/NetigsoHid.java
diff --git a/...ns/modules/netbinox/NetigsoLayerTest.java → ...ns/modules/netbinox/NetigsoLayerTest.java b/...ns/modules/netbinox/NetigsoLayerTest.java → ...ns/modules/netbinox/NetigsoLayerTest.java
diff --git a/.../modules/netbinox/NetigsoLoggingTest.java → .../modules/netbinox/NetigsoLoggingTest.java b/.../modules/netbinox/NetigsoLoggingTest.java → .../modules/netbinox/NetigsoLoggingTest.java
diff --git a/...nox/NetigsoOSGiActivationVisibleTest.java → ...nox/NetigsoOSGiActivationVisibleTest.java b/...nox/NetigsoOSGiActivationVisibleTest.java → ...nox/NetigsoOSGiActivationVisibleTest.java
diff --git a/...es/netbinox/NetigsoOSGiCanDependTest.java → ...es/netbinox/NetigsoOSGiCanDependTest.java b/...es/netbinox/NetigsoOSGiCanDependTest.java → ...es/netbinox/NetigsoOSGiCanDependTest.java
diff --git a/...s/netbinox/NetigsoOSGiCanRequestTest.java → ...s/netbinox/NetigsoOSGiCanRequestTest.java b/...s/netbinox/NetigsoOSGiCanRequestTest.java → ...s/netbinox/NetigsoOSGiCanRequestTest.java
diff --git a/.../netbinox/NetigsoOSGiIsNotFriendTest.java → .../netbinox/NetigsoOSGiIsNotFriendTest.java b/.../netbinox/NetigsoOSGiIsNotFriendTest.java → .../netbinox/NetigsoOSGiIsNotFriendTest.java
diff --git a/...etbeans/modules/netbinox/NetigsoTest.java → ...etbeans/modules/netbinox/NetigsoTest.java b/...etbeans/modules/netbinox/NetigsoTest.java → ...etbeans/modules/netbinox/NetigsoTest.java
diff --git a/...odules/netbinox/NetigsoUsesSwingTest.java → ...odules/netbinox/NetigsoUsesSwingTest.java b/...odules/netbinox/NetigsoUsesSwingTest.java → ...odules/netbinox/NetigsoUsesSwingTest.java
diff --git a/...etbeans/modules/netbinox/SQLTimeTest.java → ...etbeans/modules/netbinox/SQLTimeTest.java b/...etbeans/modules/netbinox/SQLTimeTest.java → ...etbeans/modules/netbinox/SQLTimeTest.java
diff --git a/...tbinox/SingleThreadLoadsDeadlockTest.java → ...tbinox/SingleThreadLoadsDeadlockTest.java b/...tbinox/SingleThreadLoadsDeadlockTest.java → ...tbinox/SingleThreadLoadsDeadlockTest.java
diff --git a/...inox/SingleThreadLoadsDisabledOKTest.java → ...inox/SingleThreadLoadsDisabledOKTest.java b/...inox/SingleThreadLoadsDisabledOKTest.java → ...inox/SingleThreadLoadsDisabledOKTest.java
diff --git a/ide/o.eclipse.core.contenttype/build.xml → contrib/o.eclipse.core.contenttype/build.xml b/ide/o.eclipse.core.contenttype/build.xml → contrib/o.eclipse.core.contenttype/build.xml
diff --git a/...e.core.contenttype/external/binaries-list → ...e.core.contenttype/external/binaries-list b/...e.core.contenttype/external/binaries-list → ...e.core.contenttype/external/binaries-list
diff --git a/...nttype-3.4.100.v20110423-0524-license.txt → ...nttype-3.4.100.v20110423-0524-license.txt b/...nttype-3.4.100.v20110423-0524-license.txt → ...nttype-3.4.100.v20110423-0524-license.txt
diff --git a/ide/o.eclipse.core.contenttype/manifest.mf → ...ib/o.eclipse.core.contenttype/manifest.mf b/ide/o.eclipse.core.contenttype/manifest.mf → ...ib/o.eclipse.core.contenttype/manifest.mf
diff --git a/....contenttype/nbproject/project.properties → ....contenttype/nbproject/project.properties b/....contenttype/nbproject/project.properties → ....contenttype/nbproject/project.properties
diff --git a/...se.core.contenttype/nbproject/project.xml → ...se.core.contenttype/nbproject/project.xml b/...se.core.contenttype/nbproject/project.xml → ...se.core.contenttype/nbproject/project.xml
diff --git a/ide/o.eclipse.core.jobs/build.xml → contrib/o.eclipse.core.jobs/build.xml b/ide/o.eclipse.core.jobs/build.xml → contrib/o.eclipse.core.jobs/build.xml
diff --git a/....eclipse.core.jobs/external/binaries-list → ....eclipse.core.jobs/external/binaries-list b/....eclipse.core.jobs/external/binaries-list → ....eclipse.core.jobs/external/binaries-list
diff --git a/...org.eclipse.core.jobs-3.5.100-license.txt → ...org.eclipse.core.jobs-3.5.100-license.txt b/...org.eclipse.core.jobs-3.5.100-license.txt → ...org.eclipse.core.jobs-3.5.100-license.txt
diff --git a/ide/o.eclipse.core.jobs/manifest.mf → contrib/o.eclipse.core.jobs/manifest.mf b/ide/o.eclipse.core.jobs/manifest.mf → contrib/o.eclipse.core.jobs/manifest.mf
diff --git a/....jobs/nbproject/org-eclipse-core-jobs.sig → ....jobs/nbproject/org-eclipse-core-jobs.sig b/....jobs/nbproject/org-eclipse-core-jobs.sig → ....jobs/nbproject/org-eclipse-core-jobs.sig
diff --git a/...se.core.jobs/nbproject/project.properties → ...se.core.jobs/nbproject/project.properties b/...se.core.jobs/nbproject/project.properties → ...se.core.jobs/nbproject/project.properties
diff --git a/...o.eclipse.core.jobs/nbproject/project.xml → ...o.eclipse.core.jobs/nbproject/project.xml b/...o.eclipse.core.jobs/nbproject/project.xml → ...o.eclipse.core.jobs/nbproject/project.xml
diff --git a/ide/o.eclipse.core.net/build.xml → contrib/o.eclipse.core.net/build.xml b/ide/o.eclipse.core.net/build.xml → contrib/o.eclipse.core.net/build.xml
diff --git a/...o.eclipse.core.net/external/binaries-list → ...o.eclipse.core.net/external/binaries-list b/...o.eclipse.core.net/external/binaries-list → ...o.eclipse.core.net/external/binaries-list
diff --git a/...00.I20110511-0800_nosignature-license.txt → ...00.I20110511-0800_nosignature-license.txt b/...00.I20110511-0800_nosignature-license.txt → ...00.I20110511-0800_nosignature-license.txt
diff --git a/ide/o.eclipse.core.net/manifest.mf → contrib/o.eclipse.core.net/manifest.mf b/ide/o.eclipse.core.net/manifest.mf → contrib/o.eclipse.core.net/manifest.mf
diff --git a/...pse.core.net/nbproject/project.properties → ...pse.core.net/nbproject/project.properties b/...pse.core.net/nbproject/project.properties → ...pse.core.net/nbproject/project.properties
diff --git a/ide/o.eclipse.core.net/nbproject/project.xml → .../o.eclipse.core.net/nbproject/project.xml b/ide/o.eclipse.core.net/nbproject/project.xml → .../o.eclipse.core.net/nbproject/project.xml
diff --git a/...core.runtime.compatibility.auth/build.xml → ...core.runtime.compatibility.auth/build.xml b/...core.runtime.compatibility.auth/build.xml → ...core.runtime.compatibility.auth/build.xml
diff --git a/...compatibility.auth/external/binaries-list → ...compatibility.auth/external/binaries-list b/...compatibility.auth/external/binaries-list → ...compatibility.auth/external/binaries-list
diff --git a/...3.2.200.v20110110_nosignature-license.txt → ...3.2.200.v20110110_nosignature-license.txt b/...3.2.200.v20110110_nosignature-license.txt → ...3.2.200.v20110110_nosignature-license.txt
diff --git a/...re.runtime.compatibility.auth/manifest.mf → ...re.runtime.compatibility.auth/manifest.mf b/...re.runtime.compatibility.auth/manifest.mf → ...re.runtime.compatibility.auth/manifest.mf
diff --git a/...ibility.auth/nbproject/project.properties → ...ibility.auth/nbproject/project.properties b/...ibility.auth/nbproject/project.properties → ...ibility.auth/nbproject/project.properties
diff --git a/....compatibility.auth/nbproject/project.xml → ....compatibility.auth/nbproject/project.xml b/....compatibility.auth/nbproject/project.xml → ....compatibility.auth/nbproject/project.xml
diff --git a/ide/o.eclipse.core.runtime/build.xml → contrib/o.eclipse.core.runtime/build.xml b/ide/o.eclipse.core.runtime/build.xml → contrib/o.eclipse.core.runtime/build.xml
diff --git a/...lipse.core.runtime/external/binaries-list → ...lipse.core.runtime/external/binaries-list b/...lipse.core.runtime/external/binaries-list → ...lipse.core.runtime/external/binaries-list
diff --git a/...rg.eclipse.core.runtime-3.7.0-license.txt → ...rg.eclipse.core.runtime-3.7.0-license.txt b/...rg.eclipse.core.runtime-3.7.0-license.txt → ...rg.eclipse.core.runtime-3.7.0-license.txt
diff --git a/ide/o.eclipse.core.runtime/manifest.mf → contrib/o.eclipse.core.runtime/manifest.mf b/ide/o.eclipse.core.runtime/manifest.mf → contrib/o.eclipse.core.runtime/manifest.mf
diff --git a/...me/nbproject/org-eclipse-core-runtime.sig → ...me/nbproject/org-eclipse-core-runtime.sig b/...me/nbproject/org-eclipse-core-runtime.sig → ...me/nbproject/org-eclipse-core-runtime.sig
diff --git a/...core.runtime/nbproject/project.properties → ...core.runtime/nbproject/project.properties b/...core.runtime/nbproject/project.properties → ...core.runtime/nbproject/project.properties
diff --git a/...clipse.core.runtime/nbproject/project.xml → ...clipse.core.runtime/nbproject/project.xml b/...clipse.core.runtime/nbproject/project.xml → ...clipse.core.runtime/nbproject/project.xml
diff --git a/ide/o.eclipse.equinox.app/build.xml → contrib/o.eclipse.equinox.app/build.xml b/ide/o.eclipse.equinox.app/build.xml → contrib/o.eclipse.equinox.app/build.xml
diff --git a/...clipse.equinox.app/external/binaries-list → ...clipse.equinox.app/external/binaries-list b/...clipse.equinox.app/external/binaries-list → ...clipse.equinox.app/external/binaries-list
diff --git a/...g.eclipse.equinox.app-1.3.100-license.txt → ...g.eclipse.equinox.app-1.3.100-license.txt b/...g.eclipse.equinox.app-1.3.100-license.txt → ...g.eclipse.equinox.app-1.3.100-license.txt
diff --git a/ide/o.eclipse.equinox.app/manifest.mf → contrib/o.eclipse.equinox.app/manifest.mf b/ide/o.eclipse.equinox.app/manifest.mf → contrib/o.eclipse.equinox.app/manifest.mf
diff --git a/....equinox.app/nbproject/project.properties → ....equinox.app/nbproject/project.properties b/....equinox.app/nbproject/project.properties → ....equinox.app/nbproject/project.properties
diff --git a/...eclipse.equinox.app/nbproject/project.xml → ...eclipse.equinox.app/nbproject/project.xml b/...eclipse.equinox.app/nbproject/project.xml → ...eclipse.equinox.app/nbproject/project.xml
diff --git a/ide/o.eclipse.equinox.common/build.xml → contrib/o.eclipse.equinox.common/build.xml b/ide/o.eclipse.equinox.common/build.xml → contrib/o.eclipse.equinox.common/build.xml
diff --git a/...pse.equinox.common/external/binaries-list → ...pse.equinox.common/external/binaries-list b/...pse.equinox.common/external/binaries-list → ...pse.equinox.common/external/binaries-list
diff --git a/...quinox.common-3.6.0.v20110523-license.txt → ...quinox.common-3.6.0.v20110523-license.txt b/...quinox.common-3.6.0.v20110523-license.txt → ...quinox.common-3.6.0.v20110523-license.txt
diff --git a/ide/o.eclipse.equinox.common/manifest.mf → contrib/o.eclipse.equinox.common/manifest.mf b/ide/o.eclipse.equinox.common/manifest.mf → contrib/o.eclipse.equinox.common/manifest.mf
diff --git a/...uinox.common/nbproject/project.properties → ...uinox.common/nbproject/project.properties b/...uinox.common/nbproject/project.properties → ...uinox.common/nbproject/project.properties
diff --git a/...ipse.equinox.common/nbproject/project.xml → ...ipse.equinox.common/nbproject/project.xml b/...ipse.equinox.common/nbproject/project.xml → ...ipse.equinox.common/nbproject/project.xml
diff --git a/ide/o.eclipse.equinox.preferences/build.xml → ...b/o.eclipse.equinox.preferences/build.xml b/ide/o.eclipse.equinox.preferences/build.xml → ...b/o.eclipse.equinox.preferences/build.xml
diff --git a/...quinox.preferences/external/binaries-list → ...quinox.preferences/external/binaries-list b/...quinox.preferences/external/binaries-list → ...quinox.preferences/external/binaries-list
diff --git a/...preferences-3.4.2_nosignature-license.txt → ...preferences-3.4.2_nosignature-license.txt b/...preferences-3.4.2_nosignature-license.txt → ...preferences-3.4.2_nosignature-license.txt
diff --git a/...o.eclipse.equinox.preferences/manifest.mf → ...o.eclipse.equinox.preferences/manifest.mf b/...o.eclipse.equinox.preferences/manifest.mf → ...o.eclipse.equinox.preferences/manifest.mf
diff --git a/....preferences/nbproject/project.properties → ....preferences/nbproject/project.properties b/....preferences/nbproject/project.properties → ....preferences/nbproject/project.properties
diff --git a/...equinox.preferences/nbproject/project.xml → ...equinox.preferences/nbproject/project.xml b/...equinox.preferences/nbproject/project.xml → ...equinox.preferences/nbproject/project.xml
diff --git a/ide/o.eclipse.equinox.registry/build.xml → contrib/o.eclipse.equinox.registry/build.xml b/ide/o.eclipse.equinox.registry/build.xml → contrib/o.eclipse.equinox.registry/build.xml
diff --git a/...e.equinox.registry/external/binaries-list → ...e.equinox.registry/external/binaries-list b/...e.equinox.registry/external/binaries-list → ...e.equinox.registry/external/binaries-list
diff --git a/...00.v20120522-1841_nosignature-license.txt → ...00.v20120522-1841_nosignature-license.txt b/...00.v20120522-1841_nosignature-license.txt → ...00.v20120522-1841_nosignature-license.txt
diff --git a/ide/o.eclipse.equinox.registry/manifest.mf → ...ib/o.eclipse.equinox.registry/manifest.mf b/ide/o.eclipse.equinox.registry/manifest.mf → ...ib/o.eclipse.equinox.registry/manifest.mf
diff --git a/...nox.registry/nbproject/project.properties → ...nox.registry/nbproject/project.properties b/...nox.registry/nbproject/project.properties → ...nox.registry/nbproject/project.properties
diff --git a/...se.equinox.registry/nbproject/project.xml → ...se.equinox.registry/nbproject/project.xml b/...se.equinox.registry/nbproject/project.xml → ...se.equinox.registry/nbproject/project.xml
diff --git a/ide/o.eclipse.equinox.security/build.xml → contrib/o.eclipse.equinox.security/build.xml b/ide/o.eclipse.equinox.security/build.xml → contrib/o.eclipse.equinox.security/build.xml
diff --git a/...e.equinox.security/external/binaries-list → ...e.equinox.security/external/binaries-list b/...e.equinox.security/external/binaries-list → ...e.equinox.security/external/binaries-list
diff --git a/...ox.security-1.1.1_nosignature-license.txt → ...ox.security-1.1.1_nosignature-license.txt b/...ox.security-1.1.1_nosignature-license.txt → ...ox.security-1.1.1_nosignature-license.txt
diff --git a/ide/o.eclipse.equinox.security/manifest.mf → ...ib/o.eclipse.equinox.security/manifest.mf b/ide/o.eclipse.equinox.security/manifest.mf → ...ib/o.eclipse.equinox.security/manifest.mf
diff --git a/...nox.security/nbproject/project.properties → ...nox.security/nbproject/project.properties b/...nox.security/nbproject/project.properties → ...nox.security/nbproject/project.properties
diff --git a/...se.equinox.security/nbproject/project.xml → ...se.equinox.security/nbproject/project.xml b/...se.equinox.security/nbproject/project.xml → ...se.equinox.security/nbproject/project.xml
diff --git a/ide/c.jcraft.jsch/nbproject/project.xml b/ide/c.jcraft.jsch/nbproject/project.xml
@@ -37,30 +37,35 @@
                     <run-dependency/>
                 </dependency>
                 <dependency>
-                    <code-name-base>libs.c.kohlschutter.junixsocket</code-name-base>
+                    <code-name-base>com.sun.jna</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>3.0</specification-version>
+                        <specification-version>5.19.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.libs.jna</code-name-base>
+                    <code-name-base>com.sun.jna.platform</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>2.11</specification-version>
+                        <specification-version>5.19.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.libs.jna.platform</code-name-base>
+                    <code-name-base>libs.c.kohlschutter.junixsocket</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.11</specification-version>
+                        <specification-version>3.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.libs.jna</code-name-base>
+                    <run-dependency>
+                        <release-version>2</release-version>
+                        <specification-version>2.28</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>

diff --git a/ide/dlight.nativeexecution/nbproject/project.xml b/ide/dlight.nativeexecution/nbproject/project.xml
@@ -33,6 +33,14 @@
                         <specification-version>0.1.43</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>com.sun.jna</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>5.19.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                     <build-prerequisite/>
@@ -61,11 +69,9 @@
                 </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.libs.jna</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.1</specification-version>
+                        <specification-version>2.28</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

diff --git a/ide/extbrowser/nbproject/project.xml b/ide/extbrowser/nbproject/project.xml
@@ -26,30 +26,35 @@
             <code-name-base>org.netbeans.modules.extbrowser</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.netbeans.api.annotations.common</code-name-base>
+                    <code-name-base>com.sun.jna</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.21</specification-version>
+                        <specification-version>5.19.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.libs.jna</code-name-base>
+                    <code-name-base>com.sun.jna.platform</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>2.22</specification-version>
+                        <specification-version>5.19.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.libs.jna.platform</code-name-base>
+                    <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.21</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.libs.jna</code-name-base>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.22</specification-version>
+                        <specification-version>2.28</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

diff --git a/ide/git/nbproject/project.xml b/ide/git/nbproject/project.xml
@@ -30,6 +30,22 @@
                     <compile-dependency/>
                     <run-dependency/>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.eclipse.jgit.gpg.bc</code-name-base>
+                    <run-dependency/>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.eclipse.jgit.lfs</code-name-base>
+                    <run-dependency/>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.eclipse.jgit.ssh.apache</code-name-base>
+                    <run-dependency/>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.eclipse.jgit.ssh.apache.agent</code-name-base>
+                    <run-dependency/>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                     <build-prerequisite/>

diff --git a/ide/git/src/org/netbeans/modules/git/client/CredentialsCallback.java b/ide/git/src/org/netbeans/modules/git/client/CredentialsCallback.java
@@ -78,6 +78,15 @@ public char[] getPassword (String uri, String prompt) {
             pwd = password.clone();
             Arrays.fill(password, (char) 0);
             credentialsReady = false;
+        } else if (passphrase != null) {
+            // the jgit apache mina client uses password instead of passphrase
+            // to unlock the identity file, an additional guard could be to
+            // check for prompt "Passphrase", but that is/could be a localized.
+            // As only ever either password _or_ passphrase are available, this
+            // should be save (see fetchCredentials)
+            pwd = passphrase.clone();
+            Arrays.fill(passphrase, (char) 0);
+            credentialsReady = false;
         }
         return pwd;
     }

diff --git a/ide/ide.kit/manifest.mf b/ide/ide.kit/manifest.mf
@@ -2,5 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.ide.kit
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ide/kit/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.66
-OpenIDE-Module-Needs: org.netbeans.Netbinox
 
diff --git a/ide/libs.git/nbproject/project.xml b/ide/libs.git/nbproject/project.xml
@@ -26,11 +26,11 @@
             <code-name-base>org.netbeans.libs.git</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>com.jcraft.jsch</code-name-base>
+                    <code-name-base>org.apache.sshd.osgi</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.1.55</specification-version>
+                        <specification-version>2.17.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -42,20 +42,11 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.eclipse.jgit.ssh.jsch</code-name-base>
+                    <code-name-base>org.eclipse.jgit.ssh.apache</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.libs.jsch.agentproxy</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.0</specification-version>
+                        <specification-version>7.6.0</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>