Skip to content

Commit d1ad2f8

Browse files
authored
Merge pull request #125 from Fishbowler/deps
Dependency Updates
2 parents 3dec2f5 + ba1a39f commit d1ad2f8

3 files changed

Lines changed: 23 additions & 5 deletions

File tree

.dependency-check-suppressions.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3+
<suppress>
4+
<notes><![CDATA[
5+
file name: jakarta.annotation-api-1.3.5.jar
6+
]]></notes>
7+
<packageUrl regex="true">^pkg:maven/jakarta\.annotation/jakarta\.annotation\-api@.*$</packageUrl>
8+
<cpe>cpe:/a:projects_project:projects</cpe>
9+
</suppress>
10+
</suppressions>

changelog.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ <h1>
4646

4747
<p><b>1.8.3</b> ???</p>
4848
<ul>
49+
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/124'>#124</a>] - Update dependency-check-maven to 7.1.1</li>
50+
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/123'>#123</a>] - Suppress false positive in Dependency Check</li>
51+
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/122'>#122</a>] - Update mockito to 4.6.1</li>
52+
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/121'>#121</a>] - Update Swagger to 2.2.1</li>
53+
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/120'>#120</a>] - Update Jersey to 2.36</li>
4954
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/118'>#118</a>] - Cannot retrieve full list of rooms following #113</li>
5055
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/113'>#113</a>] - MUC search including naturalName</li>
5156
</ul>

pom.xml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</licenses>
2222

2323
<properties>
24-
<jersey.version>2.35</jersey.version>
24+
<jersey.version>2.36</jersey.version>
2525
</properties>
2626

2727
<developers>
@@ -72,12 +72,12 @@
7272
<dependency>
7373
<groupId>io.swagger.core.v3</groupId>
7474
<artifactId>swagger-jaxrs2</artifactId>
75-
<version>2.1.11</version>
75+
<version>2.2.1</version>
7676
</dependency>
7777
<dependency>
7878
<groupId>io.swagger.core.v3</groupId>
7979
<artifactId>swagger-jaxrs2-servlet-initializer-v2</artifactId>
80-
<version>2.1.11</version>
80+
<version>2.2.1</version>
8181
</dependency>
8282

8383
<!-- Testing scope dependencies -->
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>org.mockito</groupId>
100100
<artifactId>mockito-core</artifactId>
101-
<version>4.3.1</version>
101+
<version>4.6.1</version>
102102
<scope>test</scope>
103103
</dependency>
104104

@@ -112,10 +112,13 @@
112112
<plugin>
113113
<groupId>org.owasp</groupId>
114114
<artifactId>dependency-check-maven</artifactId>
115-
<version>6.5.0</version>
115+
<version>7.1.1</version>
116116
<configuration>
117117
<skipProvidedScope>true</skipProvidedScope>
118118
<skipRuntimeScope>true</skipRuntimeScope>
119+
<suppressionFiles>
120+
<suppressionFile>.dependency-check-suppressions.xml</suppressionFile>
121+
</suppressionFiles>
119122
</configuration>
120123
<executions>
121124
<execution>

0 commit comments

Comments
 (0)