diff --git a/header-template.txt b/header-template.txt deleted file mode 100644 index 6213a95..0000000 --- a/header-template.txt +++ /dev/null @@ -1,10 +0,0 @@ -======================================================================== -Copyright (c) ${project.inceptionYear} Mort Bay Consulting Pty Ltd and others. - -This program and the accompanying materials are made available under the -terms of the Eclipse Public License v. 2.0 which is available at -https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 -which is available at https://www.apache.org/licenses/LICENSE-2.0. - -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 -======================================================================== diff --git a/pom.xml b/pom.xml index a24deff..7bfb0ed 100644 --- a/pom.xml +++ b/pom.xml @@ -1,45 +1,42 @@ + + 4.0.0 org.eclipse.jetty.toolchain jetty-toolchain - 1.7 + 1.8-parent-SNAPSHOT - 4.0.0 org.eclipse.jetty.toolchain.setuid jetty-setuid-jna 2.0.3-SNAPSHOT - Jetty :: SetUID JNA jar + Jetty :: SetUID JNA + + scm:git:https://github.com/jetty/${jetty.git.repo}.git + scm:git:git@github.com:jetty/${jetty.git.repo}.git + HEAD + https://github.com/jetty/${jetty.git.repo} + - 17 - 17 - 17 + 17 + 6.2 + jetty.setuid 12.0.2 5.13.0 - 6.2 UTF-8 - - - Eclipse Public License - Version 2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - Apache Software License - Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - + - - org.eclipse.jetty - jetty-server - ${jetty.version} - net.java.dev.jna jna ${jna.version} + + org.eclipse.jetty + jetty-server + ${jetty.version} + org.slf4j slf4j-api @@ -52,67 +49,80 @@ test + + + + + false + + + true + + jetty.snapshots + https://oss.sonatype.org/content/repositories/jetty-snapshots + + + + + + + false + + + true + + jetty.snapshots + https://oss.sonatype.org/content/repositories/jetty-snapshots + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + -Xlint:all + + + + - - maven-compiler-plugin - 3.11.0 - - ${compiler.source} - ${compiler.target} - ${compiler.release} - true - -Xlint:all - - - - org.apache.maven.plugins - maven-release-plugin - 3.0.1 - - true - eclipse-release - true - - org.apache.maven.plugins - maven-enforcer-plugin - 3.4.1 + maven-assembly-plugin + + + org.eclipse.jetty.toolchain + jetty-assembly-descriptors + 1.1 + + - enforce-build-env + assemble-config - enforce + single - validate + package - - - [3.8.4,) - [ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.8.4 or newer - - - [17,) - [ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 17 or newer - - - + + src/main/assembly/config.xml + org.apache.maven.plugins - maven-resources-plugin - 3.3.1 + maven-resources-plugin copy-resources - process-resources copy-resources + process-resources UTF-8 false @@ -130,68 +140,7 @@ - - com.mycila - license-maven-plugin - 4.3 - - - -
header-template.txt
- - **/*.java - -
-
- true - true - true - - DOUBLESLASH_STYLE - -
- - - check-headers - validate - - check - - - -
- - org.apache.maven.plugins - maven-assembly-plugin - 3.6.0 - - - org.eclipse.jetty.toolchain - jetty-assembly-descriptors - 1.1 - - - - - assemble-config - package - - single - - - - src/main/assembly/config.xml - - - - -
- - scm:git:https://github.com/jetty/jetty.setuid.git - scm:git:git@github.com:jetty/jetty.setuid.git - https://github.com/jetty/jetty.setuid/tree/master - HEAD - +