Update to upstream version 1.0.1

2013-09-20 12:53:59 +02:00 · 2013-09-20 12:53:59 +02:00 · 2af3fb268c
commit 2af3fb268c
parent efa2e76c32
8 changed files with 8 additions and 479 deletions
--- a/.gitignore
+++ b/.gitignore
@ -23,3 +23,5 @@
 /xmvn-0.5.0.tar.xz
 /xmvn-0.5.1.tar.xz
 /xmvn-1.0.0.tar.xz
 /xmvn-1.0.1.tar.xz
 /xmvn-1.0.2.tar.xz
--- a/0001-Be-careful-when-unboxing-Boolean-that-can-be-null.patch
+++ b/0001-Be-careful-when-unboxing-Boolean-that-can-be-null.patch
@ -1,120 +0,0 @@
 From ccc197d9503267243cc4427d60dd360e1953d4c1 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Fri, 24 May 2013 17:15:36 +0200
 Subject: [PATCH] Be careful when unboxing Boolean that can be null
 Add explicit check for null value when unboxing Booleans that can be
 null.  Also extract duplicated code to a utility class.
 ---
 .../maven/resolver/DefaultArtifactBlacklist.java   |  4 +--
 .../maven/resolver/DefaultResolver.java            |  4 +--
 .../fedoraproject/maven/utils/LoggingUtils.java    | 30 ++++++++++++++++++++++
 .../maven/rpminstall/plugin/InstallMojo.java       |  4 +--
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 xmvn-core/src/main/java/org/fedoraproject/maven/utils/LoggingUtils.java
 diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultArtifactBlacklist.java b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultArtifactBlacklist.java
 index 451f71e..a6502be 100644
 --- a/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultArtifactBlacklist.java
 +++ b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultArtifactBlacklist.java
@@ -26,6 +26,7 @@ import org.codehaus.plexus.logging.Logger;
 import org.fedoraproject.maven.config.Configurator;
 import org.fedoraproject.maven.config.ResolverSettings;
 import org.fedoraproject.maven.model.Artifact;
 +import org.fedoraproject.maven.utils.LoggingUtils;
 /**
  * @author Mikolaj Izdebski
@@ -113,8 +114,7 @@ public class DefaultArtifactBlacklist
     {
         Set<Artifact> aliasBlacklist = new TreeSet<>();
         ResolverSettings settings = configurator.getConfiguration().getResolverSettings();
 -        int loggerThreshold = settings.isDebug() ? Logger.LEVEL_DEBUG : Logger.LEVEL_WARN;
 -        logger.setThreshold( Math.min( logger.getThreshold(), loggerThreshold ) );
 +        LoggingUtils.setLoggerThreshold( logger, settings.isDebug() );
         for ( String prefix : settings.getPrefixes() )
         {
 diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultResolver.java b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultResolver.java
 index 7fb51c5..c6a82ad 100644
 --- a/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultResolver.java
 +++ b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultResolver.java
@@ -31,6 +31,7 @@ import org.fedoraproject.maven.repository.Layout;
 import org.fedoraproject.maven.repository.Repository;
 import org.fedoraproject.maven.repository.SingletonRepository;
 import org.fedoraproject.maven.utils.AtomicFileCounter;
 +import org.fedoraproject.maven.utils.LoggingUtils;
 /**
  * @author Mikolaj Izdebski
@@ -90,8 +91,7 @@ public class DefaultResolver
         initializeBisect();
         ResolverSettings settings = configurator.getConfiguration().getResolverSettings();
 -        int loggerThreshold = settings.isDebug() ? Logger.LEVEL_DEBUG : Logger.LEVEL_WARN;
 -        logger.setThreshold( Math.min( logger.getThreshold(), loggerThreshold ) );
 +        LoggingUtils.setLoggerThreshold( logger, settings.isDebug() );
         resolvers.add( new LocalResolver( settings ) );
 diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/utils/LoggingUtils.java b/xmvn-core/src/main/java/org/fedoraproject/maven/utils/LoggingUtils.java
 new file mode 100644
 index 0000000..7dcd265
 --- /dev/null
 +++ b/xmvn-core/src/main/java/org/fedoraproject/maven/utils/LoggingUtils.java
@@ -0,0 +1,30 @@
 +/*-
 + * Copyright (c) 2012-2013 Red Hat, Inc.
 + *
 + * Licensed under the Apache License, Version 2.0 (the "License");
 + * you may not use this file except in compliance with the License.
 + * You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.fedoraproject.maven.utils;
 +
 +import org.codehaus.plexus.logging.Logger;
 +
 +/**
 + * @author Mikolaj Izdebski
 + */
 +public class LoggingUtils
 +{
 +    public static void setLoggerThreshold( Logger logger, Boolean debugSetting )
 +    {
 +        int threshold = debugSetting != null && debugSetting ? Logger.LEVEL_DEBUG : Logger.LEVEL_WARN;
 +        logger.setThreshold( Math.min( logger.getThreshold(), threshold ) );
 +    }
 +}
 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
 index a8bf55d..1f53a49 100644
 --- 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
