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

update dependencies #439

Merged
merged 1 commit into from
Mar 11, 2023
Merged

update dependencies #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Inflector uses the following libraries:

- swagger models for the swagger definition
- Jackson for JSON processing
- Jersey 2.32 for REST
- Jersey 2.39 for REST
- Minimum Java 8

### Integration
Expand Down
25 changes: 9 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,12 +389,6 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
</dependency>
<!-- Utils -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang-version}</version>
</dependency>

<!-- Test -->
<dependency>
Expand Down Expand Up @@ -479,24 +473,23 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-string-utils-version}</version>
<version>${commons-lang-version}</version>
</dependency>
</dependencies>
<properties>
<maven-javadoc-version>3.0.1</maven-javadoc-version>
<swagger-core-version>2.2.4</swagger-core-version>
<swagger-parser-version>2.1.5</swagger-parser-version>
<jackson.version>2.13.4</jackson.version>
<jetty-version>9.4.39.v20210325</jetty-version>
<jersey2-version>2.32</jersey2-version>
<swagger-core-version>2.2.8</swagger-core-version>
<swagger-parser-version>2.1.12</swagger-parser-version>
<jackson.version>2.14.2</jackson.version>
<jetty-version>9.4.51.v20230217</jetty-version>
<jersey2-version>2.39</jersey2-version>
<servlet-api-version>3.1.0</servlet-api-version>
<commons-io-version>2.11.0</commons-io-version>
<commons-string-utils-version>3.12.0</commons-string-utils-version>
<commons-lang-version>2.6</commons-lang-version>
<commons-csv-version>1.9.0</commons-csv-version>
<commons-lang-version>3.12.0</commons-lang-version>
<commons-csv-version>1.10.0</commons-csv-version>
<json-schema-validator-version>2.2.14</json-schema-validator-version>

<logback-version>1.2.10</logback-version>
<logback-version>1.4.5</logback-version>
<junit-version>4.13.2</junit-version>
<slf4j-version>1.7.36</slf4j-version>
<jmockit-version>1.19</jmockit-version>
Expand Down
Binary file modified scripts/bin/jetty-runner.jar
View file
Open in desktop
Binary file not shown.
13 changes: 7 additions & 6 deletions scripts/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>add-source</id>
Expand Down Expand Up @@ -91,7 +91,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>2.6</version>
<configuration>
<excludes>
<exclude>**/logback.xml</exclude>
Expand All @@ -117,6 +117,7 @@
<scanTarget>src/main/swagger/openapi.yaml</scanTarget>
</scanTargets>
<scanIntervalSeconds>1</scanIntervalSeconds>
<supportedPackagings>jar</supportedPackagings>
<webApp>
<contextPath>/</contextPath>
</webApp>
Expand Down Expand Up @@ -173,10 +174,10 @@
</dependency>
</dependencies>
<properties>
<jetty-version>9.4.11.v20180605</jetty-version>
<logback-version>1.0.1</logback-version>
<junit-version>4.8.2</junit-version>
<slf4j-version>1.6.3</slf4j-version>
<jetty-version>9.4.51.v20230217</jetty-version>
<logback-version>1.4.5</logback-version>
<junit-version>4.13.2</junit-version>
<slf4j-version>1.7.36</slf4j-version>
<codegen-version>2.1.4</codegen-version>
</properties>
</project>
4 changes: 2 additions & 2 deletions src/main/java/io/swagger/oas/inflector/processors/BinaryProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.apache.commons.fileupload.MultipartStream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -120,7 +120,7 @@ public Object process(MediaType mediaType, InputStream entityStream, Class<?> c
argument = file;

}else if (parameters[i].getRawClass().equals(byte[].class)){

argument = IOUtils.toByteArray(entityStream);

}
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/io/swagger/oas/inflector/utils/ReflectionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,14 @@
import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.core.util.Json;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;



import java.io.File;
import java.io.InputStream;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.util.*;

public class ReflectionUtils {
Expand Down Expand Up @@ -537,4 +533,4 @@ private JavaType getTypeFromModelName(String name) {
public interface ClassNameValidator {
boolean isValidClassname( String classname );
}
}
}