From 3eb264217a706c74c0d66ddce396c924ff65b1c7 Mon Sep 17 00:00:00 2001
From: Benjamin Marwell <bmarwell@apache.org>
Date: Fri, 21 May 2021 07:18:31 +0200
Subject: [PATCH] [SHIRO-819] Migrato to spring-boot-maven-plugin

 - remove old assembly descriptor
 - attach artifact with cli-classifier as before
 - change the display name of the hash modules
---
 crypto/support/hashes/argon2/pom.xml          |  2 +-
 crypto/support/hashes/bcrypt/pom.xml          |  2 +-
 tools/hasher/pom.xml                          | 25 ++++++-------
 .../hasher/src/main/assembly/cli.assembly.xml | 35 -------------------
 4 files changed, 12 insertions(+), 52 deletions(-)
 delete mode 100644 tools/hasher/src/main/assembly/cli.assembly.xml

diff --git a/crypto/support/hashes/argon2/pom.xml b/crypto/support/hashes/argon2/pom.xml
index 208a0542d0..b278be5053 100644
--- 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
index 24924d7833..ae9022c95d 100644
--- 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
index 2a3b4aa332..94da7d9fbe 100644
--- 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
deleted file mode 100644
index 9926c41465..0000000000
--- a/tools/hasher/src/main/assembly/cli.assembly.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>cli</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <unpack>true</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file