@@ -44,6 +44,7 @@ import org.fedoraproject.maven.installer.DefaultPackage;
 import org.fedoraproject.maven.installer.Installer;
 import org.fedoraproject.maven.installer.ProjectInstallationException;
 import org.fedoraproject.maven.installer.ProjectInstaller;
 +import org.fedoraproject.maven.utils.LoggingUtils;
 /**
  * @author Mikolaj Izdebski
@@ -124,8 +125,7 @@ public class InstallMojo
     {
         Configuration configuration = configurator.getConfiguration();
         settings = configuration.getInstallerSettings();
 -        int loggerThreshold = settings.isDebug() ? Logger.LEVEL_DEBUG : Logger.LEVEL_WARN;
 -        logger.setThreshold( Math.min( logger.getThreshold(), loggerThreshold ) );
 +        LoggingUtils.setLoggerThreshold( logger, settings.isDebug() );
         Map<String, DefaultPackage> packages = new TreeMap<>();
 -- 
 1.8.1.4
--- a/0002-Implement-desired-handling-dots-in-JPP-groupId.patch
+++ b/0002-Implement-desired-handling-dots-in-JPP-groupId.patch
@ -1,52 +0,0 @@
 From 77bfaf47ff78d0de7d005dd2185c05c197c717c2 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Fri, 31 May 2013 16:13:58 +0200
 Subject: [PATCH 2/2] Implement desired handling dots in JPP groupId
 Dots in JPP groupId should not be replaced with slashes
 ---
 .../src/main/java/org/fedoraproject/maven/repository/Layout.java   | 7 ++++++-
 .../test/java/org/fedoraproject/maven/repository/LayoutTest.java   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)
 diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/repository/Layout.java b/xmvn-core/src/main/java/org/fedoraproject/maven/repository/Layout.java
 index 3d8c7a5..23cb006 100644
 --- a/xmvn-core/src/main/java/org/fedoraproject/maven/repository/Layout.java
 +++ b/xmvn-core/src/main/java/org/fedoraproject/maven/repository/Layout.java
@@ -105,11 +105,16 @@ public enum Layout
                 path.append( groupId.replace( '/', '.' ) );
                 path.append( '-' );
             }
 -            else
 +            else if ( deep )
             {
                 path.append( groupId.replace( '.', '/' ) );
                 path.append( '/' );
             }
 +            else
 +            {
 +                path.append( groupId );
 +                path.append( '/' );
 +            }
         }
         path.append( artifactId );
 diff --git a/xmvn-core/src/test/java/org/fedoraproject/maven/repository/LayoutTest.java b/xmvn-core/src/test/java/org/fedoraproject/maven/repository/LayoutTest.java
 index 5f63969..f2330f0 100644
 --- a/xmvn-core/src/test/java/org/fedoraproject/maven/repository/LayoutTest.java
 +++ b/xmvn-core/src/test/java/org/fedoraproject/maven/repository/LayoutTest.java
@@ -42,9 +42,9 @@ public class LayoutTest
         assertEquals( "an-example/artifact/used-FOR42.testing/blah-1.2.3-foo/used-FOR42.testing-blah-1.2.3-foo.ext-ens.ion",
                       Layout.MAVEN.getArtifactPath( artifact ) );
 -        assertEquals( "an-example/artifact/used-FOR42.testing-blah-1.2.3-foo.ext-ens.ion",
 +        assertEquals( "an-example.artifact/used-FOR42.testing-blah-1.2.3-foo.ext-ens.ion",
                       Layout.JPP.getArtifactPath( artifact ) );
 -        assertEquals( "an-example/artifact/used-FOR42.testing.ext-ens.ion",
 +        assertEquals( "an-example.artifact/used-FOR42.testing.ext-ens.ion",
                       Layout.JPP_VERSIONLESS.getArtifactPath( artifact ) );
         assertEquals( "an-example.artifact-used-FOR42.testing-blah-1.2.3-foo.ext-ens.ion",
                       Layout.FLAT.getArtifactPath( artifact ) );
 -- 
 1.8.1.4
--- a/0003-Implement-Java-home-resolver.patch
+++ b/0003-Implement-Java-home-resolver.patch
@ -1,209 +0,0 @@
 From 4114b3d2fd431c9fe82c4a0da1b44dafcf2f9c9c Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 5 Jun 2013 15:36:57 +0200
 Subject: [PATCH 3/3] Implement Java home resolver
 ---
 .../maven/resolver/DefaultResolver.java            |  1 +
 .../fedoraproject/maven/resolver/DepmapReader.java |  2 +-
 .../maven/resolver/JavaHomeResolver.java           | 62 ++++++++++++++++++++
 .../maven/resolver/JavaHomeResolverTest.java       | 68 ++++++++++++++++++++++
 .../tools-jar-depmap.xml                           | 17 ++++++
 5 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 xmvn-core/src/main/java/org/fedoraproject/maven/resolver/JavaHomeResolver.java
 create mode 100644 xmvn-core/src/test/java/org/fedoraproject/maven/resolver/JavaHomeResolverTest.java
 create mode 100644 xmvn-core/src/test/resources/java-home-resolver-depmaps/tools-jar-depmap.xml
 diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultResolver.java b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultResolver.java
 index c6a82ad..89ba190 100644
 --- a/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultResolver.java
 +++ b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DefaultResolver.java
@@ -100,6 +100,7 @@ public class DefaultResolver
             File root = new File( prefix );
             if ( root.isDirectory() )
             {
 +                resolvers.add( new JavaHomeResolver( root, settings, logger ) );
                 Resolver resolver = new SystemResolver( root, settings, logger );
                 resolvers.add( new CachingResolver( resolver, logger ) );
             }
 diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DepmapReader.java b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DepmapReader.java
 index 69398d7..a69ec5d 100644
 --- a/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DepmapReader.java
 +++ b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/DepmapReader.java
@@ -107,7 +107,7 @@ class DepmapReader
     {
         for ( String path : settings.getMetadataRepositories() )
         {
 -            File file = new File( path );
 +            File file = root.toPath().resolve( path ).toFile();
             if ( file.isDirectory() )
             {
 diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/JavaHomeResolver.java b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/JavaHomeResolver.java
 new file mode 100644
 index 0000000..964b6fa
 --- /dev/null
 +++ b/xmvn-core/src/main/java/org/fedoraproject/maven/resolver/JavaHomeResolver.java
@@ -0,0 +1,62 @@
 +/*-
 + * Copyright (c) 2013 Red Hat, Inc.
 + *
 + * Licensed under the Apache License, Version 2.0 (the "License");
 + * you may not use this file except in compliance with the License.
 + * You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.fedoraproject.maven.resolver;
 +
 +import static org.fedoraproject.maven.utils.FileUtils.followSymlink;
 +
 +import java.io.File;
 +import java.nio.file.Path;
 +import java.nio.file.Paths;
 +
 +import org.codehaus.plexus.logging.Logger;
 +import org.fedoraproject.maven.config.ResolverSettings;
 +import org.fedoraproject.maven.model.Artifact;
 +
 +/**
 + * @author Mikolaj Izdebski
 + */
 +class JavaHomeResolver
 +    extends AbstractResolver
 +{
 +    private final DependencyMap depmap;
 +
 +    public JavaHomeResolver( File root, ResolverSettings settings, Logger logger )
 +    {
 +        depmap = DepmapReader.readArtifactMap( root, settings, logger );
 +    }
 +
 +    @Override
 +    public File resolve( Artifact requestedArtifact )
 +    {
 +        for ( Artifact artifact : depmap.translate( requestedArtifact.clearVersionAndExtension() ) )
 +        {
 +            artifact = artifact.copyMissing( requestedArtifact );
 +            String javaHome = System.getProperty( "java.home" );
 +
 +            if ( artifact.getGroupId().equals( "JAVA_HOME" ) && javaHome != null )
 +            {
 +                Path javaHomeDir = followSymlink( new File( javaHome ) ).toPath();
 +                Path artifactPath = Paths.get( artifact.getArtifactId() + "." + artifact.getExtension() );
 +                File artifactFile = javaHomeDir.resolve( artifactPath ).toFile();
 +                artifactFile = followSymlink( artifactFile );
 +                if ( artifactFile.exists() )
 +                    return artifactFile;
 +            }
 +        }
 +
 +        return null;
 +    }
 +}
 diff --git a/xmvn-core/src/test/java/org/fedoraproject/maven/resolver/JavaHomeResolverTest.java b/xmvn-core/src/test/java/org/fedoraproject/maven/resolver/JavaHomeResolverTest.java
 new file mode 100644
 index 0000000..ff5215d
 --- /dev/null
 +++ b/xmvn-core/src/test/java/org/fedoraproject/maven/resolver/JavaHomeResolverTest.java
