|
 |
06af4ec |
From 6beaea7bae7bbe5fb17b1d9c9b13bb2d4072bc08 Mon Sep 17 00:00:00 2001
|
|
|
06af4ec |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
06af4ec |
Date: Fri, 28 Mar 2014 16:56:12 +0100
|
|
|
8adb07e |
Subject: [PATCH 1/3] Don't install artifacts which are not regular files
|
|
|
06af4ec |
|
|
|
06af4ec |
This fixes rhbz#1078967
|
|
|
06af4ec |
---
|
|
|
06af4ec |
.../maven/rpminstall/plugin/InstallMojo.java | 15 +++++++++++++++
|
|
|
06af4ec |
1 file changed, 15 insertions(+)
|
|
|
06af4ec |
|
|
|
06af4ec |
diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
|
|
|
06af4ec |
index 67f34d3..0e64792 100644
|
|
|
06af4ec |
--- a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
|
|
|
06af4ec |
+++ b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
|
|
|
06af4ec |
@@ -130,6 +130,13 @@ public class InstallMojo
|
|
|
06af4ec |
logger.debug( "Installing main artifact " + mainArtifact );
|
|
|
06af4ec |
logger.debug( "Artifact file is " + mainArtifact.getFile() );
|
|
|
06af4ec |
|
|
|
06af4ec |
+ if ( !mainArtifact.getFile().isFile() )
|
|
|
06af4ec |
+ {
|
|
|
06af4ec |
+ logger.info( "Skipping installation of artifact " + mainArtifact.getFile()
|
|
|
06af4ec |
+ + ": artifact file is not a regular file" );
|
|
|
06af4ec |
+ mainArtifact = mainArtifact.setFile( null );
|
|
|
06af4ec |
+ }
|
|
|
06af4ec |
+
|
|
|
06af4ec |
Path rawPom = project.getFile().toPath();
|
|
|
06af4ec |
Path effectivePom = saveEffectivePom( project.getModel() );
|
|
|
06af4ec |
logger.debug( "Raw POM path: " + rawPom );
|
|
|
06af4ec |
@@ -142,6 +149,14 @@ public class InstallMojo
|
|
|
06af4ec |
Artifact attachedArtifact = aetherArtifact( mavenArtifact );
|
|
|
06af4ec |
attachedArtifact = attachedArtifact.setFile( mavenArtifact.getFile() );
|
|
|
06af4ec |
logger.debug( "Installing attached artifact " + attachedArtifact );
|
|
|
06af4ec |
+ logger.debug( "Artifact file is " + mavenArtifact.getFile() );
|
|
|
06af4ec |
+
|
|
|
06af4ec |
+ if ( !mavenArtifact.getFile().isFile() )
|
|
|
06af4ec |
+ {
|
|
|
06af4ec |
+ logger.info( "Skipping installation of attached artifact " + attachedArtifact
|
|
|
06af4ec |
+ + ": artifact file is not a regular file" );
|
|
|
06af4ec |
+ continue;
|
|
|
06af4ec |
+ }
|
|
|
06af4ec |
|
|
|
06af4ec |
deployArtifact( attachedArtifact, null, null );
|
|
|
06af4ec |
}
|
|
|
06af4ec |
--
|
|
|
06af4ec |
1.8.5.3
|
|
|
06af4ec |
|