Merge pull request #304 from bmarwell/SHIRO-819_hasher-util

[SHIRO-819] Migrato to spring-boot-maven-plugin
apache · May 21, 2021 · cfea5a8 · cfea5a8
2 parents 2e9cddc + 3eb2642
commit cfea5a8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 52 deletions.
diff --git a/crypto/support/hashes/argon2/pom.xml b/crypto/support/hashes/argon2/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>shiro-hashes-argon2</artifactId>
-    <name>Apache Shiro :: Cryptography :: Support :: Hashes :: Argon2</name>
+    <name>Apache Shiro :: Cryptography :: Support :: Argon2</name>
 
     <packaging>bundle</packaging>
 

diff --git a/crypto/support/hashes/bcrypt/pom.xml b/crypto/support/hashes/bcrypt/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>shiro-hashes-bcrypt</artifactId>
-    <name>Apache Shiro :: Cryptography :: Support :: Hashes :: BCrypt</name>
+    <name>Apache Shiro :: Cryptography :: Support :: BCrypt</name>
 
     <packaging>bundle</packaging>
 

diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml
@@ -73,25 +73,20 @@
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/cli.assembly.xml</descriptor>
-                    </descriptors>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.shiro.tools.hasher.Hasher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.12.RELEASE</version>
                 <executions>
                     <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>repackage</goal>
                         </goals>
+                        <configuration>
+                            <mainClass>org.apache.shiro.tools.hasher.Hasher</mainClass>
+                            <classifier>cli</classifier>
+                            <attach>true</attach>
+                            <layout>JAR</layout>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/tools/hasher/src/main/assembly/cli.assembly.xml b/tools/hasher/src/main/assembly/cli.assembly.xml