Skip to content

Commit df6446f

Browse files
alaisialaisi
authored
Merge pull request #44 from iferca/rxjava_1-3-0_upgrade
Dependencies updates
2 parents a05af06 + 28ed1ad commit df6446f

File tree

2 files changed

+94
-93
lines changed

2 files changed

+94
-93
lines changed

‎pom.xml

Lines changed: 92 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,103 @@
1-
<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">
2-
<modelVersion>4.0.0</modelVersion>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
34

4-
<parent>
5-
<groupId>org.sonatype.oss</groupId>
6-
<artifactId>oss-parent</artifactId>
7-
<version>9</version>
8-
</parent>
5+
<parent>
6+
<groupId>org.sonatype.oss</groupId>
7+
<artifactId>oss-parent</artifactId>
8+
<version>9</version>
9+
</parent>
910

10-
<groupId>com.github.alaisi.pgasync</groupId>
11-
<artifactId>postgres-async-driver</artifactId>
12-
<version>0.10-SNAPSHOT</version>
11+
<groupId>com.github.alaisi.pgasync</groupId>
12+
<artifactId>postgres-async-driver</artifactId>
13+
<version>0.10-SNAPSHOT</version>
1314

14-
<name>postgres-async-driver</name>
15-
<description>Asynchronous PostgreSQL Java driver</description>
15+
<name>postgres-async-driver</name>
16+
<description>Asynchronous PostgreSQL Java driver</description>
1617

17-
<url>https://github.com/alaisi/postgres-async-driver</url>
18-
<inceptionYear>2014</inceptionYear>
19-
<developers>
20-
<developer>
21-
<name>Antti Laisi</name>
22-
<url>https://github.com/alaisi</url>
23-
</developer>
24-
</developers>
25-
<licenses>
26-
<license>
27-
<name>Apache License 2.0</name>
28-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
29-
</license>
30-
</licenses>
18+
<url>https://github.com/alaisi/postgres-async-driver</url>
19+
<inceptionYear>2014</inceptionYear>
20+
<developers>
21+
<developer>
22+
<name>Antti Laisi</name>
23+
<url>https://github.com/alaisi</url>
24+
</developer>
25+
</developers>
26+
<licenses>
27+
<license>
28+
<name>Apache License 2.0</name>
29+
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
30+
</license>
31+
</licenses>
3132

32-
<scm>
33-
<connection>scm:git:git@github.com:alaisi/postgres-async-driver.git</connection>
34-
<developerConnection>scm:git:git@github.com:alaisi/postgres-async-driver.git</developerConnection>
35-
<url>git@github.com:alaisi/postgres-async-driver.git</url>
36-
</scm>
37-
<issueManagement>
38-
<system>github</system>
39-
<url>https://github.com/alaisi/postgres-async-driver/issues</url>
40-
</issueManagement>
33+
<scm>
34+
<connection>scm:git:git@github.com:alaisi/postgres-async-driver.git</connection>
35+
<developerConnection>scm:git:git@github.com:alaisi/postgres-async-driver.git</developerConnection>
36+
<url>git@github.com:alaisi/postgres-async-driver.git</url>
37+
</scm>
38+
<issueManagement>
39+
<system>github</system>
40+
<url>https://github.com/alaisi/postgres-async-driver/issues</url>
41+
</issueManagement>
4142

42-
<prerequisites>
43-
<maven>3.3</maven>
44-
</prerequisites>
43+
<prerequisites>
44+
<maven>3.3</maven>
45+
</prerequisites>
4546

