Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
Joakim Erdfelt 2020-11-03 13:57:03 -06:00
parent 0bb5e8c4b1 1a92af3c8d
commit 4fd75a02ab
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
13 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/demo-jndi-webapp/pom.xml
View File

@ -21,14 +21,14 @@
<id>generate-xml-files</id>
<phase>process-resources</phase>
<configuration>
<tasks>
<target>
<concat destfile="${project.build.directory}/plugin-context.xml">
<filelist dir="src/main/templates/" files="plugin-context-header.xml,env-definitions.xml" />
</concat>
<concat destfile="${project.build.directory}/test-jndi.xml">
<filelist dir="src/main/templates/" files="jetty-test-jndi-header.xml,env-definitions.xml" />
</concat>
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>

4
demos/demo-spec/demo-spec-webapp/pom.xml
View File

@ -85,14 +85,14 @@
<id>generate-xml-files</id>
<phase>process-resources</phase>
<configuration>
<tasks>
<target>
<concat destfile="${project.build.directory}/plugin-context.xml">
<filelist dir="src/main/templates/" files="plugin-context-header.xml,env-definitions.xml" />
</concat>
<concat destfile="${project.build.directory}/test-spec.xml">
<filelist dir="src/main/templates/" files="annotations-context-header.xml,env-definitions.xml" />
</concat>
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>

4
javadoc/pom.xml
View File

@ -88,9 +88,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<mkdir dir="${sources-directory}" />
</tasks>
</target>
</configuration>
</execution>
</executions>

8
jetty-gcloud/jetty-gcloud-session-manager/pom.xml
View File

@ -122,10 +122,10 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):.*$" replace="maven://\1/\2/\3|lib/gcloud/\2-\3.jar" byline="true" />
<replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" />
</tasks>
</target>
</configuration>
</execution>
<execution>
@ -135,12 +135,12 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<concat destfile="${project.build.directory}/gcloud-datastore.mod">
<fileset file="src/main/config-template/modules/gcloud-datastore.mod" />
<fileset file="${project.build.directory}/deps.txt" />
</concat>
</tasks>
</target>
</configuration>
</execution>
</executions>

4
jetty-home/pom.xml
View File

@ -514,9 +514,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
</tasks>
</target>
</configuration>
</execution>
</executions>

8
jetty-infinispan/infinispan-embedded-query/pom.xml
View File

@ -45,10 +45,10 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):.*$" replace="maven://\1/\2/\3|lib/infinispan/\2-\3.jar" byline="true" />
<replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" />
</tasks>
</target>
</configuration>
</execution>
<execution>
@ -58,12 +58,12 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<concat destfile="${project.build.directory}/infinispan-embedded-query-libs.mod">
<fileset file="src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod" />
<fileset file="${project.build.directory}/deps.txt" />
</concat>
</tasks>
</target>
</configuration>
</execution>
</executions>

8
jetty-infinispan/infinispan-embedded/pom.xml
View File

@ -46,10 +46,10 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):.*$" replace="maven://\1/\2/\3|lib/infinispan/\2-\3.jar" byline="true" />
<replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" />
</tasks>
</target>
</configuration>
</execution>
<execution>
@ -59,12 +59,12 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<concat destfile="${project.build.directory}/infinispan-embedded-libs.mod">
<fileset file="src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod" />
<fileset file="${project.build.directory}/deps.txt" />
</concat>
</tasks>
</target>
</configuration>
</execution>
</executions>

8
jetty-infinispan/infinispan-remote-query/pom.xml
View File

@ -45,11 +45,11 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):(.*):.*$" replace="maven://\1/\2/\4/jar/\3|lib/infinispan/\2-\3-\4.jar" byline="true" />
<replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):.*$" replace="maven://\1/\2/\3|lib/infinispan/\2-\3.jar" byline="true" />
<replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" />
</tasks>
</target>
</configuration>
</execution>
<execution>
@ -59,12 +59,12 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<concat destfile="${project.build.directory}/infinispan-remote-query-libs.mod">
<fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod" />
<fileset file="${project.build.directory}/deps.txt" />
</concat>
</tasks>
</target>
</configuration>
</execution>
</executions>

8
jetty-infinispan/infinispan-remote/pom.xml
View File

@ -46,11 +46,11 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):(.*):.*$" replace="maven://\1/\2/\4/jar/\3|lib/infinispan/\2-\3-\4.jar" byline="true" />
<replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):.*$" replace="maven://\1/\2/\3|lib/infinispan/\2-\3.jar" byline="true" />
<replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" />
</tasks>
</target>
</configuration>
</execution>
<execution>
@ -60,12 +60,12 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<concat destfile="${project.build.directory}/infinispan-remote-libs.mod">
<fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod" />
<fileset file="${project.build.directory}/deps.txt" />
</concat>
</tasks>
</target>
</configuration>
</execution>
</executions>

4
jetty-osgi/jetty-osgi-boot/pom.xml
View File

@ -46,14 +46,14 @@
<execution>
<phase>process-resources</phase>
<configuration>
<tasks>
<target>
<!--delete file="target/classes/META-INF/MANIFEST.MF" /-->
<copy todir="target/classes/jettyhome">
<fileset dir="jettyhome">
<exclude name="**/*.log" />
</fileset>
</copy>
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>

4
jetty-osgi/jetty-osgi-httpservice/pom.xml
View File

@ -43,11 +43,11 @@
<execution>
<phase>process-resources</phase>
<configuration>
<tasks>
<target>
<copy todir="target/classes/contexts">
<fileset dir="contexts" />
</copy>
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>

4
jetty-unixsocket/jetty-unixsocket-server/pom.xml
View File

@ -76,7 +76,7 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<copy file="${project.build.directory}/deps.txt" tofile="${project.build.directory}/deps-orig.txt" />
<!-- regex the deps with classifiers first -->
<replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):(.*):.*$" replace="maven://\1/\2/\4/jar/\3|lib/jnr/\2-\4-\3.jar" byline="true" />
@ -88,7 +88,7 @@
<fileset file="${project.build.directory}/deps.txt" />
<fileset file="src/main/config-template/modules/unixsocket-suffix.mod" />
</concat>
</tasks>
</target>
</configuration>
</execution>
</executions>

2
pom.xml
View File

@ -448,7 +448,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>