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

fix security issues due to transitive dependency icu4j #790

Closed
wants to merge 4 commits into from
Closed

fix security issues due to transitive dependency icu4j #790

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
80a5cb0
fix security issues due to transitive dependency icu4j
anshbansal May 5, 2022
ee52ece
lower antlr4 to 4.9.3 to see compatibility with Java 8
anshbansal May 6, 2022
cea1ece
reduce the version which compiles
anshbansal May 11, 2022
b801bc7
fix wrong annotation
anshbansal May 19, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ When updating the changelog, remember to be very clear about what behavior has c
and what APIs have changed, if applicable.

## [Unreleased]
- Update antlr dependency to fix security issues.

## [29.33.6] - 2022-05-03
- Provide a mechanism to set a routing hint for the d2 request to get request symbol table.
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ apply from: environmentScript
apply from: "${buildScriptDirPath}/configBuildScript.gradle"

project.ext.externalDependency = [
'antlr': 'org.antlr:antlr4:4.5',
'antlrRuntime': 'org.antlr:antlr4-runtime:4.5',
'antlr': 'org.antlr:antlr4:4.6',
'antlrRuntime': 'org.antlr:antlr4-runtime:4.6',
'avro': 'org.apache.avro:avro:1.9.2',
'avro_1_6': 'org.apache.avro:avro:1.6.3',
// avro compatibility layer
Expand Down
4 changes: 2 additions & 2 deletions d2/src/main/java/com/linkedin/d2/discovery/stores/zk/acl/AclAwareZookeeper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.linkedin.d2.discovery.stores.zk.ZKPersistentConnection;
import com.linkedin.d2.discovery.stores.zk.ZooKeeper;
import java.util.List;
import org.antlr.v4.runtime.misc.NotNull;
import org.apache.zookeeper.AsyncCallback;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
Expand All @@ -30,6 +29,7 @@
import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nonnull;


/**
Expand All @@ -44,7 +44,7 @@ public class AclAwareZookeeper extends AbstractZooKeeper

private final ZKAclProvider _aclProvider;

public AclAwareZookeeper(@NotNull ZooKeeper zooKeeper, @NotNull ZKAclProvider aclProvider)
public AclAwareZookeeper(@Nonnull ZooKeeper zooKeeper, @Nonnull ZKAclProvider aclProvider)
{
super(zooKeeper);
_aclProvider = aclProvider;
Expand Down