@@ -0,0 +1,68 @@
 +/*-
 + * Copyright (c) 2013 Red Hat, Inc.
 + *
 + * Licensed under the Apache License, Version 2.0 (the "License");
 + * you may not use this file except in compliance with the License.
 + * You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.fedoraproject.maven.resolver;
 +
 +import java.io.File;
 +
 +import org.codehaus.plexus.PlexusTestCase;
 +import org.codehaus.plexus.logging.Logger;
 +import org.fedoraproject.maven.config.ResolverSettings;
 +import org.fedoraproject.maven.model.Artifact;
 +import org.fedoraproject.maven.utils.FileUtils;
 +
 +/**
 + * @author Mikolaj Izdebski
 + */
 +public class JavaHomeResolverTest
 +    extends PlexusTestCase
 +{
 +    /**
 +     * Test if artifacts are resolved correctly from Java home.
 +     * 
 +     * @throws Exception
 +     */
 +    public void testJavaHomeResolver()
 +        throws Exception
 +    {
 +        ResolverSettings settings = new ResolverSettings();
 +        assertTrue( settings.getPrefixes().isEmpty() );
 +        assertTrue( settings.getMetadataRepositories().isEmpty() );
 +        settings.addPrefix( FileUtils.CWD.getAbsolutePath() );
 +        settings.addMetadataRepository( "src/test/resources/java-home-resolver-depmaps" );
 +
 +        File root = new File( settings.getPrefixes().iterator().next() );
 +        assertTrue( root.isDirectory() );
 +        JavaHomeResolver javaHomeResolver = new JavaHomeResolver( root, settings, lookup( Logger.class ) );
 +
 +        Artifact comSunToolsArtifact = new Artifact( "com.sun", "tools", "SYSTEM", "jar" );
 +        File comSunToolsFile = javaHomeResolver.resolve( comSunToolsArtifact );
 +        assertNotNull( comSunToolsFile );
 +        assertTrue( comSunToolsFile.exists() );
 +
 +        Artifact toolsArtifact = new Artifact( "JAVA_HOME", "../lib/tools", "SYSTEM", "jar" );
 +        File toolsFile = javaHomeResolver.resolve( toolsArtifact );
 +        assertNotNull( toolsFile );
 +        assertTrue( toolsFile.exists() );
 +
 +        Artifact toolzArtifact = new Artifact( "JAVA_HOME", "../lib/toolz", "SYSTEM", "jar" );
 +        File toolzFile = javaHomeResolver.resolve( toolzArtifact );
 +        assertNull( toolzFile );
 +
 +        Artifact xpp3Artifact = new Artifact( "JPP/xpp3", "xpp3", "SYSTEM", "jar" );
 +        File xpp3File = javaHomeResolver.resolve( xpp3Artifact );
 +        assertNull( xpp3File );
 +    }
 +}
 diff --git a/xmvn-core/src/test/resources/java-home-resolver-depmaps/tools-jar-depmap.xml b/xmvn-core/src/test/resources/java-home-resolver-depmaps/tools-jar-depmap.xml
 new file mode 100644
 index 0000000..86b85c4
 --- /dev/null
 +++ b/xmvn-core/src/test/resources/java-home-resolver-depmaps/tools-jar-depmap.xml
