Skip to content

Commit 6a9d2a1

Browse files
committed
update dependencies
1 parent 22f3fcc commit 6a9d2a1

File tree

6 files changed

+21
-31
lines changed

6 files changed

+21
-31
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Inflector uses the following libraries:
3131

3232
- swagger models for the swagger definition
3333
- Jackson for JSON processing
34-
- Jersey 2.32 for REST
34+
- Jersey 2.39 for REST
3535
- Minimum Java 8
3636

3737
### Integration

pom.xml

+9-16
Original file line numberDiff line numberDiff line change
@@ -389,12 +389,6 @@
389389
<artifactId>slf4j-api</artifactId>
390390
<version>${slf4j-version}</version>
391391
</dependency>
392-
<!-- Utils -->
393-
<dependency>
394-
<groupId>commons-lang</groupId>
395-
<artifactId>commons-lang</artifactId>
396-
<version>${commons-lang-version}</version>
397-
</dependency>
398392

399393
<!-- Test -->
400394
<dependency>
@@ -479,24 +473,23 @@
479473
<dependency>
480474
<groupId>org.apache.commons</groupId>
481475
<artifactId>commons-lang3</artifactId>
482-
<version>${commons-string-utils-version}</version>
476+
<version>${commons-lang-version}</version>
483477
</dependency>
484478
</dependencies>
485479
<properties>
486480
<maven-javadoc-version>3.0.1</maven-javadoc-version>
487-
<swagger-core-version>2.2.4</swagger-core-version>
488-
<swagger-parser-version>2.1.5</swagger-parser-version>
489-
<jackson.version>2.13.4</jackson.version>
490-
<jetty-version>9.4.39.v20210325</jetty-version>
491-
<jersey2-version>2.32</jersey2-version>
481+
<swagger-core-version>2.2.8</swagger-core-version>
482+
<swagger-parser-version>2.1.12</swagger-parser-version>
483+
<jackson.version>2.14.2</jackson.version>
484+
<jetty-version>9.4.51.v20230217</jetty-version>
485+
<jersey2-version>2.39</jersey2-version>
492486
<servlet-api-version>3.1.0</servlet-api-version>
493487
<commons-io-version>2.11.0</commons-io-version>
494-
<commons-string-utils-version>3.12.0</commons-string-utils-version>
495-
<commons-lang-version>2.6</commons-lang-version>
496-
<commons-csv-version>1.9.0</commons-csv-version>
488+
<commons-lang-version>3.12.0</commons-lang-version>
489+
<commons-csv-version>1.10.0</commons-csv-version>
497490
<json-schema-validator-version>2.2.14</json-schema-validator-version>
498491

499-
<logback-version>1.2.10</logback-version>
492+
<logback-version>1.4.5</logback-version>
500493
<junit-version>4.13.2</junit-version>
501494
<slf4j-version>1.7.36</slf4j-version>
502495
<jmockit-version>1.19</jmockit-version>

scripts/bin/jetty-runner.jar

4.73 MB
Binary file not shown.

scripts/pom.xml

+7-6
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<plugin>
5959
<groupId>org.codehaus.mojo</groupId>
6060
<artifactId>build-helper-maven-plugin</artifactId>
61-
<version>1.9.1</version>
61+
<version>3.3.0</version>
6262
<executions>
6363
<execution>
6464
<id>add-source</id>
@@ -91,7 +91,7 @@
9191
<plugin>
9292
<groupId>org.apache.maven.plugins</groupId>
9393
<artifactId>maven-jar-plugin</artifactId>
94-
<version>2.4</version>
94+
<version>2.6</version>
9595
<configuration>
9696
<excludes>
9797
<exclude>**/logback.xml</exclude>
@@ -117,6 +117,7 @@
117117
<scanTarget>src/main/swagger/openapi.yaml</scanTarget>
118118
</scanTargets>
119119
<scanIntervalSeconds>1</scanIntervalSeconds>
120+
<supportedPackagings>jar</supportedPackagings>
120121
<webApp>
121122
<contextPath>/</contextPath>
122123
</webApp>
@@ -173,10 +174,10 @@
173174
</dependency>
174175
</dependencies>
175176
<properties>
176-
<jetty-version>9.4.11.v20180605</jetty-version>
177-
<logback-version>1.0.1</logback-version>
178-
<junit-version>4.8.2</junit-version>
179-
<slf4j-version>1.6.3</slf4j-version>
177+
<jetty-version>9.4.51.v20230217</jetty-version>
178+
<logback-version>1.4.5</logback-version>
179+
<junit-version>4.13.2</junit-version>
180+
<slf4j-version>1.7.36</slf4j-version>
180181
<codegen-version>2.1.4</codegen-version>
181182
</properties>
182183
</project>

src/main/java/io/swagger/oas/inflector/processors/BinaryProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.commons.fileupload.MultipartStream;
3030
import org.apache.commons.io.FileUtils;
3131
import org.apache.commons.io.IOUtils;
32-
import org.apache.commons.lang.StringUtils;
32+
import org.apache.commons.lang3.StringUtils;
3333
import org.slf4j.Logger;
3434
import org.slf4j.LoggerFactory;
3535

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

122122
}else if (parameters[i].getRawClass().equals(byte[].class)){
123-
123+
124124
argument = IOUtils.toByteArray(entityStream);
125125

126126
}

src/main/java/io/swagger/oas/inflector/utils/ReflectionUtils.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,14 @@
4343
import io.swagger.v3.oas.models.parameters.RequestBody;
4444
import io.swagger.v3.core.util.Json;
4545

46-
import org.apache.commons.lang.StringUtils;
46+
import org.apache.commons.lang3.StringUtils;
4747
import org.joda.time.DateTime;
4848
import org.joda.time.LocalDate;
4949
import org.slf4j.Logger;
5050
import org.slf4j.LoggerFactory;
5151

52-
53-
54-
import java.io.File;
5552
import java.io.InputStream;
5653
import java.math.BigDecimal;
57-
import java.nio.ByteBuffer;
5854
import java.util.*;
5955

6056
public class ReflectionUtils {
@@ -537,4 +533,4 @@ private JavaType getTypeFromModelName(String name) {
537533
public interface ClassNameValidator {
538534
boolean isValidClassname( String classname );
539535
}
540-
}
536+
}

0 commit comments

Comments
 (0)