[java-idp-plugin-thymeleaf] branch main updated: Fix incomplete assembly descriptor.

Scott Cantor cantor.2 at osu.edu
Tue Feb 20 18:36:58 UTC 2024


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-idp-plugin-thymeleaf.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-thymeleaf.git;a=commit;h=98a8d10c9a46189db58d79f92b9989744520592d

The following commit(s) were added to refs/heads/main by this push:
     new 98a8d10  Fix incomplete assembly descriptor.
98a8d10 is described below

commit 98a8d10c9a46189db58d79f92b9989744520592d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 20 13:36:52 2024 -0500

    Fix incomplete assembly descriptor.
---
 thymeleaf-dist/src/main/assembly/assembly.xml | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/thymeleaf-dist/src/main/assembly/assembly.xml b/thymeleaf-dist/src/main/assembly/assembly.xml
index 464c296..bba2ef9 100644
--- a/thymeleaf-dist/src/main/assembly/assembly.xml
+++ b/thymeleaf-dist/src/main/assembly/assembly.xml
@@ -15,7 +15,7 @@
 
         <!-- The plugin property file -->
         <fileSet>            
-            <directory>../plugin-impl/target/classes/FIXME</directory>
+            <directory>../thymeleaf-impl/target/classes/net/shibboleth/idp/plugin/thymeleaf</directory>
             <outputDirectory>bootstrap</outputDirectory>
             <includes>
                 <include>plugin.properties</include>
@@ -24,24 +24,10 @@
         
         <!--  The implementation jar -->
         <fileSet>
-            <directory>../plugin-impl/target</directory>
+            <directory>../thymeleaf-impl/target</directory>
             <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
             <includes>
-                <include>plugin-impl-*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>*test*.jar</exclude>
-                <exclude>*javadoc.jar</exclude>
-                <exclude>*sources.jar</exclude>
-            </excludes>
-        </fileSet>
-        
-        <!--  The API jar -->
-        <fileSet>
-            <directory>../plugin-api/target</directory>
-            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
-            <includes>
-                <include>plugin-api-*.jar</include>
+                <include>idp-plugin-thymeleaf-impl-*.jar</include>
             </includes>
             <excludes>
                 <exclude>*test*.jar</exclude>
@@ -52,7 +38,7 @@
         
          <!--  The dependencies -->
         <fileSet>
-            <directory>../plugin-impl/target/dependency</directory>
+            <directory>../thymeleaf-impl/target/dependency</directory>
             <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
             <includes>
                 <include>*.jar</include>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list