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.

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

updated deps to their latest releases #1707

Merged
merged 1 commit into from
Dec 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 clients/java/zts/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>3.9.6</version>
<version>3.9.8</version>
</dependency>

<!-- Test dependencies -->
Expand Down
13 changes: 12 additions & 1 deletion libs/java/server_common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
<version>2.8.1</version>
<version>2.9.0</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.uuid</groupId>
Expand Down Expand Up @@ -104,6 +110,11 @@
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected PulsarClientImpl getPulsarClient(String serviceUrl, ClientConfiguratio
.setObjectType(DomainChangeMessage.ObjectType.ROLE)
.setApiName("putRole")
.setObjectName("role1");
MessageImpl<byte[]> msg = MessageImpl.create(meta, ByteBuffer.wrap(new ObjectMapper().writeValueAsBytes(roleChange)), Schema.BYTES);
MessageImpl<byte[]> msg = MessageImpl.create(meta, ByteBuffer.wrap(new ObjectMapper().writeValueAsBytes(roleChange)), Schema.BYTES, null);

Mockito.when(consumer.receive(1, TimeUnit.SECONDS))
.thenReturn(msg);
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,21 @@
<jersey.version>2.35</jersey.version>
<jackson.version>2.13.0</jackson.version>
<rdl.version>1.5.4</rdl.version>
<bouncycastle.version>1.69</bouncycastle.version>
<aws.version>1.12.79</aws.version>
<aws2.version>2.17.51</aws2.version>
<bouncycastle.version>1.70</bouncycastle.version>
<aws.version>1.12.129</aws.version>
<aws2.version>2.17.100</aws2.version>
<guava.version>31.0.1-jre</guava.version>
<logback.version>1.2.6</logback.version>
<logback.version>1.2.7</logback.version>
<javax.version>3.1.0</javax.version>
<javax.ws.version>2.1.1</javax.ws.version>
<mockito.version>3.12.4</mockito.version>
<mockito.version>4.2.0</mockito.version>
<jmockit.version>1.49</jmockit.version>
<jjwt.version>0.11.2</jjwt.version>
<jaxb.version>2.3.3</jaxb.version>
<mysql.connector.version>8.0.26</mysql.connector.version>
<mysql.connector.version>8.0.27</mysql.connector.version>
<commons.daemon.version>1.2.4</commons.daemon.version>
<apache.httpclient.version>4.5.13</apache.httpclient.version>
<jboss.resteasy.version>4.7.2.Final</jboss.resteasy.version>
<jboss.resteasy.version>4.7.4.Final</jboss.resteasy.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21651,7 +21651,7 @@ public void testLoadServerPrivateKey() {

// first we try with ec private key only

System.setProperty(FilePrivateKeyStore.ATHENZ_PROP_PRIVATE_EC_KEY, "src/test/resources/unit_test_zms_private.pem");
System.setProperty(FilePrivateKeyStore.ATHENZ_PROP_PRIVATE_EC_KEY, "src/test/resources/unit_test_zms_private_ec.pem");
System.clearProperty(FilePrivateKeyStore.ATHENZ_PROP_PRIVATE_RSA_KEY);
System.clearProperty(FilePrivateKeyStore.ATHENZ_PROP_PRIVATE_KEY);

Expand Down
5 changes: 5 additions & 0 deletions servers/zms/src/test/resources/unit_test_zms_private_ec.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEICPnaShdecLr05bWB6JpkN9FsQURwsjnFfDf6NUpj9WDoAoGCCqGSM49
AwEHoUQDQgAEjTHrARSTlPSGyVpPzcM1XLmv3xecbscCNDKeMKtx0J4BN1XZ5ul5
+oGWL9JdnC8vf7s6IPcxOvIZtH7NFIVn+w==
-----END EC PRIVATE KEY-----