Fixed fileset for cleaning release files [#966]

comixed · Oct 4, 2021 · eaa19f3 · eaa19f3
1 parent d7956b7
commit eaa19f3
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 19 deletions.
diff --git a/comixed-adaptors/pom.xml b/comixed-adaptors/pom.xml
@@ -13,7 +13,7 @@
   <artifactId>comixed-adaptors</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-adaptors</name>
-  <url>http://maven.apache.org</url>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.comixedproject</groupId>

diff --git a/comixed-auditlog/pom.xml b/comixed-auditlog/pom.xml
@@ -13,7 +13,7 @@
   <artifactId>comixed-auditlog</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-auditlog</name>
-  <url>http://maven.apache.org</url>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>

diff --git a/comixed-auth/pom.xml b/comixed-auth/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>comixed-auth</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-auth</name>
-  <url>http://maven.apache.org</url>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>

diff --git a/comixed-batch/pom.xml b/comixed-batch/pom.xml
@@ -13,7 +13,7 @@
   <artifactId>comixed-batch</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-batch</name>
-  <url>http://maven.apache.org</url>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>

diff --git a/comixed-http/pom.xml b/comixed-http/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>comixed-http</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-http</name>
-  <url>http://maven.apache.org</url>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.comixedproject</groupId>

diff --git a/comixed-messaging/pom.xml b/comixed-messaging/pom.xml
@@ -13,7 +13,7 @@
   <artifactId>comixed-messaging</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-messaging</name>
-  <url>http://maven.apache.org</url>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.comixedproject</groupId>

diff --git a/comixed-plugins/pom.xml b/comixed-plugins/pom.xml
@@ -13,7 +13,7 @@
   <artifactId>comixed-plugins</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-plugins</name>
-  <url>http://maven.apache.org</url>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.python</groupId>

diff --git a/comixed-release/pom.xml b/comixed-release/pom.xml
@@ -13,10 +13,8 @@
   <artifactId>comixed-release</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-release</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <sonar.skip>true</sonar.skip>
-  </properties>
+  <packaging>pom</packaging>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.comixedproject</groupId>
@@ -53,11 +51,6 @@
       <artifactId>comixed-rest</artifactId>
       <version>0.10.0-1.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.comixedproject</groupId>
-      <artifactId>comixed-app</artifactId>
-      <version>0.10.0-1.0</version>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/comixed-repositories/pom.xml b/comixed-repositories/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>comixed-repositories</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-repositories</name>
-  <url>http://maven.apache.org</url>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.comixedproject</groupId>

diff --git a/comixed-state/pom.xml b/comixed-state/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>comixed-state</artifactId>
   <version>0.10.0-1.0</version>
   <name>comixed-state</name>
-  <url>http://maven.apache.org</url>
+  <url>http://www.comixedproject.org</url>
   <dependencies>
     <dependency>
       <groupId>org.comixedproject</groupId>

diff --git a/comixed-webui/pom.xml b/comixed-webui/pom.xml
@@ -7,6 +7,7 @@
     <groupId>org.comixedproject</groupId>
     <artifactId>comixed</artifactId>
     <version>0.10.0-1.0</version>
+    <relativePath>..</relativePath>
   </parent>
   <groupId>org.comixedproject</groupId>
   <artifactId>comixed-webui</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -313,10 +313,22 @@
         <configuration>
           <filesets>
             <fileset>
-              <include>comixed-release-*.zip</include>
+              <directory>${project.basedir}</directory>
+              <includes>
+                <include>**/comixed-release-*.zip</include>
+              </includes>
             </fileset>
           </filesets>
         </configuration>
+        <executions>
+          <execution>
+            <id>auto-clean</id>
+            <phase>initialize</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.sonatype.plugins</groupId>