@@ -0,0 +1,17 @@
 +<?xml version="1.0" encoding="US-ASCII"?>
 +<!-- Dependency map for com.sun:tools so that packages don't
 +     need to use system scope and provide systemPath. -->
 +<dependencyMap>
 +  <dependency>
 +    <maven>
 +      <groupId>com.sun</groupId>
 +      <artifactId>tools</artifactId>
 +      <version>SYSTEM</version>
 +    </maven>
 +    <jpp>
 +      <groupId>JAVA_HOME</groupId>
 +      <artifactId>../lib/tools</artifactId>
 +      <version>SYSTEM</version>
 +    </jpp>
 +  </dependency>
 +</dependencyMap>
 -- 
 1.8.1.4
--- a/2
+++ b/2
@ -1 +1 @@
-343ac79abbc7efeaf1a872b75469aed7  xmvn-1.0.0.tar.xz
+54c6c0524da43a56fffab2427eac1f89  xmvn-1.0.2.tar.xz
--- a/xmvn-eclipse-plugin.patch
+++ b/xmvn-eclipse-plugin.patch
@ -1,11 +0,0 @@
 --- xmvn-core/src/main/java/org/fedoraproject/maven/installer/JarInstaller.java~	2013-05-24 10:12:18.000000000 +0200
 +++ xmvn-core/src/main/java/org/fedoraproject/maven/installer/JarInstaller.java	2013-07-23 07:58:47.020084935 +0200
