Skip to content

Commit

Permalink
Update dependencies (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
@StrongestNumber9
StrongestNumber9 committed Mar 13, 2024
1 parent 33a4038 commit 5376677
Show file tree
Hide file tree
Showing 25 changed files with 179 additions and 242 deletions.
98 changes: 48 additions & 50 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,184 +8,179 @@
<version>${revision}${sha1}${changelist}</version>
<name>cfe_16</name>
<description>cfe_16</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.6.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>com.teragrep</groupId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<start-class>com.teragrep.cfe_16.Cfe16Application</start-class>
<aspectj.version>1.9.2</aspectj.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<revision>0.0.1</revision>
<changelist>-SNAPSHOT</changelist>
<sha1/>
<aspectj.version>1.9.21.1</aspectj.version>
<log4j.version>2.23.1</log4j.version>
<spring.boot.version>3.2.3</spring.boot.version>
<spring.session.version>3.2.1</spring.session.version>
<junit.version>5.10.2</junit.version>
<junit.platform.version>1.10.2</junit.platform.version>
<rlp_01.version>4.0.1</rlp_01.version>
<rlp_03.version>3.0.0</rlp_03.version>
<javax.servlet.version>4.0.1</javax.servlet.version>
<jackson.version>2.16.2</jackson.version>
</properties>

<dependencies>
<!-- //patching for CVE-2021-44228\\ -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.1</version>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.16.0</version>
<version>${log4j.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet.version}</version>
</dependency>
<!-- \\patching for CVE-2021-44228// -->

<dependency>
<groupId>com.teragrep</groupId>
<artifactId>rlp_01</artifactId>
<version>4.0.1</version>
<version>${rlp_01.version}</version>
</dependency>
<dependency>
<groupId>com.teragrep</groupId>
<artifactId>rlp_03</artifactId>
<version>1.7.8</version>
<version>${rlp_03.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>

<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<version>${spring.boot.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<version>${spring.boot.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>${spring.boot.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-core</artifactId>
<version>${spring.session.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-jdbc</artifactId>
<version>${spring.session.version}</version>
</dependency>

<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>${aspectj.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>${aspectj.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.cloudbees</groupId>
<artifactId>syslog-java-client</artifactId>
<version>1.1.7</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>

<dependency>
<groupId>systems.manifold</groupId>
<artifactId>manifold-all</artifactId>
<version>RELEASE</version>
<version>2024.1.6</version>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>2.0.2</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.2.1</version>
<version>5.1.9</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>

</dependencies>


<build>
<directory>${project.basedir}/target</directory>
<finalName>cfe_16</finalName>
Expand Down Expand Up @@ -273,9 +268,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>3.2.3</version>
<configuration>
<mainClass>com.teragrep.cfe_16.Cfe16Application</mainClass>
<agent>${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</agent>
<agents>${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</agents>
</configuration>
<executions>
<execution>
Expand All @@ -288,18 +284,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<configuration>
<threadCount>1</threadCount>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.2.5</version>
<executions>
<execution>
<id>integration-tests</id>
Expand Down
2 changes: 1 addition & 1 deletion rpm/rpm.pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
Expand Down
19 changes: 8 additions & 11 deletions src/main/java/com/teragrep/cfe_16/AckManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,20 @@

package com.teragrep.cfe_16;

import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import javax.annotation.PostConstruct;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

import com.teragrep.cfe_16.bo.Ack;
import com.teragrep.cfe_16.config.Configuration;
import com.teragrep.cfe_16.exceptionhandling.InternalServerErrorException;
import com.teragrep.cfe_16.exceptionhandling.ServerIsBusyException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

/*
* Manager that handles the acknowledgement status of the sent events (acks).
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/teragrep/cfe_16/Converter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,13 @@

package com.teragrep.cfe_16;

import com.teragrep.cfe_16.bo.HeaderInfo;
import com.teragrep.cfe_16.bo.HttpEventData;
import org.springframework.stereotype.Component;

import com.cloudbees.syslog.Facility;
import com.cloudbees.syslog.SDElement;
import com.cloudbees.syslog.Severity;
import com.cloudbees.syslog.SyslogMessage;
import com.teragrep.cfe_16.bo.HeaderInfo;
import com.teragrep.cfe_16.bo.HttpEventData;
import org.springframework.stereotype.Component;

/*
* Converts HTTP Event Data into a Syslog message.
Expand Down
23 changes: 10 additions & 13 deletions src/main/java/com/teragrep/cfe_16/EventManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,29 @@

package com.teragrep.cfe_16;

import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

import javax.annotation.PostConstruct;

import com.teragrep.cfe_16.bo.HttpEventData;
import com.teragrep.cfe_16.bo.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import com.cloudbees.syslog.SyslogMessage;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.gson.JsonStreamParser;

import com.teragrep.cfe_16.bo.Ack;
import com.teragrep.cfe_16.bo.HeaderInfo;
import com.teragrep.cfe_16.bo.HttpEventData;
import com.teragrep.cfe_16.bo.Session;
import com.teragrep.cfe_16.config.Configuration;
import com.teragrep.cfe_16.exceptionhandling.EventFieldBlankException;
import com.teragrep.cfe_16.exceptionhandling.EventFieldMissingException;
import com.teragrep.cfe_16.exceptionhandling.InternalServerErrorException;
import com.teragrep.cfe_16.sender.AbstractSender;
import com.teragrep.cfe_16.sender.SenderFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

/*
* Manager that handles the event sent in a request.
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/teragrep/cfe_16/RequestHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,9 @@

package com.teragrep.cfe_16;

import javax.servlet.http.HttpServletRequest;

import org.springframework.stereotype.Component;

import com.teragrep.cfe_16.bo.HeaderInfo;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Component;

/**
*
Expand Down

0 comments on commit 5376677

Please sign in to comment.