Skip to content

Commit 707cb1f

Browse files
rbygraverbygrave
committed
Prepare to release of 1.0 generators
1 parent 426ad67 commit 707cb1f

File tree

9 files changed

+27
-64
lines changed

9 files changed

+27
-64
lines changed

‎http-generator-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.avaje</groupId>
99
<artifactId>avaje-http-generator-parent</artifactId>
10-
<version>0.1-SNAPSHOT</version>
10+
<version>1.0-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313

‎http-generator-helidon/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.avaje</groupId>
99
<artifactId>avaje-http-generator-parent</artifactId>
10-
<version>0.1-SNAPSHOT</version>
10+
<version>1.0-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313

‎http-generator-javalin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.avaje</groupId>
99
<artifactId>avaje-http-generator-parent</artifactId>
10-
<version>0.1-SNAPSHOT</version>
10+
<version>1.0-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313

‎pom.xml‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>io.avaje</groupId>
66
<artifactId>avaje-http-generator-parent</artifactId>
7-
<version>0.1-SNAPSHOT</version>
7+
<version>1.0-SNAPSHOT</version>
88
<packaging>pom</packaging>
99

1010
<parent>
@@ -14,48 +14,27 @@
1414
</parent>
1515

1616
<scm>
17-
<developerConnection>scm:git:git@github.com:dinject/dinject-controller.git</developerConnection>
17+
<developerConnection>scm:git:git@github.com:avaje/avaje-http.git</developerConnection>
1818
<tag>HEAD</tag>
1919
</scm>
2020

2121
<dependencies>
2222
<dependency>
23-
<groupId>org.junit.jupiter</groupId>
24-
<artifactId>junit-jupiter-api</artifactId>
25-
<version>5.6.2</version>
26-
<scope>test</scope>
27-
</dependency>
28-
29-
<dependency>
30-
<groupId>org.junit.jupiter</groupId>
31-
<artifactId>junit-jupiter-engine</artifactId>
32-
<version>5.6.2</version>
33-
<scope>test</scope>
34-
</dependency>
35-
36-
<dependency>
37-
<groupId>org.assertj</groupId>
38-
<artifactId>assertj-core</artifactId>
39-
<version>3.16.1</version>
40-
<scope>test</scope>
41-
</dependency>
42-
43-
<dependency>
44-
<groupId>org.mockito</groupId>
45-
<artifactId>mockito-core</artifactId>
46-
<version>2.18.3</version>
23+
<groupId>org.avaje.composite</groupId>
24+
<artifactId>junit</artifactId>
25+
<version>5.0</version>
4726
<scope>test</scope>
4827
</dependency>
4928

5029
</dependencies>
5130

5231
<modules>
53-
<module>http-api</module>
32+
<!-- <module>http-api</module>-->
5433
<module>http-generator-core</module>
5534
<module>http-generator-javalin</module>
5635
<module>http-generator-helidon</module>
5736
<!-- <module>http-generator-client</module>-->
58-
<module>tests</module>
37+
<!-- <module>tests</module>-->
5938
</modules>
6039

6140
</project>

‎tests/test-helidon/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
<properties>
1818
<mainClass>org.example.Main</mainClass>
1919
<helidon-version>2.0.1</helidon-version>
20-
<avaje-inject-version>0.9</avaje-inject-version>
21-
<avaje-http-version>0.1-SNAPSHOT</avaje-http-version>
20+
<avaje-http-version>1.0-SNAPSHOT</avaje-http-version>
2221
</properties>
2322

2423
<dependencies>
@@ -37,17 +36,17 @@
3736
<dependency>
3837
<groupId>io.avaje</groupId>
3938
<artifactId>avaje-http-api</artifactId>
40-
<version>0.1</version>
39+
<version>1.0</version>
4140
</dependency>
4241
<dependency>
4342
<groupId>io.avaje</groupId>
4443
<artifactId>avaje-inject</artifactId>
45-
<version>${avaje-inject-version}</version>
44+
<version>1.0</version>
4645
</dependency>
4746
<dependency>
4847
<groupId>io.avaje</groupId>
4948
<artifactId>avaje-inject-generator</artifactId>
50-
<version>${avaje-inject-version}</version>
49+
<version>1.0</version>
5150
<scope>provided</scope>
5251
</dependency>
5352

