This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git
commit 71b31bd93e054025319fbc76d2ee5bf933e4a472 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sat Nov 11 16:33:21 2023 +0100 Bump JDK to Java 17 --- README.md | 4 ++ pom.xml | 175 +++++--------------------------------------------------------- 2 files changed, 16 insertions(+), 163 deletions(-) diff --git a/README.md b/README.md index df34f17..3aea266 100644 --- a/README.md +++ b/README.md @@ -16,3 +16,7 @@ The interfaces can be used by Java applications to perform audit logging. The Audit Service is a web application that allows applications (especially those not written in Java) to perform audit logging while still having ensuring that the audit events conform to the definitions in the catalog. + +## License + +Apache Log4j Audit is distributed under the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). diff --git a/pom.xml b/pom.xml index e4226cd..b6da9bb 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,15 @@ <properties> <revision>1.0.2-SNAPSHOT</revision> + <!-- target Java 8 --> + <maven.compiler.source /> + <maven.compiler.target /> + <maven.compiler.release>8</maven.compiler.release> + + <!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`, which is the parent of us. + `minimalJavaBuildVersion` is used for enforcing the compiler version. --> + <minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.javadoc.failOnError>false</maven.javadoc.failOnError> <classmate.version>1.2.0</classmate.version> @@ -213,57 +222,11 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> - <executions> - <execution> - <id>enforce</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <dependencyConvergence /> - <requireJavaVersion> - <version>[1.8,)</version> - </requireJavaVersion> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <compilerArguments> - <Xmaxwarns>10000</Xmaxwarns> - <Xlint /> - </compilerArguments> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.1</version> - </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.18.1</version> <configuration> - <includes> - <include>**/Test*.java</include> - <include>**/*Test.java</include> - </includes> <excludes> <exclude>**/*FuncTest.java</exclude> </excludes> @@ -274,124 +237,11 @@ <site>${site}</site> </systemPropertyVariables> </configuration> - <executions> - <execution> - <id>default-test</id> - <goals> - <goal>test</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <dependencies> - <dependency> - <groupId>com.nextiva</groupId> - <artifactId>nextiva-build-tools</artifactId> - <version>6.0.0</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>3.4</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.6</version> - </dependency> - </dependencies> </plugin> + </plugins> </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <configuration> - <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation> --> - <configLocation>nextiva/checkstyle.xml</configLocation> - <enableRulesSummary>false</enableRulesSummary> - <propertyExpansion>basedir=${basedir}</propertyExpansion> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>checkstyle</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> - <reportSets> - <reportSet> - <id>non-aggregate</id> - <reports> - <report>javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.8.1</version> - <configuration> - <!-- you'd think these would be the defaults, right? --> - <customBundle>${project.basedir}/src/site/custom/project-info-report.properties</customBundle> - <webAccessUrl>${project.scm.url}</webAccessUrl> - <anonymousConnection>${project.scm.connection}</anonymousConnection> - <developerConnection>${project.scm.developerConnection}</developerConnection> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>index</report> - <report>dependencies</report> - <report>dependency-info</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - <report>license</report> - <report>scm</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.5</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.3</version> - <configuration> - <maxHeap>1024</maxHeap> - <timeout>1800000</timeout> - </configuration> - </plugin> - </plugins> - </reporting> + <profiles> <profile> <id>integration-tests</id> @@ -400,7 +250,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.18.1</version> <configuration> <reuseForks>false</reuseForks> <includes>
