Skip to content

Commit

Permalink
drop buildnumber:create already executed by jetty-util (#11360)
Browse files Browse the repository at this point in the history
* drop buildnumber creation already done by jetty-util
* copy build.properties from jetty-util
  • Loading branch information
hboutemy authored Feb 15, 2024
1 parent 645e775 commit 3d36825
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
40 changes: 23 additions & 17 deletions jetty-core/jetty-start/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,29 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>build.properties</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<type>jar</type>
<overWrite>false</overWrite>
<includes>**/build.properties</includes>
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"></fileMapper>
</fileMappers>
<outputDirectory>${project.build.outputDirectory}/org/eclipse/jetty/start/</outputDirectory>
</artifactItem>
</artifactItems>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
<execution>
<id>unpack</id>
<goals>
Expand Down Expand Up @@ -109,23 +132,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
<execution>
<id>create-buildnumber</id>
<goals>
<goal>create</goal>
</goals>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<revisionOnScmFailure>${nonCanonicalRevision}</revisionOnScmFailure>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

This file was deleted.

0 comments on commit 3d36825

Please sign in to comment.