Skip to content

Commit

Permalink
Merge pull request #44 from iferca/rxjava_1-3-0_upgrade
Browse files Browse the repository at this point in the history 
Dependencies updates
  • Loading branch information
@alaisi
alaisi authored May 22, 2017
2 parents a05af06 + 28ed1ad commit df6446f
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 93 deletions.
183 changes: 92 additions & 91 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,103 @@
<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">
<modelVersion>4.0.0</modelVersion>
<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>

<groupId>com.github.alaisi.pgasync</groupId>
<artifactId>postgres-async-driver</artifactId>
<version>0.10-SNAPSHOT</version>
<groupId>com.github.alaisi.pgasync</groupId>
<artifactId>postgres-async-driver</artifactId>
<version>0.10-SNAPSHOT</version>

<name>postgres-async-driver</name>
<description>Asynchronous PostgreSQL Java driver</description>
<name>postgres-async-driver</name>
<description>Asynchronous PostgreSQL Java driver</description>

<url>https://github.com/alaisi/postgres-async-driver</url>
<inceptionYear>2014</inceptionYear>
<developers>
<developer>
<name>Antti Laisi</name>
<url>https://github.com/alaisi</url>
</developer>
</developers>
<licenses>
<license>
<name>Apache License 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<url>https://github.com/alaisi/postgres-async-driver</url>
<inceptionYear>2014</inceptionYear>
<developers>
<developer>
<name>Antti Laisi</name>
<url>https://github.com/alaisi</url>
</developer>
</developers>
<licenses>
<license>
<name>Apache License 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>

<scm>
<connection>scm:git:[email protected]:alaisi/postgres-async-driver.git</connection>
<developerConnection>scm:git:[email protected]:alaisi/postgres-async-driver.git</developerConnection>
<url>[email protected]:alaisi/postgres-async-driver.git</url>
</scm>
<issueManagement>
<system>github</system>
<url>https://github.com/alaisi/postgres-async-driver/issues</url>
</issueManagement>
<scm>
<connection>scm:git:[email protected]:alaisi/postgres-async-driver.git</connection>
<developerConnection>scm:git:[email protected]:alaisi/postgres-async-driver.git</developerConnection>
<url>[email protected]:alaisi/postgres-async-driver.git</url>
</scm>
<issueManagement>
<system>github</system>
<url>https://github.com/alaisi/postgres-async-driver/issues</url>
</issueManagement>

<prerequisites>
<maven>3.3</maven>
</prerequisites>
<prerequisites>
<maven>3.3</maven>
</prerequisites>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<effort>Max</effort>
<threshold>Low</threshold>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<effort>Max</effort>
<threshold>Low</threshold>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.6.Final</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<version>3.0.1u2</version>
<scope>provided</scope>
</dependency>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.11.Final</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<version>3.0.1u2</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ru.yandex.qatools.embed</groupId>
<artifactId>postgresql-embedded</artifactId>
<version>1.16</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ru.yandex.qatools.embed</groupId>
<artifactId>postgresql-embedded</artifactId>
<version>2.1</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
4 changes: 2 additions & 2 deletions src/test/java/com/github/pgasync/impl/DatabaseRule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static java.lang.System.getenv;
import static java.lang.System.out;
import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_5_0;
import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_6_2;

import com.github.pgasync.ConnectionPool;
import com.github.pgasync.ConnectionPoolBuilder;
Expand Down Expand Up @@ -47,7 +47,7 @@ class DatabaseRule extends ExternalResource {
try
{
PostgresStarter<PostgresExecutable, PostgresProcess> runtime = PostgresStarter.getDefaultInstance();
PostgresConfig config = new PostgresConfig(V9_5_0, new AbstractPostgresConfig.Net(),
PostgresConfig config = new PostgresConfig(V9_6_2, new AbstractPostgresConfig.Net(),
new AbstractPostgresConfig.Storage("async-pg"), new AbstractPostgresConfig.Timeout(),
new AbstractPostgresConfig.Credentials("async-pg", "async-pg"));
PostgresExecutable exec = runtime.prepare(config);
Expand Down

0 comments on commit df6446f

Please sign in to comment.