Improve using excludes

quarkusio · Oct 12, 2023 · 5659b57 · 5659b57
1 parent 239416e
commit 5659b57
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 30 deletions.
diff --git a/quarkus-workshop-super-heroes/assembly-core.xml b/quarkus-workshop-super-heroes/assembly-core.xml
@@ -27,6 +27,17 @@
         <fileSet>
             <directory>${basedir}</directory>
             <useDefaultExcludes>true</useDefaultExcludes>
+            <excludes>
+                <exclude>**/dist/**</exclude>
+                <exclude>**/target/**</exclude>
+                <exclude>**/.idea/**</exclude>
+                <exclude>*.iml</exclude>
+                <exclude>*.settings</exclude>
+                <exclude>*.classpath</exclude>
+                <exclude>*.project</exclude>
+                <exclude>**/.quinoa/**</exclude>
+                <exclude>**/node_modules/**</exclude>
+            </excludes>
             <includes>
                 <include>pom.xml</include>
                 <include>.editorconfig</include>
@@ -38,27 +49,10 @@
 
                 <include>super-heroes/infrastructure/**/*</include>
                 <include>super-heroes/kubernetes/**/*</include>
-
-                <include>super-heroes/rest-fights/*</include>
-                <include>super-heroes/rest-fights/.mvn/wrapper/maven-wrapper.properties</include>
-                <include>super-heroes/rest-fights/src/**/*</include>
-
-                <include>super-heroes/rest-heroes/*</include>
-                <include>super-heroes/rest-heroes/.mvn/wrapper/maven-wrapper.properties</include>
-                <include>super-heroes/rest-heroes/src/**/*</include>
-
-                <include>super-heroes/rest-villains/*</include>
-                <include>super-heroes/rest-villains/.mvn/wrapper/maven-wrapper.properties</include>
-                <include>super-heroes/rest-villains/src/**/*</include>
-
-                <include>super-heroes/ui-super-heroes/.mvn/wrapper/maven-wrapper.properties</include>
-                <include>super-heroes/ui-super-heroes/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/docker/**/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/java/**/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/resources/**/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/webui/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/webui/src/**/*</include>
-                <include>super-heroes/ui-super-heroes/src/test/**/*</include>
+                <include>super-heroes/rest-fights/**/*</include>
+                <include>super-heroes/rest-heroes/**/*</include>
+                <include>super-heroes/rest-villains/**/*</include>
+                <include>super-heroes/ui-super-heroes/**/*</include>
             </includes>
         </fileSet>
     </fileSets>

diff --git a/quarkus-workshop-super-heroes/assembly.xml b/quarkus-workshop-super-heroes/assembly.xml
@@ -27,6 +27,17 @@
         <fileSet>
             <directory>${basedir}</directory>
             <useDefaultExcludes>true</useDefaultExcludes>
+            <excludes>
+                <exclude>**/dist/**</exclude>
+                <exclude>**/target/**</exclude>
+                <exclude>**/.idea/**</exclude>
+                <exclude>*.iml</exclude>
+                <exclude>*.settings</exclude>
+                <exclude>*.classpath</exclude>
+                <exclude>*.project</exclude>
+                <exclude>**/.quinoa/**</exclude>
+                <exclude>**/node_modules/**</exclude>
+            </excludes>
             <includes>
                 <include>pom.xml</include>
                 <include>.editorconfig</include>
@@ -38,15 +49,7 @@
 
                 <include>super-heroes/infrastructure/**/*</include>
                 <include>super-heroes/kubernetes/**/*</include>
-
-                <include>super-heroes/ui-super-heroes/.mvn/wrapper/maven-wrapper.properties</include>
-                <include>super-heroes/ui-super-heroes/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/docker/**/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/java/**/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/resources/**/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/webui/*</include>
-                <include>super-heroes/ui-super-heroes/src/main/webui/src/**/*</include>
-                <include>super-heroes/ui-super-heroes/src/test/**/*</include>
+                <include>super-heroes/ui-super-heroes/**/*</include>
             </includes>
         </fileSet>
     </fileSets>

diff --git a/quarkus-workshop-super-heroes/dist/quarkus-super-heroes-workshop-complete.zip b/quarkus-workshop-super-heroes/dist/quarkus-super-heroes-workshop-complete.zip
diff --git a/quarkus-workshop-super-heroes/dist/quarkus-super-heroes-workshop-core.zip b/quarkus-workshop-super-heroes/dist/quarkus-super-heroes-workshop-core.zip
diff --git a/quarkus-workshop-super-heroes/dist/quarkus-super-heroes-workshop.zip b/quarkus-workshop-super-heroes/dist/quarkus-super-heroes-workshop.zip