@@ -43,7 +43,7 @@
     @Override
     public List<String> getSupportedPackagingTypes()
     {
 -        return Arrays.asList( "bundle", "ejb", "jar", "maven-plugin" );
 +        return Arrays.asList( "bundle", "eclipse-plugin", "ejb", "jar", "maven-plugin" );
     }
     @Override
--- a/xmvn-effective-pom.patch
+++ b/xmvn-effective-pom.patch
@ -1,84 +0,0 @@
 diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java b/xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java
 index 8c5e8a6..b2996a3 100644
 --- a/xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java
 +++ b/xmvn-core/src/main/java/org/fedoraproject/maven/Configuration.java
@@ -114,6 +114,13 @@ public class Configuration
         return Paths.get( installPomDir );
     }
 +    private static String installEffectivePomDir = "usr/share/maven-effective-poms";
 +
 +    public static Path getInstallEffectivePomDir()
 +    {
 +        return Paths.get( installEffectivePomDir );
 +    }
 +
     private static String installDepmapDir = "usr/share/maven-fragments";
     public static Path getInstallDepmapDir()
 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
 index 39a8db4..09e127d 100644
 --- 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
@@ -66,7 +66,6 @@ public class InstallMojo
         Path jppGroup;
         Path jppName;
 -        Path pomFile;
         DependencyVisitor metadata = targetPackage.getMetadata();
         if ( file != null )