46-
<build>
47-
<plugins>
48-
<plugin>
49-
<groupId>org.apache.maven.plugins</groupId>
50-
<artifactId>maven-compiler-plugin</artifactId>
51-
<version>3.5.1</version>
52-
<configuration>
53-
<source>1.8</source>
54-
<target>1.8</target>
55-
</configuration>
56-
</plugin>
57-
<plugin>
58-
<groupId>org.codehaus.mojo</groupId>
59-
<artifactId>findbugs-maven-plugin</artifactId>
60-
<version>3.0.4</version>
61-
<configuration>
62-
<findbugsXmlOutput>true</findbugsXmlOutput>
63-
<effort>Max</effort>
64-
<threshold>Low</threshold>
65-
</configuration>
66-
</plugin>
67-
</plugins>
68-
</build>
47+
<build>
48+
<plugins>
49+
<plugin>
50+
<groupId>org.apache.maven.plugins</groupId>
51+
<artifactId>maven-compiler-plugin</artifactId>
52+
<version>3.5.1</version>
53+
<configuration>
54+
<source>1.8</source>
55+
<target>1.8</target>
56+
</configuration>
57+
</plugin>
58+
<plugin>
59+
<groupId>org.codehaus.mojo</groupId>
60+
<artifactId>findbugs-maven-plugin</artifactId>
61+
<version>3.0.4</version>
62+
<configuration>
63+
<findbugsXmlOutput>true</findbugsXmlOutput>
64+
<effort>Max</effort>
65+
<threshold>Low</threshold>
66+
</configuration>
67+
</plugin>
68+
</plugins>
69+
</build>
6970

70-
<dependencies>
71-
<dependency>
72-
<groupId>io.netty</groupId>
73-
<artifactId>netty-handler</artifactId>
74-
<version>4.1.6.Final</version>
75-
</dependency>
76-
<dependency>
77-
<groupId>io.reactivex</groupId>
78-
<artifactId>rxjava</artifactId>
79-
<version>1.2.1</version>
80-
</dependency>
81-
<dependency>
82-
<groupId>com.google.code.findbugs</groupId>
83-
<artifactId>annotations</artifactId>
84-
<version>3.0.1u2</version>
85-
<scope>provided</scope>
86-
</dependency>
71+
<dependencies>
72+
<dependency>
73+
<groupId>io.netty</groupId>
74+
<artifactId>netty-handler</artifactId>
75+
<version>4.1.11.Final</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>io.reactivex</groupId>
79+
<artifactId>rxjava</artifactId>
80+
<version>1.3.0</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>com.google.code.findbugs</groupId>
84+
<artifactId>annotations</artifactId>
85+
<version>3.0.1u2</version>
86+
<scope>provided</scope>
87+
</dependency>
8788

88-
<dependency>
89-
<groupId>junit</groupId>
90-
<artifactId>junit</artifactId>
91-
<version>4.12</version>
92-
<scope>test</scope>
93-
</dependency>
94-
<dependency>
95-
<groupId>ru.yandex.qatools.embed</groupId>
96-
<artifactId>postgresql-embedded</artifactId>
97-
<version>1.16</version>
98-
<scope>test</scope>
99-
</dependency>
100-
</dependencies>
89+
<dependency>
90+
<groupId>junit</groupId>
91+
<artifactId>junit</artifactId>
92+
<version>4.12</version>
93+
<scope>test</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>ru.yandex.qatools.embed</groupId>
97+
<artifactId>postgresql-embedded</artifactId>
98+
<version>2.1</version>
99+
<scope>test</scope>
100+
</dependency>
101+
</dependencies>
101102

102103
</project>

‎src/test/java/com/github/pgasync/impl/DatabaseRule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static java.lang.System.getenv;
44
import static java.lang.System.out;
5-
import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_5_0;
5+
import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_6_2;
66

77
import com.github.pgasync.ConnectionPool;
88
import com.github.pgasync.ConnectionPoolBuilder;
@@ -47,7 +47,7 @@ class DatabaseRule extends ExternalResource {
4747
try
4848
{
4949
PostgresStarter<PostgresExecutable, PostgresProcess> runtime = PostgresStarter.getDefaultInstance();
50-
PostgresConfig config = new PostgresConfig(V9_5_0, new AbstractPostgresConfig.Net(),
50+
PostgresConfig config = new PostgresConfig(V9_6_2, new AbstractPostgresConfig.Net(),
5151
new AbstractPostgresConfig.Storage("async-pg"), new AbstractPostgresConfig.Timeout(),
5252
new AbstractPostgresConfig.Credentials("async-pg", "async-pg"));
5353
PostgresExecutable exec = runtime.prepare(config);

0 commit comments

Comments
 (0)