Skip to content

Commit

Permalink
Merge pull request #3 from f-lopes/build/build-optimizations
Browse files Browse the repository at this point in the history 
build: Rework build and upgrade dependencies
  • Loading branch information
@GoncaloPT
GoncaloPT authored Jun 23, 2023
2 parents f19df34 + 0f012a1 commit abebac7
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 106 deletions.
0 Readme.md → README.md
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
<artifactId>akash-java-examples</artifactId>
<version>1.0-SNAPSHOT</version>


<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.quasarch</groupId>
<groupId>cloud.quasarch</groupId>
<artifactId>akash-java</artifactId>
<version>0.1</version>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/java/org/quasarch/akash/examples/ExampleHelper.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.quasarch.akash.examples;

import org.quasarch.akash.Akash;
import org.quasarch.akash.impl.AkashClient;
import cloud.quasarch.akash.impl.Akash;
import cloud.quasarch.akash.impl.AkashClient;

import java.net.URI;
import java.net.http.HttpClient;
Expand Down
4 changes: 3 additions & 1 deletion examples/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
</appender>
<logger name="org.quasarch.akash" level="DEBUG" />
<logger name="org.quasarch.akash.examples" level="DEBUG" />
<root level="debug">

<root level="INFO">
<appender-ref ref="STDOUT" />
</root>

</configuration>


207 changes: 108 additions & 99 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
<version>0.0.1</version>
<packaging>jar</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>Akash network client. Supports communication with akash network. For more information see LINK_HERE for
<description>Akash network client. Supports communication with Akash network. For more information see LINK_HERE for
spec
</description>
<url>http://www.quasarch.cloud/</url>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
Expand All @@ -35,18 +36,112 @@
</scm>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.debuglevel>vars
</maven.compiler.debuglevel>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>

<vavr.version>1.0.0-alpha-4</vavr.version>
<slf4j-api.version>2.0.6</slf4j-api.version>
<jackson.version>2.15.1</jackson.version>

<!-- testing -->
<junit.version>5.9.2</junit.version>
<junit.version>5.9.3</junit.version>
<easymock.version>5.1.0</easymock.version>
<mockito-core>5.0.0</mockito-core>
<jackson.version>2.14.1</jackson.version>
<surefire.verion>3.0.0-M5</surefire.verion>
<surefire.version>3.0.0-M5</surefire.version>
<logback-classic.version>1.4.7</logback-classic.version>
<mockito.version>5.2.0</mockito.version>
</properties>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>io.vavr</groupId>
<artifactId>vavr</artifactId>
<version>${vavr.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>

<!-- testing start -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-junit-jupiter-no-dependencies</artifactId>
<version>5.14.0</version>
</dependency>

<dependency>
<artifactId>easymock</artifactId>
<groupId>org.easymock</groupId>
<optional>false</optional>
<scope>test</scope>
<version>${easymock.version}</version>
</dependency>

<!-- for test logs -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback-classic.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>24.0.1</version>
<scope>compile</scope>
</dependency>
<!-- testing end -->
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<!-- central repository I - includes sources -->
Expand Down Expand Up @@ -120,14 +215,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.verion}</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${surefire.verion}</version>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
Expand All @@ -139,90 +226,12 @@
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>io.vavr</groupId>
<artifactId>vavr</artifactId>
<version>1.0.0-alpha-4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.6</version>
</dependency>


<!-- testing start -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<optional>false</optional>
<scope>test</scope>
<version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-junit-jupiter-no-dependencies</artifactId>
<version>5.14.0</version>
</dependency>
<dependency>
<artifactId>easymock</artifactId>
<groupId>org.easymock</groupId>
<optional>false</optional>
<scope>test</scope>
<version>${easymock.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito-core}</version>
<scope>test</scope>
</dependency>
<!-- for test logs -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>13.0</version>
<scope>compile</scope>
</dependency>
<!-- testing end -->
</dependencies>

<!--
for public maven repository release, only when id is used.
Expand Down
4 changes: 3 additions & 1 deletion src/test/resources/logback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<logger name="cloud.quasarch" level="DEBUG" />
<logger name="cloud.quasarch.akash.impl.pagination" level="TRACE" />

<root level="warn">
<appender-ref ref="STDOUT" />
</root>

</configuration>

0 comments on commit abebac7

Please sign in to comment.