jetty 10.0.x fix jdk19 build upgrading and re enable m-invoker-p which now supports jdk19 (#9023)
* use m-invoker-p 3.4.0 Signed-off-by: Olivier Lamy <olamy@apache.org>
This commit is contained in:
parent
aa40193d67
commit
99b1b1e240
|
@ -1,3 +1,5 @@
|
|||
import groovy.xml.XmlSlurper
|
||||
|
||||
System.out.println( "running postbuild.groovy" )
|
||||
|
||||
File webfrag = new File(basedir, 'target/webfrag.xml')
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
import groovy.xml.XmlParser
|
||||
|
||||
def rootNode = new XmlParser().parse(new File( basedir, 'webapp-war/target/effective-web.xml'))
|
||||
// find context-param node with param-name == org.eclipse.jetty.resources
|
||||
|
|
29
pom.xml
29
pom.xml
|
@ -146,7 +146,8 @@
|
|||
<maven.exec.plugin.version>3.1.0</maven.exec.plugin.version>
|
||||
<maven.gpg.plugin.version>3.0.1</maven.gpg.plugin.version>
|
||||
<maven.install.plugin.version>3.1.0</maven.install.plugin.version>
|
||||
<maven.invoker.plugin.version>3.3.0</maven.invoker.plugin.version>
|
||||
<maven.invoker.plugin.version>3.4.0</maven.invoker.plugin.version>
|
||||
<groovy.version>4.0.6</groovy.version>
|
||||
<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
|
||||
<maven.javadoc.plugin.version>3.4.1</maven.javadoc.plugin.version>
|
||||
<maven.plugin-tools.version>3.7.0</maven.plugin-tools.version>
|
||||
|
@ -644,13 +645,6 @@
|
|||
<localRepo>${localRepoPath}</localRepo>
|
||||
</filterProperties>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>${ant.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
@ -2454,25 +2448,6 @@
|
|||
<spotbugs.skip>true</spotbugs.skip>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>jdk19</id>
|
||||
<activation>
|
||||
<jdk>19</jdk>
|
||||
</activation>
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-invoker-plugin</artifactId>
|
||||
<configuration>
|
||||
<skipInvocation>true</skipInvocation>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<issueManagement>
|
||||
|
|
Loading…
Reference in New Issue