Skip to content

Commit

Permalink
[WFCORE-6542]: Upgrade the Windows service tools.
Browse files Browse the repository at this point in the history
 * Adding explicit dependency on commons-daemon artefact
 * Removing old binaries
 * Using the maven dependency plugin to extract and rename the binaries
 * Updating the assembly.xml to have them at their proper place in the
   docs folder

Issue: https://issues.redhat.com/browse/WFCORE-6542

Signed-off-by: Emmanuel Hugonnet <[email protected]>
  • Loading branch information
ehsavoie committed Oct 4, 2023
1 parent fec6a97 commit 6ad5be9
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 1 deletion.
4 changes: 4 additions & 0 deletions core-feature-pack/common/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<directory>src/main/resources</directory>
<outputDirectory/>
</fileSet>
<fileSet>
<directory>target/resources</directory>
<outputDirectory/>
</fileSet>
</fileSets>
<files>
<file>
Expand Down
45 changes: 45 additions & 0 deletions core-feature-pack/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
<artifactId>commons-cli</artifactId>
</dependency>

<dependency>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<classifier>bin-windows</classifier>
<type>zip</type>
</dependency>

<!-- Dependency for JSonP API and Impl for Jakarta EE 8. We still need this artifact for
internal.javax.json.api.ee8 Jboss module used by org.wildfly.event.logger and
org.jboss.logmanager JBoss modules
Expand Down Expand Up @@ -864,6 +871,44 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>unpack</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<version>${version.commons-daemon}</version>
<classifier>bin-windows</classifier>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/resources/content/docs/contrib/scripts/service/</outputDirectory>
<includes>**/*.exe</includes>
<fileMappers>
<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<pattern>prunsrv</pattern>
<replacement>wildfly-service</replacement>
</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<pattern>prunmgr</pattern>
<replacement>wildfly-mgr</replacement>
</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
</fileMappers>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 9 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@

<!-- This overrides default surefire plugin version specified in parent pom - reason is to enable TCP/IP communication,
see https://maven.apache.org/surefire/maven-surefire-plugin/examples/process-communication.html -->
<version.surefire.plugin>3.1.2</version.surefire.plugin>
<version.surefire.plugin>3.1.2</version.surefire.plugin>

<!-- Non-default maven plugin versions and configuration -->
<version.jacoco.plugin>0.8.10</version.jacoco.plugin>
Expand Down Expand Up @@ -168,6 +168,7 @@
<version.com.jcraft.jsch>0.1.55</version.com.jcraft.jsch>
<version.commons-cli>1.5.0</version.commons-cli>
<version.commons-collections>3.2.2</version.commons-collections>
<version.commons-daemon>1.3.4</version.commons-daemon>
<version.commons-lang3>3.12.0</version.commons-lang3>
<version.commons-io>2.10.0</version.commons-io>
<version.io.netty>4.1.99.Final</version.io.netty>
Expand Down Expand Up @@ -700,6 +701,13 @@
<artifactId>commons-cli</artifactId>
<version>${version.commons-cli}</version>
</dependency>
<dependency>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<classifier>bin-windows</classifier>
<type>zip</type>
<version>${version.commons-daemon}</version>
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
Expand Down

0 comments on commit 6ad5be9

Please sign in to comment.