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 pebble dependency #3126

Merged
merged 5 commits into from
Feb 21, 2024
Merged

Update pebble dependency #3126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c00fb49
pin updated pebble version
rakow Feb 21, 2024
89c9dfc
exclude old pebble version
rakow Feb 21, 2024
dec4489
exclude some unneeded dependencies
rakow Feb 21, 2024
43d1c6c
fix incorrect use of jcommander dependency
rakow Feb 21, 2024
116ff35
remove needed exclusion
rakow Feb 21, 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
13 changes: 13 additions & 0 deletions contribs/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<artifactId>gtfs2matsim</artifactId>
<version>master-33809c4f0f-1</version>
<exclusions>
<!-- Exclude unneeded dependencies and these with known CVE -->
<exclusion>
<groupId>org.geotools</groupId>
<artifactId>*</artifactId>
Expand All @@ -87,6 +88,18 @@
<groupId>org.matsim</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.amazonaws</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.graphql-java</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.postgresql</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion contribs/application/src/main/java/org/matsim/application/analysis/traffic/LinkStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.matsim.application.analysis.traffic;

import com.beust.jcommander.internal.Lists;
import com.google.common.collect.Lists;
import it.unimi.dsi.fastutil.doubles.DoubleArrayList;
import it.unimi.dsi.fastutil.doubles.DoubleList;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
Expand Down
4 changes: 2 additions & 2 deletions contribs/application/src/main/java/org/matsim/application/prepare/CreateLandUseShp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.matsim.application.prepare;

import com.beust.jcommander.internal.Lists;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.geotools.data.DataStore;
Expand All @@ -24,6 +23,7 @@
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -90,7 +90,7 @@ public Integer call() throws Exception {
STRtree index = new STRtree();
boolean built = false;

List<Path> paths = Lists.newArrayList();
List<Path> paths =new ArrayList<>();
if (input.toString().endsWith("zip")) {
FileSystem fs = FileSystems.newFileSystem(input, ClassLoader.getSystemClassLoader());
for (String l : layer) {
Expand Down
12 changes: 12 additions & 0 deletions contribs/simwrapper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@
<dependency>
<groupId>tech.tablesaw</groupId>
<artifactId>tablesaw-jsplot</artifactId>
<exclusions>
<exclusion>
<groupId>io.pebbletemplates</groupId>
<artifactId>pebble</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Pinned this version, as older one is not compatible with java 21, newer ones might be incompatible -->
<dependency>
<groupId>io.pebbletemplates</groupId>
<artifactId>pebble</artifactId>
<version>3.1.6</version>
</dependency>

<dependency>
Expand Down