You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2022/05/13 03:18:29 UTC

[commons-imaging] branch release updated: Fixing mvn site target, and downgrading commons-parent to fix site reports generation (jdepend and rat)

This is an automated email from the ASF dual-hosted git repository.

kinow pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git


The following commit(s) were added to refs/heads/release by this push:
     new 79990a62 Fixing mvn site target, and downgrading commons-parent to fix site reports generation (jdepend and rat)
79990a62 is described below

commit 79990a62a3168dc0ba64bb32723b194926a24173
Author: Bruno P. Kinoshita <ki...@users.noreply.github.com>
AuthorDate: Fri May 13 15:17:28 2022 +1200

    Fixing mvn site target, and downgrading commons-parent to fix site reports generation (jdepend and rat)
---
 pom.xml                 | 32 ++++++++++++++++++++------------
 src/changes/changes.xml |  3 ---
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b65164d..fe3aa492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,10 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>53</version>
+    <!-- https://issues.apache.org/jira/browse/RAT-297, fixed in 0.14, not released as of today 13/05/22 -->
+    <!-- https://issues.apache.org/jira/browse/MSHARED-1049 -->
+    <!-- once jdepend and rat can be used OK, we can upgrade to parent 53+ -->
+    <version>52</version>
   </parent>
 
   <artifactId>commons-imaging</artifactId>
@@ -78,8 +81,8 @@
 
   <distributionManagement>
     <site>
-      <id>apache.website</id>
-      <name>Apache Commons Site</name>
+      <id>commons.site</id>
+      <name>Apache Commons Site SVN</name>
       <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-imaging/</url>
     </site>
   </distributionManagement>
@@ -352,14 +355,19 @@
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>src/test/data/images/xpm/1/symbolic.xpm</exclude>
-            <exclude>src/test/data/images/xpm/1/Oregon Scientific DS6639 - DSC_0307 - small.xpm</exclude>
-            <exclude>src/test/data/images/pbm/2/5x5-grayscale.pam</exclude>
-            <exclude>src/test/data/images/pbm/2/5x5-bw.pam</exclude>
-            <exclude>src/test/data/images/pbm/1/Oregon Scientific DS6639 - DSC_0307 - small.pgm</exclude>
-            <exclude>src/test/data/images/xbm/1/Oregon Scientific DS6639 - DSC_0307 - small.xbm</exclude>
-            <exclude>src/test/data/images/xbm/1/Oregon Scientific DS6639 - DSC_0307 - small X10.xbm</exclude>
+            <exclude>src/test/resources/images/**/*</exclude>
+            <exclude>src/test/resources/IMAGING-*/*</exclude>
+            <exclude>src/test/data/**/*.xpm</exclude>
+            <exclude>src/test/data/**/*.pam</exclude>
+            <exclude>src/test/data/**/*.pbm</exclude>
+            <exclude>src/test/data/**/*.pgm</exclude>
+            <exclude>src/test/data/**/*.ppm</exclude>
+            <exclude>src/test/data/**/*.xbm</exclude>
+            <exclude>src/test/data/**/*.bmp</exclude>
+            <exclude>src/test/data/**/*.tga</exclude>
+            <exclude>src/test/data/**/*.hdr</exclude>
             <exclude>src/main/resources/org/apache/commons/imaging/formats/xpm/rgb.txt</exclude>
+            <exclude>.asf.yaml</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -396,7 +404,7 @@
                   <goal>run</goal>
                 </goals>
                 <configuration>
-                  <tasks>
+                  <target>
                     <exec executable="svn">
                       <arg line="checkout --depth immediates ${commons.scmPubUrl} ${commons.scmPubCheckoutDirectory}" />
                     </exec>
@@ -411,7 +419,7 @@
                     <exec executable="svn">
                       <arg line="update --set-depth infinity ${dirs}" />
                     </exec>
-                  </tasks>
+                  </target>
                 </configuration>
               </execution>
             </executions>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e3ad14ea..924278cc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,9 +45,6 @@ The <action> type attribute can be add,update,fix,remove.
   </properties>
   <body>
     <release version="1.0-alpha3" date="2022-05-13" description="Third 1.0 alpha release">
-      <action dev="kinow" type="fix" due-to="Dependabot">
-        Bump commons-parent from 52 to 53 #215.
-      </action>
       <action issue="IMAGING-330" dev="kinow" type="fix" due-to="Gary Lucas">
         Add PNG predictor to reduce output size.
       </action>