Skip to content
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

Jump to bottom

Fix build issues for Java 17 #112

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build issues for Java 17 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 33 additions & 53 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<artifactId>audit4j-core</artifactId>
<packaging>jar</packaging>
<name>Audit4j - Core</name>
<version>2.7.0</version>
<version>2.6.0</version>
<url>http://audit4j.org</url>
<description>Audit4j - An open-source auditing framework for Java, Core</description>

Expand Down Expand Up @@ -83,9 +83,11 @@
</distributionManagement>

<properties>
<junit.version>4.13.1</junit.version>
<mockito.version>1.10.19</mockito.version>
<commons-lang3.version>3.4</commons-lang3.version>
<junit.version>4.13.2</junit.version>
<mockito.version>4.8.0</mockito.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<dependencies>
Expand All @@ -109,17 +111,17 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.4</version>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.esotericsoftware.yamlbeans</groupId>
<artifactId>yamlbeans</artifactId>
<version>1.09</version>
<version>1.15</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
Expand Down Expand Up @@ -151,7 +153,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>1.2</version>
<version>2.0.SP1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -162,7 +164,7 @@
<dependency>
<groupId>javax.enterprise.concurrent</groupId>
<artifactId>javax.enterprise.concurrent-api</artifactId>
<version>1.0</version>
<version>1.1</version>
</dependency>
<dependency>
<groupId>javax.management.j2ee</groupId>
Expand All @@ -178,7 +180,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -201,20 +203,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>3.4.1</version>
<configuration>
<charset>${file_encoding}</charset>
<encoding>${file_encoding}</encoding>
Expand All @@ -229,9 +231,24 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<archive>
<manifest>
Expand All @@ -248,7 +265,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.3</version>
<version>3.4.2</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
Expand Down Expand Up @@ -285,11 +302,12 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.5</version>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>oss.sonatype.org</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<description>${project.version}</description>
</configuration>
<executions>
Expand All @@ -311,14 +329,6 @@
<tagNameFormat>@{project.version}</tagNameFormat>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -327,36 +337,6 @@
</plugins>
</build>

<!-- Execute this mvn -DperformRelease=true -->
<profiles>
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<reporting>
<plugins>
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/audit4j/core/dto/EventMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public void setClient(String client) {
*
* @return the repository
*/
@Deprecated
public String getRepository() {
return repository;
}
Expand All @@ -55,7 +54,6 @@ public String getRepository() {
* @param repository
* the new repository
*/
@Deprecated
public void setRepository(String repository) {
this.repository = repository;
}
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/audit4j/core/schedule/util/CustomizableThreadCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
*
* <p>
* Serves as base class for thread factories such as
* {@link org.springframework.scheduling.concurrent.CustomizableThreadFactory}.
*
*
* @author Juergen Hoeller
* @since 2.0.3
* @see org.springframework.scheduling.concurrent.CustomizableThreadFactory
*/
@SuppressWarnings("serial")
public class CustomizableThreadCreator implements Serializable {
Expand Down