Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump the dependencies group with 6 updates #514

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Bump the dependencies group with 6 updates #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9451927
Bump the dependencies group with 6 updates
dependabot[bot] Nov 18, 2024
dab399a
fix serializer
SentryMan Nov 18, 2024
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
2 changes: 1 addition & 1 deletion htmx-nima/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>io.helidon.webserver</groupId>
<artifactId>helidon-webserver</artifactId>
<version>4.1.3</version>
<version>4.1.4</version>
</dependency>
</dependencies>
</project>
6 changes: 0 additions & 6 deletions http-generator-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-models</artifactId>
Expand Down
20 changes: 13 additions & 7 deletions ...-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,20 @@
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.Map;
import java.util.Set;

final class OpenAPISerializer {

private static final Set<String> IGNORED_FIELDS = Set.of(
"SCHEMA_RESOLUTION_PROPERTY",
"BIND_TYPE_AND_TYPES",
"BINARY_STRING_CONVERSION_PROPERTY",
"COMPONENTS_SCHEMAS_REF",
"APPLY_SCHEMA_RESOLUTION_PROPERTY",
"exampleSetFlag",
"types",
"specVersion");

private OpenAPISerializer() {}

/**
Expand Down Expand Up @@ -65,13 +76,8 @@ static String serialize(Object obj) throws IllegalAccessException {
for (final Field field : fields) {

// skip JsonIgnored fields
if ("SCHEMA_RESOLUTION_PROPERTY".equals(field.getName())
|| "BIND_TYPE_AND_TYPES".equals(field.getName())
|| "BINARY_STRING_CONVERSION_PROPERTY".equals(field.getName())
|| "COMPONENTS_SCHEMAS_REF".equals(field.getName())
|| "exampleSetFlag".equals(field.getName())
|| "types".equals(field.getName())
|| "specVersion".equals(field.getName())) {
if (IGNORED_FIELDS
.contains(field.getName())) {
continue;
}

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

<properties>
<nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
<swagger.version>2.2.25</swagger.version>
<swagger.version>2.2.26</swagger.version>
<jackson.version>2.14.2</jackson.version>
<avaje.prisms.version>1.34</avaje.prisms.version>
<avaje.prisms.version>1.35</avaje.prisms.version>
<module-info.shade>${project.build.directory}${file.separator}module-info.shade</module-info.shade>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<jackson.version>2.18.1</jackson.version>
<jex.version>2.5</jex.version>
<avaje-inject.version>10.5</avaje-inject.version>
<nima.version>4.1.3</nima.version>
<nima.version>4.1.4</nima.version>
<javalin.version>6.3.0</javalin.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion tests/test-javalin-jsonb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<main.class>org.example.myapp.Main</main.class>
<swagger.version>2.2.25</swagger.version>
<swagger.version>2.2.26</swagger.version>
<kotlin.version>1.3.71</kotlin.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion tests/test-javalin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<main.class>org.example.myapp.Main</main.class>
<swagger.version>2.2.25</swagger.version>
<swagger.version>2.2.26</swagger.version>
<kotlin.version>1.3.71</kotlin.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion tests/test-jex/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<main.class>org.example.myapp.Main</main.class>
<jex.version>2.5</jex.version>
<swagger.version>2.2.25</swagger.version>
<swagger.version>2.2.26</swagger.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion tests/test-sigma/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<properties>
<maven.compiler.release>17</maven.compiler.release>
<maven.deploy.skip>true</maven.deploy.skip>
<swagger.version>2.2.25</swagger.version>
<swagger.version>2.2.26</swagger.version>
<kotlin.version>1.3.71</kotlin.version>
</properties>

Expand Down
Loading