@@ -116,7 +115,7 @@
116115
<dependency>
117116
<groupId>io.avaje</groupId>
118117
<artifactId>avaje-http-client</artifactId>
119-
<version>0.1</version>
118+
<version>0.5</version>
120119
<scope>test</scope>
121120
</dependency>
122121

‎tests/test-helidon/src/test/java/org/example/BaseWebTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static void shutdown() {
2828
public static HttpClientContext client() {
2929
return HttpClientContext.newBuilder()
3030
.withBaseUrl(baseUrl)
31-
.withRequestListener(new RequestLogger())
31+
.withResponseListener(new RequestLogger())
3232
.withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
3333
//.with(httpClient)
3434
.build();

‎tests/test-javalin/pom.xml‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
<main.class>org.example.myapp.Main</main.class>
1919
<swagger.version>2.0.8</swagger.version>
2020
<kotlin.version>1.3.31</kotlin.version>
21-
<avaje-inject-version>0.9</avaje-inject-version>
22-
<avaje-http-version>0.1-SNAPSHOT</avaje-http-version>
21+
<avaje-http-version>1.0-SNAPSHOT</avaje-http-version>
2322
</properties>
2423

2524
<dependencies>
@@ -45,19 +44,19 @@
4544
<dependency>
4645
<groupId>io.avaje</groupId>
4746
<artifactId>avaje-inject</artifactId>
48-
<version>0.9</version>
47+
<version>1.0</version>
4948
</dependency>
5049

5150
<dependency>
5251
<groupId>io.avaje</groupId>
5352
<artifactId>avaje-http-api</artifactId>
54-
<version>0.1</version>
53+
<version>1.0</version>
5554
</dependency>
5655

5756
<dependency>
5857
<groupId>io.avaje</groupId>
5958
<artifactId>avaje-http-hibernate-validator</artifactId>
60-
<version>0.9</version>
59+
<version>1.0</version>
6160
</dependency>
6261

6362
<dependency>
@@ -71,7 +70,7 @@
7170
<dependency>
7271
<groupId>io.avaje</groupId>
7372
<artifactId>avaje-inject-generator</artifactId>
74-
<version>0.9</version>
73+
<version>1.0</version>
7574
<scope>provided</scope>
7675
</dependency>
7776

@@ -85,23 +84,9 @@
8584

8685
<!-- test dependencies -->
8786
<dependency>
88-
<groupId>org.junit.jupiter</groupId>
89-
<artifactId>junit-jupiter-api</artifactId>
90-
<version>5.6.2</version>
91-
<scope>test</scope>
92-
</dependency>
93-
94-
<dependency>
95-
<groupId>org.junit.jupiter</groupId>
96-
<artifactId>junit-jupiter-engine</artifactId>
97-
<version>5.6.2</version>
98-
<scope>test</scope>
99-
</dependency>
100-
101-
<dependency>
102-
<groupId>org.assertj</groupId>
103-
<artifactId>assertj-core</artifactId>
104-
<version>3.16.1</version>
87+
<groupId>org.avaje.composite</groupId>
88+
<artifactId>junit</artifactId>
89+
<version>5.0</version>
10590
<scope>test</scope>
10691
</dependency>
10792

@@ -115,7 +100,7 @@
115100
<dependency>
116101
<groupId>io.avaje</groupId>
117102
<artifactId>avaje-http-client</artifactId>
118-
<version>0.1</version>
103+
<version>0.5</version>
119104
<scope>test</scope>
120105
</dependency>
121106

‎tests/test-javalin/src/test/java/org/example/myapp/BaseWebTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static void shutdown() {
2828
public static HttpClientContext client() {
2929
return HttpClientContext.newBuilder()
3030
.withBaseUrl(baseUrl)
31-
.withRequestListener(new RequestLogger())
31+
.withResponseListener(new RequestLogger())
3232
.withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
3333
//.with(httpClient)
3434
.build();

‎tests/test-javalin/src/test/java/org/example/myapp/HelloControllerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class HelloControllerTest extends BaseWebTest {
3636

3737
this.clientContext = HttpClientContext.newBuilder()
3838
.withBaseUrl(baseUrl)
39-
.withRequestListener(new RequestLogger())
39+
.withResponseListener(new RequestLogger())
4040
.withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
4141
.with(httpClient)
4242
.build();

0 commit comments

Comments
 (0)