Skip to content

Compatible with Openfire 5.0.0. #207

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

Merged
guusdk merged 3 commits into from
Jul 4, 2025
Merged

Compatible with Openfire 5.0.0. #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f518739
Compatible with Openfire 5.0.0.
Jun 27, 2025
247a9c0
Compatible with Openfire 5.0.0.
Jul 4, 2025
29aebc8
Compatible with Openfire 5.0.0, update jersey to 2.45 and swagger to …
Jul 4, 2025
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
1 change: 1 addition & 0 deletions changelog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ <h1>
<ul>
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/203'>#203</a>] - Reduce log level verbosity for some errors.</li>
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/200'>#200</a>] - Fix compatibility issue with Openfire 4.9.0.</li>
<li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/208'>#208</a>] - Fix compatibility issue with Openfire 5.0.0, update jersey to 2.45 and swagger to 2.2.31.</li>
</ul>

<p><b>1.11.0</b> June 25, 2024</p>
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<author>Roman Soldatow</author>
<version>${project.version}</version>
<date>2024-11-17</date>
<minServerVersion>4.8.0</minServerVersion>
<minServerVersion>5.0.0</minServerVersion>
<adminconsole>
<tab id="tab-server">
<sidebar id="sidebar-server-settings">
Expand Down
42 changes: 34 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.igniterealtime.openfire</groupId>
<version>4.8.0</version>
<version>5.0.0</version>
</parent>
<groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>restAPI</artifactId>
Expand All @@ -21,7 +21,8 @@
</licenses>

<properties>
<jersey.version>2.36</jersey.version>
<jersey.version>2.45</jersey.version>
<swagger.version>2.2.31</swagger.version>
</properties>

<developers>
Expand All @@ -37,8 +38,8 @@
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jspc-maven-plugin</artifactId>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-jspc-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Expand All @@ -48,11 +49,31 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty-http</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty-servlet</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
Expand All @@ -72,12 +93,12 @@
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<version>2.2.1</version>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2-servlet-initializer-v2</artifactId>
<version>2.2.1</version>
<version>${swagger.version}</version>
</dependency>

<!-- Testing scope dependencies -->
Expand All @@ -91,7 +112,7 @@
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
<version>2.27</version>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>

Expand All @@ -101,7 +122,12 @@
<version>4.6.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
Expand Down
3 changes: 1 addition & 2 deletions src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ public class AuthFilter implements ContainerRequestFilter {
private HttpServletRequest httpRequest;

/** The plugin. */
private RESTServicePlugin plugin = (RESTServicePlugin) XMPPServer.getInstance().getPluginManager()
.getPlugin("restapi");
private RESTServicePlugin plugin = (RESTServicePlugin) XMPPServer.getInstance().getPluginManager().getPluginByName("REST API").orElse(null);

@Override
public void filter(ContainerRequestContext containerRequest) throws IOException {
Expand Down
Loading