Skip to content

Commit 1a10f49

Browse files
HugoMarioHugoMario
authored
Merge pull request #12304 from swagger-api/logback-classic-vulnerability
updated logback-classic dependency to fix vulnerability warning
2 parents 1c18d1c + 6cab235 commit 1a10f49

File tree

67 files changed

+131
-4441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+131
-4441
lines changed

‎modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<maven-plugin-version>1.0.0</maven-plugin-version>
146146
<swagger-inflector-version>1.0.14</swagger-inflector-version>
147147
<jetty-version>9.2.9.v20150224</jetty-version>
148-
<logback-version>1.2.9</logback-version>
148+
<logback-version>1.4.14</logback-version>
149149
<junit-version>4.8.2</junit-version>
150150
<slf4j-version>1.6.3</slf4j-version>
151151
</properties>

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
<swagger-core-version>1.5.24</swagger-core-version>
208208
<jetty-version>9.3.27.v20190418</jetty-version>
209209
<junit-version>4.13.1</junit-version>
210-
<logback-version>1.2.9</logback-version>
210+
<logback-version>1.4.14</logback-version>
211211
<servlet-api-version>2.5</servlet-api-version>
212212
{{#useBeanValidation}}
213213
{{#jakarta}}

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
<swagger-core-version>1.5.24</swagger-core-version>
250250
<jetty-version>9.3.27.v20190418</jetty-version>
251251
<junit-version>4.13.1</junit-version>
252-
<logback-version>1.2.9</logback-version>
252+
<logback-version>1.4.14</logback-version>
253253
<servlet-api-version>2.5</servlet-api-version>
254254
{{#useBeanValidation}}
255255
<beanvalidation-version>{{#jakarta}}3.0.2{{/jakarta}}{{^jakarta}}1.1.0.Final{{/jakarta}}</beanvalidation-version>

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
<commons_lang3_version>3.5</commons_lang3_version>
206206
{{/supportJava6}}
207207
<junit-version>4.13.1</junit-version>
208-
<logback-version>1.2.9</logback-version>
208+
<logback-version>1.4.14</logback-version>
209209
<servlet-api-version>2.5</servlet-api-version>
210210
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
211211
</properties>

‎modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<jetty-version>9.2.9.v20150224</jetty-version>
8080
<jersey2-version>2.22.2</jersey2-version>
8181
<junit-version>4.13.1</junit-version>
82-
<logback-version>1.2.9</logback-version>
82+
<logback-version>1.4.14</logback-version>
8383
<servlet-api-version>2.5</servlet-api-version>
8484
<jersey2-version>2.22.2</jersey2-version>
8585
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎modules/swagger-codegen/src/main/resources/undertow/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<version.commons.codec>1.10</version.commons.codec>
2626
<version.encoder>1.2</version.encoder>
2727
<version.metrics>3.1.2</version.metrics>
28-
<version.logback>1.2.9</version.logback>
28+
<version.logback>1.4.14</version.logback>
2929
<version.junit>4.12</version.junit>
3030
<version.mockito>2.1.0-beta.124</version.mockito>
3131
<version.undertow>1.4.0.Final</version.undertow>

‎samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.22-SNAPSHOT
1+
2.4.38-SNAPSHOT

‎samples/client/petstore/jaxrs-cxf-client/pom.xml

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -79,77 +79,77 @@
7979
</plugin>
8080
</plugins>
8181
</build>
82-
<dependencies>
83-
<dependency>
84-
<groupId>io.swagger</groupId>
85-
<artifactId>swagger-jaxrs</artifactId>
86-
<scope>compile</scope>
87-
<version>${swagger-core-version}</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>ch.qos.logback</groupId>
91-
<artifactId>logback-classic</artifactId>
92-
<version>${logback-version}</version>
93-
<scope>compile</scope>
94-
</dependency>
95-
<dependency>
96-
<groupId>ch.qos.logback</groupId>
97-
<artifactId>logback-core</artifactId>
98-
<version>${logback-version}</version>
99-
<scope>compile</scope>
100-
</dependency>
101-
<dependency>
102-
<groupId>junit</groupId>
103-
<artifactId>junit</artifactId>
104-
<version>${junit-version}</version>
105-
<scope>test</scope>
106-
</dependency>
107-
<!-- CXF Client -->
108-
<dependency>
109-
<groupId>org.apache.cxf</groupId>
110-
<artifactId>cxf-rt-rs-client</artifactId>
111-
<version>${cxf-version}</version>
112-
<scope>test</scope>
113-
</dependency>
82+
<dependencies>
83+
<dependency>
84+
<groupId>io.swagger</groupId>
85+
<artifactId>swagger-jaxrs</artifactId>
86+
<scope>compile</scope>
87+
<version>${swagger-core-version}</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>ch.qos.logback</groupId>
91+
<artifactId>logback-classic</artifactId>
92+
<version>${logback-version}</version>
93+
<scope>compile</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>ch.qos.logback</groupId>
97+
<artifactId>logback-core</artifactId>
98+
<version>${logback-version}</version>
99+
<scope>compile</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>junit</groupId>
103+
<artifactId>junit</artifactId>
104+
<version>${junit-version}</version>
105+
<scope>test</scope>
106+
</dependency>
107+
<!-- CXF Client -->
108+
<dependency>
109+
<groupId>org.apache.cxf</groupId>
110+
<artifactId>cxf-rt-rs-client</artifactId>
111+
<version>${cxf-version}</version>
112+
<scope>test</scope>
113+
</dependency>
114114

115-
<!-- CXF server -->
116-
<dependency>
117-
<groupId>org.apache.cxf</groupId>
118-
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
119-
<version>${cxf-version}</version>
120-
<scope>compile</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.apache.cxf</groupId>
124-
<artifactId>cxf-rt-rs-service-description</artifactId>
125-
<version>${cxf-version}</version>
126-
<scope>compile</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.apache.cxf</groupId>
130-
<artifactId>cxf-rt-ws-policy</artifactId>
131-
<version>${cxf-version}</version>
132-
<scope>compile</scope>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.apache.cxf</groupId>
136-
<artifactId>cxf-rt-wsdl</artifactId>
137-
<version>${cxf-version}</version>
138-
<scope>compile</scope>
139-
</dependency>
140-
<dependency>
141-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
142-
<artifactId>jackson-jaxrs-json-provider</artifactId>
143-
<version>${jackson-jaxrs-version}</version>
144-
<scope>compile</scope>
145-
</dependency>
146-
<dependency>
147-
<groupId>com.fasterxml.jackson.datatype</groupId>
148-
<artifactId>jackson-datatype-joda</artifactId>
149-
<version>${jackson-jaxrs-version}</version>
150-
</dependency>
151-
</dependencies>
152-
<repositories>
115+
<!-- CXF server -->
116+
<dependency>
117+
<groupId>org.apache.cxf</groupId>
118+
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
119+
<version>${cxf-version}</version>
120+
<scope>compile</scope>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.apache.cxf</groupId>
124+
<artifactId>cxf-rt-rs-service-description</artifactId>
125+
<version>${cxf-version}</version>
126+
<scope>compile</scope>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.apache.cxf</groupId>
130+
<artifactId>cxf-rt-ws-policy</artifactId>
131+
<version>${cxf-version}</version>
132+
<scope>compile</scope>
133+
</dependency>
134+
<dependency>
135+
<groupId>org.apache.cxf</groupId>
136+
<artifactId>cxf-rt-wsdl</artifactId>
137+
<version>${cxf-version}</version>
138+
<scope>compile</scope>
139+
</dependency>
140+
<dependency>
141+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
142+
<artifactId>jackson-jaxrs-json-provider</artifactId>
143+
<version>${jackson-jaxrs-version}</version>
144+
<scope>compile</scope>
145+
</dependency>
146+
<dependency>
147+
<groupId>com.fasterxml.jackson.datatype</groupId>
148+
<artifactId>jackson-datatype-joda</artifactId>
149+
<version>${jackson-jaxrs-version}</version>
150+
</dependency>
151+
</dependencies>
152+
<repositories>
153153
<repository>
154154
<id>sonatype-snapshots</id>
155155
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -158,14 +158,14 @@
158158
</snapshots>
159159
</repository>
160160
</repositories>
161-
<properties>
161+
<properties>
162162
<java.version>1.7</java.version>
163163
<maven.compiler.source>${java.version}</maven.compiler.source>
164164
<maven.compiler.target>${java.version}</maven.compiler.target>
165165
<swagger-core-version>1.5.24</swagger-core-version>
166166
<jetty-version>9.3.27.v20190418</jetty-version>
167167
<junit-version>4.13.1</junit-version>
168-
<logback-version>1.2.9</logback-version>
168+
<logback-version>1.4.14</logback-version>
169169
<servlet-api-version>2.5</servlet-api-version>
170170
<cxf-version>3.2.1</cxf-version>
171171
<jackson-jaxrs-version>2.11.4</jackson-jaxrs-version>

‎samples/client/petstore/jaxrs-cxf/.swagger-codegen-ignore

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)