Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@yamass
yamass committed Sep 9, 2024
1 parent 86f266e commit c96aa92
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 36 deletions.
31 changes: 15 additions & 16 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,10 @@
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
<slf4j-version>2.0.9</slf4j-version>
<jackson-version>2.16.0</jackson-version>
<guava-version>31.1-jre</guava-version>
<apache-commons-io>2.15.1</apache-commons-io>
<slf4j-version>2.0.16</slf4j-version>
<jackson-version>2.17.2</jackson-version>
<guava-version>33.2.0-jre</guava-version>
<apache-commons-io>2.16.1</apache-commons-io>
<junit.version>4.13.2</junit.version>
<cloning.version>1.9.9</cloning.version>
</properties>
Expand All @@ -73,19 +72,19 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<version>3.26.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.0</version>
<version>4.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.5.1</version>
<version>5.13.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -165,7 +164,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.17.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -210,7 +209,7 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>13.0</version>
<version>24.1.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -231,7 +230,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.13.0</version>
<configuration>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
Expand All @@ -241,7 +240,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.1.1</version>
<configuration>
<!-- see https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven -->
<mavenExecutorId>forked-path</mavenExecutorId>
Expand All @@ -256,7 +255,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand All @@ -275,7 +274,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>3.8.0</version>
<executions>
<execution>
<id>generate-javadoc-jar</id>
Expand All @@ -295,7 +294,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>generate-sources-jar</id>
Expand Down Expand Up @@ -385,7 +384,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.2.3</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
2 changes: 1 addition & 1 deletion teamapps-client/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "teamapps-client",
"version": "0.9.191-SNAPSHOT",
"version": "0.9.192-SNAPSHOT",
"description": "teamapps",
"author": "TeamApps.org",
"main": "dist/js/main.js",
Expand Down
8 changes: 4 additions & 4 deletions teamapps-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
<version>3.4.0</version>
<configuration>
<filesets>
<fileset>
Expand All @@ -57,7 +57,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.6</version>
<version>1.15.0</version>
<configuration>
<nodeVersion>v14.17.3</nodeVersion>
<yarnVersion>v1.22.5</yarnVersion>
Expand Down Expand Up @@ -106,7 +106,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin-version}</version>
<version>3.7.1</version>
<executions>
<execution>
<id>create-project-bundle</id>
Expand All @@ -127,7 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<version>3.1.0</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down
2 changes: 1 addition & 1 deletion teamapps-server-jetty-embedded/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</developers>

<properties>
<jetty.version>12.0.2</jetty.version>
<jetty.version>12.0.12</jetty.version>
</properties>

<dependencies>
Expand Down
20 changes: 11 additions & 9 deletions ...mbedded/src/main/java/org/teamapps/server/jetty/embedded/TeamAppsJettyEmbeddedServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
import org.teamapps.ux.servlet.TeamAppsServletContextListener;
import org.teamapps.webcontroller.WebController;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;

Expand All @@ -44,24 +44,24 @@ public class TeamAppsJettyEmbeddedServer {
public static final int DEFAULT_PORT = 8080;

private final TeamAppsCore teamAppsCore;
private final File webAppDirectory;
private final Path webAppDirectory;
private final List<ServletContextListener> customServletContextListeners = new ArrayList<>();

private final Server server;
private final WebAppContext webapp;

public TeamAppsJettyEmbeddedServer(WebController webController, File webAppDirectory, TeamAppsConfiguration config, int port, boolean globalGzipCompression) {
public TeamAppsJettyEmbeddedServer(WebController webController, Path webAppDirectory, TeamAppsConfiguration config, int port, boolean globalGzipCompression) {
teamAppsCore = new TeamAppsCore(config, new CompletableFutureChainSequentialExecutorFactory(config.getMaxNumberOfSessionExecutorThreads()), webController);
this.webAppDirectory = webAppDirectory;

server = new Server(port);
webapp = new WebAppContext();
webapp.setClassLoader(TeamAppsJettyEmbeddedServer.class.getClassLoader());
webapp.setConfigurations(new Configuration[]{new WebXmlConfiguration()});
webapp.getServerClassMatcher().exclude("org.eclipse.jetty.");
webapp.getHiddenClassMatcher().exclude("org.eclipse.jetty.");
webapp.setContextPath("/");
webapp.addEventListener(new TeamAppsServletContextListener(teamAppsCore));
webapp.setBaseResourceAsPath(webAppDirectory.getAbsoluteFile().toPath());
webapp.setBaseResourceAsPath(webAppDirectory.toAbsolutePath());
webapp.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
webapp.setInitParameter("org.eclipse.jetty.servlet.Default.precompressed", "true");
// The following will not actually set the secure flag on the cookie if the session is started without encryption.
Expand Down Expand Up @@ -98,7 +98,7 @@ public void addServletContextListener(ServletContextListener servletContextListe
}

public void start() throws Exception {
ClientCodeExtractor.initializeWebserverDirectory(webAppDirectory);
ClientCodeExtractor.initializeWebserverDirectory(webAppDirectory.toFile());
customServletContextListeners.forEach(webapp::addEventListener);
server.start();
server.join();
Expand All @@ -115,7 +115,7 @@ public static Builder builder(WebController webController) {
public static class Builder {

private final WebController webController;
private File webAppDirectory;
private Path webAppDirectory;
private TeamAppsConfiguration config = new TeamAppsConfiguration();
private int port = DEFAULT_PORT;
private boolean globalGzipCompression;
Expand All @@ -124,7 +124,7 @@ public Builder(WebController webController) {
this.webController = webController;
}

public Builder setWebAppDirectory(File webAppDirectory) {
public Builder setWebAppDirectory(Path webAppDirectory) {
this.webAppDirectory = webAppDirectory;
return this;
}
Expand All @@ -146,8 +146,10 @@ public Builder setGlobalGzipCompression(boolean globalGzipCompression) {

public TeamAppsJettyEmbeddedServer build() throws IOException {
if (webAppDirectory == null) {
webAppDirectory = Files.createTempDirectory("teamapps").toFile();
webAppDirectory = Files.createTempDirectory("teamapps");
}
webAppDirectory = webAppDirectory.toRealPath();

return new TeamAppsJettyEmbeddedServer(webController, webAppDirectory, config, port, globalGzipCompression);
}
}
Expand Down
2 changes: 1 addition & 1 deletion teamapps-server-undertow-embedded/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</developers>

<properties>
<undertow.version>2.3.8.Final</undertow.version>
<undertow.version>2.3.15.Final</undertow.version>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions teamapps-ui-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
<version>3.4.0</version>
<configuration>
<filesets>
<fileset>
Expand All @@ -77,7 +77,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<version>3.3.0</version>
<executions>
<execution>
<id>generate DTOs</id>
Expand Down Expand Up @@ -108,7 +108,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<version>3.5.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand Down
2 changes: 1 addition & 1 deletion teamapps-ui-dsl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</developers>

<properties>
<antlr.version>4.12.0</antlr.version>
<antlr.version>4.13.1</antlr.version>
</properties>

<dependencies>
Expand Down

0 comments on commit c96aa92

Please sign in to comment.