Skip to content

Commit ed5f522

Browse files
SentryManSentryMan
authored
Make parent pom useful (#146)
* make parent pom useful manage the avaje dependencies with the parent pom * Update pom.xml * fix json
1 parent 96e6308 commit ed5f522

File tree

13 files changed

+338
-69
lines changed

13 files changed

+338
-69
lines changed

‎avaje-jex-freemarker/pom.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>avaje-jex-parent</artifactId>
66
<groupId>io.avaje</groupId>
7-
<version>3.0-RC10</version>
7+
<version>3.0-RC11</version>
88
</parent>
99

1010
<artifactId>avaje-jex-freemarker</artifactId>
@@ -18,7 +18,6 @@
1818
<dependency>
1919
<groupId>io.avaje</groupId>
2020
<artifactId>avaje-jex</artifactId>
21-
<version>${project.version}</version>
2221
<scope>provided</scope>
2322
</dependency>
2423

@@ -28,6 +27,12 @@
2827
<version>${freemarker.version}</version>
2928
</dependency>
3029

30+
<dependency>
31+
<groupId>io.avaje</groupId>
32+
<artifactId>avaje-spi-service</artifactId>
33+
<scope>provided</scope>
34+
</dependency>
35+
3136
<!-- test dependencies -->
3237
<dependency>
3338
<groupId>com.fasterxml.jackson.core</groupId>
@@ -39,7 +44,6 @@
3944
<dependency>
4045
<groupId>io.avaje</groupId>
4146
<artifactId>avaje-jex-test</artifactId>
42-
<version>${project.version}</version>
4347
<scope>test</scope>
4448
</dependency>
4549

‎avaje-jex-htmx/pom.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,22 @@
66
<parent>
77
<groupId>io.avaje</groupId>
88
<artifactId>avaje-jex-parent</artifactId>
9-
<version>3.0-RC10</version>
9+
<version>3.0-RC11</version>
1010
</parent>
1111

1212
<artifactId>avaje-jex-htmx</artifactId>
1313

1414
<properties>
15-
<avaje-htmx-api.version>2.8</avaje-htmx-api.version>
1615
</properties>
1716

1817
<dependencies>
1918
<dependency>
2019
<groupId>io.avaje</groupId>
2120
<artifactId>avaje-htmx-api</artifactId>
22-
<version>${avaje-htmx-api.version}</version>
2321
</dependency>
2422
<dependency>
2523
<groupId>io.avaje</groupId>
2624
<artifactId>avaje-jex</artifactId>
27-
<version>${project.version}</version>
2825
</dependency>
2926
</dependencies>
3027

‎avaje-jex-mustache/pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>avaje-jex-parent</artifactId>
66
<groupId>io.avaje</groupId>
7-
<version>3.0-RC10</version>
7+
<version>3.0-RC11</version>
88
</parent>
99

1010
<artifactId>avaje-jex-mustache</artifactId>
@@ -22,6 +22,13 @@
2222
<scope>provided</scope>
2323
</dependency>
2424

25+
<dependency>
26+
<groupId>io.avaje</groupId>
27+
<artifactId>avaje-spi-service</artifactId>
28+
<version>2.8</version>
29+
<scope>provided</scope>
30+
</dependency>
31+
2532
<dependency>
2633
<groupId>com.github.spullara.mustache.java</groupId>
2734
<artifactId>compiler</artifactId>
@@ -43,7 +50,6 @@
4350
<version>${project.version}</version>
4451
<scope>test</scope>
4552
</dependency>
46-
4753
</dependencies>
4854

4955
</project>

‎avaje-jex-static-content/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.avaje</groupId>
77
<artifactId>avaje-jex-parent</artifactId>
8-
<version>3.0-RC10</version>
8+
<version>3.0-RC11</version>
99
</parent>
1010
<artifactId>avaje-jex-static-content</artifactId>
1111
<dependencies>

‎avaje-jex-test/pom.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>avaje-jex-parent</artifactId>
66
<groupId>io.avaje</groupId>
7-
<version>3.0-RC10</version>
7+
<version>3.0-RC11</version>
88
</parent>
99

1010
<artifactId>avaje-jex-test</artifactId>
@@ -14,21 +14,24 @@
1414
<dependency>
1515
<groupId>io.avaje</groupId>
1616
<artifactId>avaje-jex</artifactId>
17-
<version>${project.version}</version>
1817
<scope>provided</scope>
1918
</dependency>
2019

20+
<dependency>
21+
<groupId>io.avaje</groupId>
22+
<artifactId>junit</artifactId>
23+
<version>1.5</version>
24+
</dependency>
25+
2126
<dependency>
2227
<groupId>io.avaje</groupId>
2328
<artifactId>avaje-http-client</artifactId>
24-
<version>2.9-RC4</version>
2529
</dependency>
2630

2731
<!-- dependency injection component testing -->
2832
<dependency>
2933
<groupId>io.avaje</groupId>
3034
<artifactId>avaje-inject-test</artifactId>
31-
<version>11.0</version>
3235
<optional>true</optional>
3336
</dependency>
3437

@@ -37,7 +40,6 @@
3740
<artifactId>jackson-databind</artifactId>
3841
<version>${jackson.version}</version>
3942
</dependency>
40-
4143
</dependencies>
4244

4345
</project>

‎avaje-jex/pom.xml‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.avaje</groupId>
66
<artifactId>avaje-jex-parent</artifactId>
7-
<version>3.0-RC10</version>
7+
<version>3.0-RC11</version>
88
</parent>
99

1010
<artifactId>avaje-jex</artifactId>
@@ -17,17 +17,21 @@
1717
<dependency>
1818
<groupId>io.avaje</groupId>
1919
<artifactId>avaje-config</artifactId>
20-
<version>4.0</version>
2120
<optional>true</optional>
2221
</dependency>
2322

2423
<dependency>
2524
<groupId>io.avaje</groupId>
2625
<artifactId>avaje-inject</artifactId>
27-
<version>11.0</version>
2826
<optional>true</optional>
2927
</dependency>
3028

29+
<dependency>
30+
<groupId>io.avaje</groupId>
31+
<artifactId>avaje-spi-service</artifactId>
32+
<scope>provided</scope>
33+
</dependency>
34+
3135
<dependency>
3236
<groupId>com.fasterxml.jackson.core</groupId>
3337
<artifactId>jackson-databind</artifactId>
@@ -38,14 +42,24 @@
3842
<dependency>
3943
<groupId>io.avaje</groupId>
4044
<artifactId>avaje-jsonb</artifactId>
41-
<version>2.4</version>
4245
<optional>true</optional>
4346
</dependency>
4447

4548
<dependency>
4649
<groupId>io.avaje</groupId>
4750
<artifactId>avaje-jsonb-generator</artifactId>
48-
<version>2.4</version>
51+
<scope>test</scope>
52+
</dependency>
53+
54+
<dependency>
55+
<groupId>io.avaje</groupId>
56+
<artifactId>junit</artifactId>
57+
<version>1.5</version>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>io.avaje</groupId>
62+
<artifactId>avaje-http-client</artifactId>
4963
<scope>test</scope>
5064
</dependency>
5165
</dependencies>

‎avaje-jex/src/main/java/io/avaje/jex/core/json/JsonbJsonService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package io.avaje.jex.core.json;
22

3-
import io.avaje.jex.spi.JsonService;
4-
import io.avaje.jsonb.JsonType;
5-
import io.avaje.jsonb.JsonWriter;
6-
import io.avaje.jsonb.Jsonb;
7-
83
import java.io.InputStream;
94
import java.io.OutputStream;
105
import java.lang.reflect.Type;
116
import java.util.Iterator;
127

8+
import io.avaje.jex.spi.JsonService;
9+
import io.avaje.json.JsonWriter;
10+
import io.avaje.jsonb.JsonType;
11+
import io.avaje.jsonb.Jsonb;
12+
1313
/** Provides JsonService using avaje-jsonb. */
1414
public final class JsonbJsonService implements JsonService {
1515

‎avaje-jex/src/test/java/io/avaje/jex/core/ExceptionManagerTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package io.avaje.jex.core;
22

3-
import io.avaje.jex.Jex;
4-
import io.avaje.jex.http.BadRequestException;
5-
import io.avaje.jex.http.ErrorCode;
6-
import io.avaje.jex.http.HttpResponseException;
7-
import io.avaje.jsonb.JsonException;
8-
9-
import org.junit.jupiter.api.AfterAll;
10-
import org.junit.jupiter.api.Test;
3+
import static org.assertj.core.api.Assertions.assertThat;
114

125
import java.net.http.HttpResponse;
136
import java.util.Map;
147

15-
import static org.assertj.core.api.Assertions.assertThat;
8+
import org.junit.jupiter.api.AfterAll;
9+
import org.junit.jupiter.api.Test;
10+
11+
import io.avaje.jex.Jex;
12+
import io.avaje.jex.http.BadRequestException;
13+
import io.avaje.jex.http.ErrorCode;
14+
import io.avaje.jex.http.HttpResponseException;
15+
import io.avaje.json.JsonException;
1616

1717
class ExceptionManagerTest {
1818

‎avaje-jex/src/test/java/io/avaje/jex/core/JsonTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111
import java.util.concurrent.locks.LockSupport;
1212
import java.util.stream.Stream;
1313

14-
import io.avaje.jsonb.Json;
15-
import io.avaje.jsonb.JsonType;
16-
import io.avaje.jsonb.Jsonb;
17-
import io.avaje.jsonb.Types;
18-
1914
import org.junit.jupiter.api.AfterAll;
2015
import org.junit.jupiter.api.Test;
2116

2217
import io.avaje.jex.Jex;
2318
import io.avaje.jex.core.json.JacksonJsonService;
19+
import io.avaje.jsonb.Json;
20+
import io.avaje.jsonb.JsonType;
21+
import io.avaje.jsonb.Jsonb;
22+
import io.avaje.jsonb.Types;
2423

2524
public class JsonTest {
2625

‎examples/example-jdk/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>io.avaje</groupId>
2626
<artifactId>avaje-jex</artifactId>
27-
<version>3.0-RC10</version>
27+
<version>3.0-RC11</version>
2828
</dependency>
2929

3030
<dependency>

0 commit comments

Comments
 (0)