more small tweaks

NationalSecurityAgency · Mar 11, 2024 · 2da441a · 2da441a
1 parent 3609a63
commit 2da441a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -264,7 +264,7 @@
             <plugin>
                 <groupId>com.webcohesion.enunciate</groupId>
                 <artifactId>enunciate-maven-plugin</artifactId>
-                <version>2.12.1</version>
+                <version>2.15.1</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.jboss.spec.javax.annotation</groupId>

diff --git a/warehouse/assemble/datawave/pom.xml b/warehouse/assemble/datawave/pom.xml
@@ -230,6 +230,7 @@
                 </property>
             </activation>
             <build>
+                <finalName>datawave-${build.env}-${project.version}</finalName>
                 <plugins>
                     <plugin>
                         <!-- Activate the assert-properties plugin -->
@@ -258,7 +259,6 @@
                                 </goals>
                                 <phase>package</phase>
                                 <configuration>
-                                    <finalName>datawave-${build.env}-${project.version}</finalName>
                                     <descriptors combine.children="append">
                                         <descriptor>src/main/assembly/dist.xml</descriptor>
                                     </descriptors>

diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml
@@ -207,7 +207,6 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <finalName>${project.artifactId}-${project.version}</finalName>
                     <descriptors>
                         <descriptor>src/main/assembly/dist.xml</descriptor>
                     </descriptors>

diff --git a/web-services/deploy/application/pom.xml b/web-services/deploy/application/pom.xml
@@ -437,6 +437,7 @@
                 </property>
             </activation>
             <build>
+                <finalName>${project.artifactId}-${project.version}</finalName>
                 <plugins>
                     <plugin>
                         <!-- Activate the assert-properties plugin to ensure all configuration we require is set. -->
@@ -469,7 +470,6 @@
                                         <descriptor>src/main/assembly/dist.xml</descriptor>
                                     </descriptors>
                                     <tarLongFileMode>posix</tarLongFileMode>
-                                    <finalName>${project.artifactId}-${project.version}</finalName>
                                 </configuration>
                             </execution>
                         </executions>

diff --git a/web-services/deploy/application/src/main/assembly/dist.xml b/web-services/deploy/application/src/main/assembly/dist.xml
@@ -15,7 +15,7 @@
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/wildfly</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>${file.separator}</outputDirectory>
             <excludes>
                 <exclude>*.sh</exclude>
             </excludes>
@@ -24,7 +24,7 @@
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/wildfly</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>${file.separator}</outputDirectory>
             <includes>
                 <include>*.sh</include>
             </includes>