Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies: Aries SPIFly, webtools, lsp4j, lsp4e, commons-cli and Guava #1594

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Update dependencies: Aries SPIFly, webtools, lsp4j, lsp4e, commons-cli and Guava #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f889da5
Update to Apache Aries SPI Fly 1.3.7
HannesWell Nov 7, 2023
ee88846
Update to latest of webtools, lsp4j, lsp4e, commons-cli and Guava
HannesWell Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion m2e-core-tests
Open in desktop
Submodule m2e-core-tests updated 1 files
+1 −1 org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/embedder/MavenRuntimeManagerTest.java
4 changes: 2 additions & 2 deletions org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Import-Package: javax.inject;version="[1.0.0,2.0.0)",
org.osgi.framework;version="1.10.0",
org.slf4j;version="[1.7.0,3.0.0)"
Require-Bundle: org.eclipse.wildwebdeveloper.xml;bundle-version="[1.3,1.4)",
org.eclipse.lsp4e;bundle-version="0.16.0",
org.eclipse.lsp4j;bundle-version="0.9.0",
org.eclipse.lsp4e;bundle-version="0.18.0",
org.eclipse.lsp4j;bundle-version="0.21.0",
org.eclipse.m2e.core,
org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)",
org.eclipse.core.resources
Expand Down
4 changes: 0 additions & 4 deletions org.eclipse.m2e.logback.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
%copyright
</copyright>

<requires>
<import plugin="jakarta.servlet-api" version="5.0.0" match="compatible"/>
</requires>

<plugin
id="org.eclipse.m2e.logback"
version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion products/m2e-ide/Eclipse-M2E-IDE.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
<setAttribute key="additional_plugins">
<setEntry value="ch.qos.logback.classic:1.4.11:default:true:default:true"/>
<setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.6:default:true:2:true"/>
<setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.7:default:true:2:true"/>
<setEntry value="org.apache.felix.scr:2.2.6:default:true:2:true"/>
<setEntry value="org.eclipse.core.runtime:3.29.0.v20230726-0617:default:true:default:true"/>
<setEntry value="org.eclipse.equinox.common:3.18.100.v20230730-1117:default:true:2:true"/>
Expand Down
26 changes: 12 additions & 14 deletions target-platform/target-platform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
<unit id="org.mockito.mockito-core" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09/"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
<unit id="org.jdom2" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
Expand All @@ -26,16 +25,16 @@
<unit id="org.eclipse.emf.ecore.edit.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.30.0/R-3.30.0-20230603084739/repository/"/>
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repository/"/>
<unit id="org.eclipse.wst.common.uriresolver" version="0.0.0"/>
<unit id="org.eclipse.wst.common.emf" version="0.0.0"/>
<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.0/"/>
<repository location="https://download.eclipse.org/tm4e/releases/0.8.1/"/>
<repository location="https://download.eclipse.org/lsp4e/releases/0.23.0/"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.0/"/>
<repository location="https://download.eclipse.org/lsp4e/releases/0.24.3/"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
</location>
Expand All @@ -59,7 +58,7 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="Logging" missingManifest="generate" type="Maven">
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="Logging" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand All @@ -68,10 +67,9 @@
<type>jar</type>
</dependency>
<dependency>
<!-- Logback provides a Servlet Container service which is also loaded and that needs servlet (by default optional) -->
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.7</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -87,19 +85,19 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.2-jre</version>
<version>32.1.3-jre</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -173,4 +171,4 @@ Import-Package: !*
</location>
<location type="Target" uri="file:${project_loc:/m2e-core}/target-platform/m2e-runtimes.target"/>
</locations>
</target>
</target>
Loading