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

Bump maven-antrun-plugin from 1.8 to 3.0.0 

+ and update configuration/task to configuration/target

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2020-11-03 08:46:27 -06:00
parent 69185bf31d
commit 40bde46b13
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
13 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-distribution/pom.xml
View File

@ -264,11 +264,11 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<copy todir="${assembly-directory}"> <copy todir="${assembly-directory}">
<fileset dir="${home-directory}/jetty-home-${project.version}/" /> <fileset dir="${home-directory}/jetty-home-${project.version}/" />
</copy> </copy>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -278,9 +278,9 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" /> <chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -290,9 +290,9 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<delete file="${assembly-directory}/etc/keystore" /> <delete file="${assembly-directory}/etc/keystore" />
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

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

@ -113,10 +113,10 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <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=" *(.*):(.*):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]" /> <replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" />
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -126,12 +126,12 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<concat destfile="${project.build.directory}/gcloud-datastore.mod"> <concat destfile="${project.build.directory}/gcloud-datastore.mod">
<fileset file="src/main/config-template/modules/gcloud-datastore.mod" /> <fileset file="src/main/config-template/modules/gcloud-datastore.mod" />
<fileset file="${project.build.directory}/deps.txt" /> <fileset file="${project.build.directory}/deps.txt" />
</concat> </concat>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

4
jetty-home/pom.xml
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

4
jetty-unixsocket/pom.xml
View File

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

2
pom.xml
View File

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

4
tests/test-webapps/test-jndi-webapp/pom.xml
View File

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

4
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
View File

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