Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions avaje-jex-freemarker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>avaje-jex-parent</artifactId>
<groupId>io.avaje</groupId>
<version>3.0-RC10</version>
<version>3.0-RC11</version>
</parent>

<artifactId>avaje-jex-freemarker</artifactId>
Expand All @@ -18,7 +18,6 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jex</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -28,6 +27,12 @@
<version>${freemarker.version}</version>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-spi-service</artifactId>
<scope>provided</scope>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -39,7 +44,6 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jex-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

Expand Down
5 changes: 1 addition & 4 deletions avaje-jex-htmx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,22 @@
<parent>
<groupId>io.avaje</groupId>
<artifactId>avaje-jex-parent</artifactId>
<version>3.0-RC10</version>
<version>3.0-RC11</version>
</parent>

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

<properties>
<avaje-htmx-api.version>2.8</avaje-htmx-api.version>
</properties>

<dependencies>
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-htmx-api</artifactId>
<version>${avaje-htmx-api.version}</version>
</dependency>
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jex</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
10 changes: 8 additions & 2 deletions avaje-jex-mustache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>avaje-jex-parent</artifactId>
<groupId>io.avaje</groupId>
<version>3.0-RC10</version>
<version>3.0-RC11</version>
</parent>

<artifactId>avaje-jex-mustache</artifactId>
Expand All @@ -22,6 +22,13 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-spi-service</artifactId>
<version>2.8</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.github.spullara.mustache.java</groupId>
<artifactId>compiler</artifactId>
Expand All @@ -43,7 +50,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

</project>
2 changes: 1 addition & 1 deletion avaje-jex-static-content/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.avaje</groupId>
<artifactId>avaje-jex-parent</artifactId>
<version>3.0-RC10</version>
<version>3.0-RC11</version>
</parent>
<artifactId>avaje-jex-static-content</artifactId>
<dependencies>
Expand Down
12 changes: 7 additions & 5 deletions avaje-jex-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>avaje-jex-parent</artifactId>
<groupId>io.avaje</groupId>
<version>3.0-RC10</version>
<version>3.0-RC11</version>
</parent>

<artifactId>avaje-jex-test</artifactId>
Expand All @@ -14,21 +14,24 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jex</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>junit</artifactId>
<version>1.5</version>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-http-client</artifactId>
<version>2.9-RC4</version>
</dependency>

<!-- dependency injection component testing -->
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-inject-test</artifactId>
<version>11.0</version>
<optional>true</optional>
</dependency>

Expand All @@ -37,7 +40,6 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>

</dependencies>

</project>
24 changes: 19 additions & 5 deletions avaje-jex/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.avaje</groupId>
<artifactId>avaje-jex-parent</artifactId>
<version>3.0-RC10</version>
<version>3.0-RC11</version>
</parent>

<artifactId>avaje-jex</artifactId>
Expand All @@ -17,17 +17,21 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-config</artifactId>
<version>4.0</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-inject</artifactId>
<version>11.0</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-spi-service</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand All @@ -38,14 +42,24 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jsonb</artifactId>
<version>2.4</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jsonb-generator</artifactId>
<version>2.4</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>junit</artifactId>
<version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-http-client</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package io.avaje.jex.core.json;

import io.avaje.jex.spi.JsonService;
import io.avaje.jsonb.JsonType;
import io.avaje.jsonb.JsonWriter;
import io.avaje.jsonb.Jsonb;

import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Type;
import java.util.Iterator;

import io.avaje.jex.spi.JsonService;
import io.avaje.json.JsonWriter;
import io.avaje.jsonb.JsonType;
import io.avaje.jsonb.Jsonb;

/** Provides JsonService using avaje-jsonb. */
public final class JsonbJsonService implements JsonService {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package io.avaje.jex.core;

import io.avaje.jex.Jex;
import io.avaje.jex.http.BadRequestException;
import io.avaje.jex.http.ErrorCode;
import io.avaje.jex.http.HttpResponseException;
import io.avaje.jsonb.JsonException;

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

import java.net.http.HttpResponse;
import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;

import io.avaje.jex.Jex;
import io.avaje.jex.http.BadRequestException;
import io.avaje.jex.http.ErrorCode;
import io.avaje.jex.http.HttpResponseException;
import io.avaje.json.JsonException;

class ExceptionManagerTest {

Expand Down
9 changes: 4 additions & 5 deletions avaje-jex/src/test/java/io/avaje/jex/core/JsonTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@
import java.util.concurrent.locks.LockSupport;
import java.util.stream.Stream;

import io.avaje.jsonb.Json;
import io.avaje.jsonb.JsonType;
import io.avaje.jsonb.Jsonb;
import io.avaje.jsonb.Types;

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;

import io.avaje.jex.Jex;
import io.avaje.jex.core.json.JacksonJsonService;
import io.avaje.jsonb.Json;
import io.avaje.jsonb.JsonType;
import io.avaje.jsonb.Jsonb;
import io.avaje.jsonb.Types;

public class JsonTest {

Expand Down
2 changes: 1 addition & 1 deletion examples/example-jdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jex</artifactId>
<version>3.0-RC10</version>
<version>3.0-RC11</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion examples/example-robaho/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jex</artifactId>
<version>3.0-RC10</version>
<version>3.0-RC11</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>avaje-jex-parent</artifactId>
<groupId>io.avaje</groupId>
<version>3.0-RC10</version>
<version>3.0-RC11</version>
</parent>

<artifactId>examples</artifactId>
Expand Down
Loading
Loading