Skip to content

Commit

Permalink
Merge pull request #43 from catenasys/feature/organise-by-module-prop…
Browse files Browse the repository at this point in the history 
…erly

Feature/organise by module properly
  • Loading branch information
@ryan-s-roberts
ryan-s-roberts authored Oct 27, 2021
2 parents 9031bd0 + 4b07257 commit 454c4c4
Show file tree
Hide file tree
Showing 47 changed files with 1,390 additions and 1,265 deletions.
253 changes: 128 additions & 125 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,137 +1,140 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>daml-on</artifactId>
<groupId>daml-on</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>core</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<description>Shared artifacts for daml integrations</description>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>daml-on</artifactId>
<groupId>daml-on</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>core</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<description>Shared artifacts for daml integrations</description>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scala.lang.version>2.13</scala.lang.version>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scala.lang.version>2.13</scala.lang.version>
</properties>


<dependencyManagement>
<dependencies>
<!-- Resilience -->
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-all</artifactId>
<version>1.7.1</version>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-retry</artifactId>
<version>1.7.1</version>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-bulkhead</artifactId>
<version>1.7.1</version>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-circuitbreaker</artifactId>
<version>1.7.1</version>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-rxjava3</artifactId>
<version>1.7.1</version>
<exclusions>
<exclusion>
<groupId>io.reactivex.rxjava3</groupId>
<artifactId>rxjava</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- Logging -->
<!-- SLF4J Bindings should only be included in "main" projects and test scope -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>kr.pe.kwonnam.slf4j-lambda</groupId>
<artifactId>slf4j-lambda-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependencies>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- Rx -->
<dependency>
<groupId>io.reactivex.rxjava3</groupId>
<artifactId>rxjava</artifactId>
</dependency>
<!-- AWS -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>netty-nio-client</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>qldb</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.qldb</groupId>
<artifactId>amazon-qldb-driver-java</artifactId>
</dependency>
<!-- Logging -->
<!-- SLF4J Bindings should only be included in "main" projects and test
scope -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>kr.pe.kwonnam.slf4j-lambda</groupId>
<artifactId>slf4j-lambda-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>

<!-- DAML Dependencies -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>com.daml</groupId>
<artifactId>participant-state_${scala.lang.version}</artifactId>
</dependency>
<dependency>
<groupId>com.daml</groupId>
<artifactId>ledger-api-auth_${scala.lang.version}</artifactId>
</dependency>
<dependency>
<groupId>com.daml</groupId>
<artifactId>participant-state-kvutils_${scala.lang.version}</artifactId>
</dependency>
<dependency>
<groupId>com.daml</groupId>
<artifactId>participant-state-kvutils-app_${scala.lang.version}</artifactId>
</dependency>
<!-- Rx -->
<dependency>
<groupId>io.reactivex.rxjava3</groupId>
<artifactId>rxjava</artifactId>
</dependency>

<!-- Resilience -->
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-all</artifactId>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-retry</artifactId>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-circuitbreaker</artifactId>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-bulkhead</artifactId>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-rxjava3</artifactId>
</dependency>
</dependencies>
<!-- DAML Dependencies -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>com.daml</groupId>
<artifactId>participant-state_${scala.lang.version}</artifactId>
</dependency>
<dependency>
<groupId>com.daml</groupId>
<artifactId>ledger-api-auth_${scala.lang.version}</artifactId>
</dependency>
<dependency>
<groupId>com.daml</groupId>
<artifactId>participant-state-kvutils_${scala.lang.version}</artifactId>
</dependency>
<dependency>
<groupId>com.daml</groupId>
<artifactId>participant-state-kvutils-app_${scala.lang.version}</artifactId>
</dependency>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>com.blockchaintp.daml.postgres.Main</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<!-- Resilience -->
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-all</artifactId>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-retry</artifactId>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-circuitbreaker</artifactId>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-bulkhead</artifactId>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-rxjava3</artifactId>
</dependency>
</dependencies>
</project>
3 changes: 0 additions & 3 deletions core/src/test/java/com/blockchaintp/daml/stores/layers/SplitStoreTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/
package com.blockchaintp.daml.stores.layers;

import com.amazon.ion.system.IonSystemBuilder;
import com.blockchaintp.daml.stores.exception.StoreReadException;
import com.blockchaintp.daml.stores.exception.StoreWriteException;
import com.blockchaintp.daml.stores.service.Key;
Expand All @@ -25,7 +24,6 @@
import org.junit.jupiter.api.Test;

import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -57,7 +55,6 @@ void unindexed_put_enters_hash_into_txlog_after_storing_in_blobstore()
@Test
void indexed_put_enters_hash_into_txlog_after_storing_in_blobStore_and_also_stores_index()
throws StoreWriteException, StoreReadException {
var ion = IonSystemBuilder.standard().build();
var txLog = new com.blockchaintp.daml.stores.StubStore<ByteString, ByteString>();
var blobStore = new com.blockchaintp.daml.stores.StubStore<ByteString, ByteString>();

Expand Down
Loading

0 comments on commit 454c4c4

Please sign in to comment.