address maven warning for version interpolation

`mvn package` warns... [WARNING] Some problems were encountered while building the effective model for org.opensearch:opensearch-security:jar:1.0.0.0-rc1 [WARNING] The expression ${version} is deprecated. Please use ${project.version} instead. [WARNING] The expression ${version} is deprecated. Please use ${project.version} instead. [WARNING] [WARNING] It is highly recommended to fix these problems because they threaten the stability of your build. [WARNING] [WARNING] For this reason, future Maven versions might no longer support building such malformed projects. Signed-off-by: C.J. Jameson <cjcjameson@gmail.com>
opensearch-project · May 28, 2021 · 53d725c · 53d725c
1 parent 2371ae4
commit 53d725c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -88,10 +88,10 @@ ospackage {
 buildRpm {
     arch = 'NOARCH'
     addParentDirs = false
-    archiveName "${packageName}-${version}.rpm"
+    archiveName "${packageName}-${project.version}.rpm"
 }
 
 buildDeb {
     arch = 'all'
-    archiveName "${packageName}-${version}.deb"
+    archiveName "${packageName}-${project.version}.deb"
 }
diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,7 @@
         <jjwt.version>0.10.5</jjwt.version>
         <ldaptive.version>1.2.3</ldaptive.version>
         <http.commons.version>4.5.3</http.commons.version>
-        <cxf.version>3.4.0</cxf.version>
+        <cxf.version>3.4.3</cxf.version>
         <kafka.version>2.5.0</kafka.version>
         <java-saml.version>2.5.0</java-saml.version>
         <opensaml.version>3.4.5</opensaml.version>
@@ -849,7 +849,7 @@
                                     <descriptors>
                                         <descriptor>${elasticsearch.assembly.descriptor}</descriptor>
                                     </descriptors>
-                                    <finalName>opensearch-security-${version}</finalName>
+                                    <finalName>opensearch-security-${project.version}</finalName>
                                 </configuration>
                                 <goals>
                                     <goal>single</goal>
@@ -865,7 +865,7 @@
                                     <descriptors>
                                         <descriptor>${securitystandalone.descriptor}</descriptor>
                                     </descriptors>
-                                    <finalName>opensearch-security-${version}</finalName>
+                                    <finalName>opensearch-security-${project.version}</finalName>
                                 </configuration>
                                 <goals>
                                     <goal>single</goal>
@@ -890,7 +890,7 @@
                                 <fileSet>
                                     <directory>${project.build.directory}/releases/</directory>
                                     <includes>
-                                        <include>opensearch-security-${version}.zip</include>
+                                        <include>opensearch-security-${project.version}.zip</include>
                                     </includes>
                                 </fileSet>
                             </fileSets>