Skip to content

Commit

Permalink
Merge pull request bndtools#1947 from rotty3000/master
Browse files Browse the repository at this point in the history
fixes bndtools#1922 make the test classpath not transitive
  • Loading branch information
rotty3000 authored Nov 1, 2018
2 parents cdc2566 + 1289de1 commit 35548e3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 150 deletions.
21 changes: 7 additions & 14 deletions bndtools.core/_plugin.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin>


<!-- Extension Points -->
<!-- DEPRECATED -->
<extension-point id="cnfTemplates"
Expand Down Expand Up @@ -186,7 +186,7 @@
class="bndtools.wizards.workspace.MissingWorkspaceMarkerResolutionGenerator"
/>
</extension>

<extension point="bndtools.core.buildErrorDetailsHandlers">
<handler
typeMatch="bndtools.builder.missingworkspace"
Expand Down Expand Up @@ -372,7 +372,7 @@
<visibleWhen checkEnabled="true"/>
</command>
</menuContribution>

<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
<toolbar id="bndtools.runEditor.toolbar">
<command commandId="bndtools.runEditor.resolve">
Expand Down Expand Up @@ -527,17 +527,17 @@
<launchConfigurationType
delegate="bndtools.launch.bnd.NativeBndLaunchDelegate"
id="bnd.launch"
modes="run, debug"
modes="run, debug"
name="bnd Native"
sourceLocatorId="org.bndtools.core.launch.BndDependencySourceLookupDirector"
sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"
>
>
</launchConfigurationType>
</extension>

<!-- A status handler for "no available JVM matching EE" from the launch infra -->
<extension point="org.eclipse.debug.core.statusHandlers">
<statusHandler
<statusHandler
id="bndtools.launch.ui.internal.NoVMForEEStatusHandler"
class="bndtools.launch.ui.internal.NoVMForEEStatusHandler"
plugin="bndtools.core"
Expand Down Expand Up @@ -571,13 +571,6 @@
/>
</extension>

<extension point="org.eclipse.jdt.launching.runtimeClasspathEntryResolvers">
<runtimeClasspathEntryResolver
id="bndtools.core.BndContainerRuntimeClasspathEntryResolver"
class="bndtools.launch.BndContainerRuntimeClasspathEntryResolver"
container="aQute.bnd.classpath.container" />
</extension>

<extension point="org.eclipse.core.expressions.propertyTesters">
<propertyTester id="org.bndtools.core.launchPropertyTester"
namespace="org.bndtools.core"
Expand Down Expand Up @@ -737,7 +730,7 @@
</shortcut>

</extension>

<extension point="org.eclipse.ui.keywords">
<keyword id="bndtools.core" label="Bndtools"/>
</extension>
Expand Down

This file was deleted.

0 comments on commit 35548e3

Please sign in to comment.