Skip to content

Commit d571b2b

Browse files
jknackjknack
authored
Merge pull request #672 from jooby-project/b564
Add requery module fix #564
2 parents d55792e + 7508cd8 commit d571b2b

6 files changed

Lines changed: 1465 additions & 3 deletions

File tree

‎coverage-report/pom.xml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
54

65
<parent>
76
<groupId>org.jooby</groupId>
@@ -88,6 +87,7 @@
8887
<source>${project.parent.basedir}/jooby-thymeleaf/src/main/java</source>
8988
<source>${project.parent.basedir}/jooby-filewatcher/src/main/java</source>
9089
<source>${project.parent.basedir}/jooby-lang-js/src/main/java</source>
90+
<source>${project.parent.basedir}/jooby-requery/src/main/java</source>
9191
</sources>
9292
</configuration>
9393
</execution>
@@ -150,6 +150,7 @@
150150
<source>${project.parent.basedir}/jooby-thymeleaf/src/test/java</source>
151151
<source>${project.parent.basedir}/jooby-filewatcher/src/test/java</source>
152152
<source>${project.parent.basedir}/jooby-lang-js/src/test/java</source>
153+
<source>${project.parent.basedir}/jooby-requery/src/test/java</source>
153154
</sources>
154155
</configuration>
155156
</execution>
@@ -556,6 +557,12 @@
556557
<version>${project.version}</version>
557558
</dependency>
558559

560+
<dependency>
561+
<groupId>org.jooby</groupId>
562+
<artifactId>jooby-requery</artifactId>
563+
<version>${project.version}</version>
564+
</dependency>
565+
559566
<dependency>
560567
<groupId>org.jooby</groupId>
561568
<artifactId>jooby-ebean</artifactId>
@@ -777,6 +784,12 @@
777784
<version>${jetty.version}</version>
778785
</dependency>
779786

787+
<dependency>
788+
<groupId>io.reactivex.rxjava2</groupId>
789+
<artifactId>rxjava</artifactId>
790+
<version>2.0.7</version>
791+
</dependency>
792+
780793
</dependencies>
781794

782795
</project>

‎jooby-requery/pom.xml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
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>
4+
<parent>
5+
<groupId>org.jooby</groupId>
6+
<artifactId>jooby-project</artifactId>
7+
<version>1.0.4-SNAPSHOT</version>
8+
</parent>
9+
<artifactId>jooby-requery</artifactId>
10+
<name>requery module</name>
11+
<description>https://github.com/requery/requery</description>
12+
13+
<dependencies>
14+
<!-- Jooby jdbc -->
15+
<dependency>
16+
<groupId>org.jooby</groupId>
17+
<artifactId>jooby-jdbc</artifactId>
18+
</dependency>
19+
20+
<dependency>
21+
<groupId>io.requery</groupId>
22+
<artifactId>requery</artifactId>
23+
</dependency>
24+
25+
<dependency>
26+
<groupId>org.slf4j</groupId>
27+
<artifactId>jul-to-slf4j</artifactId>
28+
<version>${slf4j-api.version}</version>
29+
</dependency>
30+
31+
<dependency>
32+
<groupId>io.projectreactor</groupId>
33+
<artifactId>reactor-core</artifactId>
34+
<scope>compile</scope>
35+
</dependency>
36+
37+
<!-- Test dependencies -->
38+
<dependency>
39+
<groupId>org.jooby</groupId>
40+
<artifactId>jooby</artifactId>
41+
<version>${project.version}</version>
42+
<scope>test</scope>
43+
<classifier>tests</classifier>
44+
</dependency>
45+
46+
<dependency>
47+
<groupId>junit</groupId>
48+
<artifactId>junit</artifactId>
49+
<scope>test</scope>
50+
</dependency>
51+
52+
<dependency>
53+
<groupId>org.easymock</groupId>
54+
<artifactId>easymock</artifactId>
55+
<scope>test</scope>
56+
</dependency>
57+
58+
<dependency>
59+
<groupId>org.powermock</groupId>
60+
<artifactId>powermock-api-easymock</artifactId>
61+
<scope>test</scope>
62+
</dependency>
63+
64+
<dependency>
65+
<groupId>org.powermock</groupId>
66+
<artifactId>powermock-module-junit4</artifactId>
67+
<scope>test</scope>
68+
</dependency>
69+
70+
<dependency>
71+
<groupId>org.jacoco</groupId>
72+
<artifactId>org.jacoco.agent</artifactId>
73+
<classifier>runtime</classifier>
74+
<scope>test</scope>
75+
</dependency>
76+
77+
<dependency>
78+
<groupId>io.reactivex.rxjava2</groupId>
79+
<artifactId>rxjava</artifactId>
80+
<version>2.0.7</version>
81+
<scope>test</scope>
82+
</dependency>
83+
84+
</dependencies>
85+
</project>

0 commit comments

Comments
 (0)