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

Bump org.eclipse.jdt:ecj from 3.36.0 to 3.37.0 #3603

Merged
merged 4 commits into from
Mar 15, 2024
Merged

Bump org.eclipse.jdt:ecj from 3.36.0 to 3.37.0 #3603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
526f50f
Bump org.eclipse.jdt:ecj from 3.36.0 to 3.37.0
dependabot[bot] Mar 15, 2024
261777d
Bump org.eclipse.jdt:org.eclipse.jdt.core from 3.36.0 to 3.37.0
dependabot[bot] Mar 12, 2024
c4da3d9
Bump org.eclipse.pde:org.eclipse.pde.core from 3.17.200 to 3.18.0
dependabot[bot] Mar 12, 2024
041da63
Fix compilation
akurtakov Mar 15, 2024
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<!-- When updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
<surefire-version>3.2.5</surefire-version>
<equinoxVersion>3.19.0</equinoxVersion>
<ecjVersion>3.36.0</ecjVersion>
<ecjVersion>3.37.0</ecjVersion>
<bnd.version>7.0.0</bnd.version>
<!-- these are referenced from src/main/resources/META-INF/plexus/components.xml -->
<resources-plugin.version>3.3.1</resources-plugin.version>
Expand Down
4 changes: 2 additions & 2 deletions tycho-apitools-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.core</artifactId>
<version>3.17.200</version>
<version>3.18.0</version>
<type>jar</type>
<exclusions>
<exclusion>
Expand All @@ -67,7 +67,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.36.0</version>
<version>3.37.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
Expand Down
4 changes: 2 additions & 2 deletions tycho-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,12 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.36.0</version>
<version>3.37.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.core</artifactId>
<version>3.17.200</version>
<version>3.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion tycho-eclipse-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.core</artifactId>
<version>3.17.200</version>
<version>3.18.0</version>
<type>jar</type>
<exclusions>
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion tycho-extras/tycho-document-bundle-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.core</artifactId>
<version>3.17.200</version>
<version>3.18.0</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions ...in/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.io.Serializable;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
Expand All @@ -50,7 +51,6 @@
import org.eclipse.pde.internal.core.schema.Schema;
import org.eclipse.pde.internal.core.schema.SchemaDescriptor;
import org.eclipse.pde.internal.core.schema.SchemaProvider;
import org.eclipse.pde.internal.core.util.HeaderMap;
import org.osgi.framework.Constants;

/**
Expand Down Expand Up @@ -164,7 +164,7 @@ private String getPluginID(File manifest) {

if (OSGiFile.exists()) {
try (FileInputStream manifestStream = new FileInputStream(OSGiFile)) {
Map<String, String> headers = ManifestElement.parseBundleManifest(manifestStream, new HeaderMap<>());
Map<String, String> headers = ManifestElement.parseBundleManifest(manifestStream, new HashMap<>());
String value = headers.get(Constants.BUNDLE_SYMBOLICNAME);
if (value == null) {
return null;
Expand Down
2 changes: 1 addition & 1 deletion tycho-its/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.36.0</version>
<version>3.37.0</version>
<scope>test</scope>
</dependency>
<!-- update site tests -->
Expand Down
Loading