Skip to content

Commit 0314fba

Browse files
authored
remove dep on logback (#422)
1 parent 0303306 commit 0314fba

File tree

8 files changed

+9
-16
lines changed

8 files changed

+9
-16
lines changed

bundles/com.salesforce.b2eclipse.jdt.ls/.settings/JDT.LS Bazel.launch

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<stringAttribute key="featurePluginResolution" value="workspace"/>
1919
<booleanAttribute key="includeOptional" value="false"/>
2020
<stringAttribute key="location" value="${workspace_loc}/../runtime-jdtls"/>
21+
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
2122
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
2223
<mapEntry key="CLIENT_HOST" value="127.0.0.1"/>
2324
<mapEntry key="CLIENT_PORT" value="5036"/>
@@ -30,7 +31,7 @@
3031
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
3132
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
3233
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
33-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Zulu 11 [sfdc-11.0.9.1-zulu11.43.56-sa]"/>
34+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JRE [17.0.4]"/>
3435
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
3536
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
3637
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2048m -Declipse.log.size.max=3000"/>
@@ -115,10 +116,8 @@
115116
<setEntry value="org.slf4j.api@default:default"/>
116117
</setAttribute>
117118
<setAttribute key="selected_workspace_bundles">
118-
<setEntry value="com.salesforce.b2eclipse.jdt.ls@default:default"/>
119119
<setEntry value="com.salesforce.bazel-java-sdk@default:default"/>
120120
<setEntry value="com.salesforce.bazel.eclipse.common@default:default"/>
121-
<setEntry value="org.eclipse.jdt.ls.core@default:default"/>
122121
</setAttribute>
123122
<booleanAttribute key="show_selected_only" value="false"/>
124123
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>

bundles/com.salesforce.bazel-java-sdk/src/main/java/com/salesforce/bazel/sdk/index/jvm/JvmCodeIndex.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
import java.util.ArrayList;
2828
import java.util.List;
2929
import java.util.Map;
30-
import java.util.TreeMap;
3130
import java.util.concurrent.ConcurrentHashMap;
3231

3332
import com.salesforce.bazel.sdk.index.CodeIndex;
34-
import com.salesforce.bazel.sdk.index.CodeIndexEntry;
3533
import com.salesforce.bazel.sdk.index.jvm.jar.JarIdentiferResolver;
3634
import com.salesforce.bazel.sdk.index.jvm.jar.JavaJarCrawler;
3735
import com.salesforce.bazel.sdk.lang.jvm.external.BazelExternalJarRuleManager;

bundles/com.salesforce.bazel.eclipse.common/src/main/java/com/salesforce/bazel/eclipse/project/EclipseProjectCreator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.io.File;
2727
import java.net.URI;
2828
import java.util.ArrayList;
29-
import java.util.Collections;
3029
import java.util.List;
3130
import java.util.Objects;
3231

bundles/com.salesforce.bazel.eclipse.core/META-INF/MANIFEST.MF

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ Require-Bundle: org.eclipse.ui.console;bundle-version="3.8.100.v20180821-1744",
2828
org.eclipse.core.expressions;bundle-version="3.6.200.v20180817-1401",
2929
com.salesforce.bazel-java-sdk;bundle-version="1.5.2.qualifier",
3030
org.slf4j.api;bundle-version="1.7.30",
31-
ch.qos.logback.core;bundle-version="1.2.3",
32-
ch.qos.logback.classic;bundle-version="1.2.3",
3331
com.salesforce.bazel.eclipse.common,
3432
org.eclipse.ltk.core.refactoring
3533
Bundle-RequiredExecutionEnvironment: JavaSE-11

bundles/com.salesforce.bazel.eclipse.core/src/main/java/com/salesforce/bazel/eclipse/launch/BazelJavaSourceLookupDirector.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.eclipse.jdt.launching.sourcelookup.containers.JavaProjectSourceContainer;
4949
import org.eclipse.jdt.launching.sourcelookup.containers.JavaSourceLookupParticipant;
5050

51-
import com.salesforce.bazel.eclipse.BazelPluginActivator;
5251
import com.salesforce.bazel.eclipse.component.ComponentContext;
5352

5453
/**

bundles/com.salesforce.bazel.eclipse.core/src/main/java/com/salesforce/bazel/eclipse/launch/BazelTargetLaunchShortcut.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.eclipse.swt.widgets.Display;
4747
import org.eclipse.ui.IEditorPart;
4848

49-
import com.salesforce.bazel.eclipse.BazelPluginActivator;
5049
import com.salesforce.bazel.eclipse.component.ComponentContext;
5150
import com.salesforce.bazel.sdk.aspect.AspectTargetInfo;
5251
import com.salesforce.bazel.sdk.aspect.jvm.JVMAspectTargetInfo;

docs/dev/dev_guide.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,16 @@ At this point you almost certainly have multiple *Eclipse IDE* versions installe
5050
Therefore you want to be very intentional about how you launch the Eclipse SDK.
5151
Do not rely on your OS finder to launch "Eclipse", as it might not be the PDE one.
5252

53-
As a best practice, write a simple launcher script named *eclipse_sdk.sh*
53+
As a best practice, use the simple launcher script named *eclipse_sdk.sh*.
54+
You will need to create your own ```my_env.sh``` file
5455
(it is [.gitignore](../../.gitignore)'d already)
5556
in the root directory of this repository on your local machine.
5657
It will look something like:
5758

5859
```
59-
# launch the Eclipse SDK
60-
/Users/mbenioff/tools/eclipse/sdk49/Eclipse.app/Contents/MacOS/eclipse &
60+
export JAVA_HOME=/Users/mbenioff/dev/jdk/openjdk_17
61+
export ECLIPSE_DIR=/Users/mbenioff/dev/eclipse/SDK/4.25
62+
6163
```
6264

6365
### Import the bazel-eclipse projects into the Eclipse SDK
@@ -75,7 +77,8 @@ There will be errors. This is expected at this point.
7577

7678
- Click *Window* -> *Perspective* -> *Open Perspective* -> *Plug-in Development*
7779
- Open file *releng/target-platform/target-platform.target* file
78-
- Click *Reload Target Platform* in the upper right. This will run for a **long** time (20 minutes perhaps).
80+
- Click the *Set as Active Target Platform* link in the upper right
81+
- Click *Reload Target Platform* in the upper right. This will run for a **long** time (5 minutes perhaps).
7982
- The Problems view should now be free of errors
8083

8184
:fire: if you see errors or warnings at this point, see the [dev issues page](dev_issues.md) for help.

features/com.salesforce.bazel.eclipse.feature/feature.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,6 @@
250250
<import plugin="org.eclipse.core.expressions" version="3.6.200.v20180817-1401" match="greaterOrEqual"/>
251251
<import plugin="com.salesforce.bazel-java-sdk" version="1.5.2" match="greaterOrEqual"/>
252252
<import plugin="org.slf4j.api" version="1.7.30" match="greaterOrEqual"/>
253-
<import plugin="ch.qos.logback.core" version="1.2.3" match="greaterOrEqual"/>
254-
<import plugin="ch.qos.logback.classic" version="1.2.3" match="greaterOrEqual"/>
255253
<import plugin="org.eclipse.ltk.core.refactoring"/>
256254
<import plugin="org.apache.commons.lang3" version="3.1.0" match="greaterOrEqual"/>
257255
</requires>

0 commit comments

Comments
 (0)