@@ -77,11 +76,7 @@ public class InstallMojo
                     + "\" has unsupported extension. The only supported extension is \".jar\"" );
             }
 -            pomFile = Files.createTempFile( "xmvn-" + artifactId + "-", ".pom.xml" );
 -            DependencyExtractor.simplifyEffectiveModel( project.getModel() );
 -            DependencyExtractor.writeModel( project.getModel(), pomFile );
             List<Path> extraList = new LinkedList<>();
 -
             for ( Rule rule : Configuration.getInstallFiles() )
             {
                 String name = rule.match( groupId, artifactId, version );
@@ -101,10 +96,14 @@ public class InstallMojo
             targetPackage.addJarFile( file, baseFile, extraList );
             DependencyExtractor.getJavaCompilerTarget( project, metadata );
 +
 +            Path effectivePomFile = Files.createTempFile( "xmvn-" + artifactId + "-", ".pom.xml" );
 +            DependencyExtractor.simplifyEffectiveModel( project.getModel() );
 +            DependencyExtractor.writeModel( project.getModel(), effectivePomFile );
 +            targetPackage.addEffectivePomFile( effectivePomFile, jppGroup, jppName );
         }
         else
         {
 -            pomFile = project.getFile().toPath();
             jppGroup = Paths.get( "JPP" ).resolve( Configuration.getInstallName() );
             jppName = Paths.get( groupId + "@" + artifactId );
@@ -112,7 +111,7 @@ public class InstallMojo
             DependencyExtractor.generateRawRequires( rawModel, metadata );
         }
 -        targetPackage.addPomFile( pomFile, jppGroup, jppName );
 +        targetPackage.addPomFile( project.getFile().toPath(), jppGroup, jppName );
         targetPackage.createDepmaps( groupId, artifactId, version, jppGroup, jppName );
         DependencyExtractor.generateEffectiveRuntimeRequires( project.getModel(), metadata );
 diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/Package.java b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/Package.java
 index a228971..2df3434 100644
 --- a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/Package.java
 +++ b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/Package.java
@@ -86,6 +86,12 @@ public class Package
         addFile( file, Configuration.getInstallPomDir(), pomName, 0644 );
     }
 +    public void addEffectivePomFile( Path file, Path jppGroupId, Path jppArtifactId )
 +    {
 +        Path pomName = Paths.get( jppGroupId.toString().replace( '/', '.' ) + "-" + jppArtifactId + ".pom" );
 +        addFile( file, Configuration.getInstallEffectivePomDir(), pomName, 0644 );
 +    }
 +
     private static boolean containsNativeCode( Path jar )
         throws IOException
     {
--- a/xmvn.spec
+++ b/xmvn.spec
@ -1,6 +1,6 @@
 Name:           xmvn
-Version:        1.0.0
+Version:        1.0.2
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Local Extensions for Apache Maven
 License:        ASL 2.0
 URL:            http://mizdebsk.fedorapeople.org/xmvn
@ -141,6 +141,9 @@ end
 %doc LICENSE NOTICE
 %changelog
 * Fri Sep 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.2-1
 - Update to upstream version 1.0.2
 * Tue Sep 10 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0.0-2
 - Workaround broken symlinks for core and connector (#986909)
`@ -1 +1 @@`
	`343ac79abbc7efeaf1a872b75469aed7 xmvn-1.0.0.tar.xz`	`54c6c0524da43a56fffab2427eac1f89 xmvn-1.0.2.tar.xz`