[DOXIASITETOOLS-231] Upgrade Plexus Utils to 3.3.0

michael-o · michael-o · commit 9566abacff1c · 2021-06-24T18:25:54.000+02:00
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -111,7 +111,6 @@
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.Os;
 import org.codehaus.plexus.util.PathTool;
-import org.codehaus.plexus.util.PropertyUtils;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.WriterFactory;
@@ -574,19 +573,23 @@ protected Context createDocumentVelocityContext( RenderingContext renderingConte
         // doxiaSiteRendererVersion
         InputStream inputStream = this.getClass().getResourceAsStream( "/META-INF/"
             + "maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties" );
-        Properties properties = PropertyUtils.loadProperties( inputStream );
         if ( inputStream == null )
         {
             getLogger().debug( "pom.properties for doxia-site-renderer could not be found." );
         }
-        else if ( properties == null )
-        {
-            getLogger().debug( "Failed to load pom.properties, so doxiaVersion is not available"
-                + " in the Velocity context." );
-        }
         else
         {
-            context.put( "doxiaSiteRendererVersion", properties.getProperty( "version" ) );
+            Properties properties = new Properties();
+            try ( InputStream in = inputStream )
+            {
+                properties.load( in );
+                context.put( "doxiaSiteRendererVersion", properties.getProperty( "version" ) );
+            }
+            catch ( IOException e )
+            {
+                getLogger().debug( "Failed to load pom.properties, so doxiaVersion is not available"
+                        + " in the Velocity context." );
+            }
         }
 
         // Add user properties
diff --git a/pom.xml b/pom.xml
@@ -173,7 +173,7 @@ under the License.
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>3.0.22</version>
+        <version>3.3.0</version>
       </dependency>
       <!-- misc -->
       <dependency>
