This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-debian-helper.
commit 50f70b063e5a75aed589ddb3d6f98d7974d8d62f Author: Emmanuel Bourg <[email protected]> Date: Tue Feb 4 14:34:40 2014 +0100 Turned POMOptions into a top level class --- .../src/main/java/org/debian/maven/plugin/SysInstallMojo.java | 3 ++- .../src/main/java/org/debian/maven/packager/DependenciesSolver.java | 3 ++- .../main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java index f533585..43615e1 100644 --- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java +++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java @@ -29,6 +29,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.codehaus.plexus.util.FileUtils; import org.debian.maven.repo.ListOfPOMs; import org.debian.maven.repo.POMCleaner; +import org.debian.maven.repo.POMOptions; /** * Install pom and jar files into the /usr/share/hierarchy @@ -663,7 +664,7 @@ public class SysInstallMojo extends AbstractMojo { String relativePomPath = originalPom.getAbsolutePath(); relativePomPath = relativePomPath.substring(debianDir.getParentFile().getAbsolutePath().length() + 1); - ListOfPOMs.POMOptions pomOption = listOfPOMs.getPOMOptions(relativePomPath); + POMOptions pomOption = listOfPOMs.getPOMOptions(relativePomPath); if (pomOption != null && pomOption.isIgnore()) { throw new RuntimeException("POM file " + pomFile + " should be ignored"); diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java index cbae244..d0be45e 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java @@ -42,6 +42,7 @@ import org.debian.maven.repo.DependencyRuleSetFiles; import org.debian.maven.repo.ListOfPOMs; import org.debian.maven.repo.POMHandler; import org.debian.maven.repo.POMInfo; +import org.debian.maven.repo.POMOptions; import org.debian.maven.repo.Substvars; import org.debian.maven.repo.DependencyRuleSetFiles.RulesType; import org.debian.maven.repo.POMInfo.DependencyType; @@ -488,7 +489,7 @@ public class DependenciesSolver { } File tmpDest = File.createTempFile("pom", ".tmp", baseDir); tmpDest.deleteOnExit(); - ListOfPOMs.POMOptions options = pomTransformer.getListOfPOMs().getOrCreatePOMOptions(projectPom); + POMOptions options = pomTransformer.getListOfPOMs().getOrCreatePOMOptions(projectPom); boolean noParent = false; boolean hasPackageVersion = false; if (options != null) { diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java index 796c764..962834a 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java @@ -41,6 +41,7 @@ import org.debian.maven.packager.interaction.SimpleQuestion; import org.debian.maven.packager.util.LicensesScanner; import org.debian.maven.packager.util.PackageScanner; import org.debian.maven.repo.ListOfPOMs; +import org.debian.maven.repo.POMOptions; /** * Generate the Debian files for packaging the current Maven project. @@ -522,12 +523,12 @@ public class GenerateDebianFilesMojo extends AbstractMojo { extension = mavenProject.getArtifact().getFile().toString(); extension = extension.substring(extension.lastIndexOf('.') + 1); } - ListOfPOMs.POMOptions pomOptions = listOfPOMs.getOrCreatePOMOptions(pomFile); + POMOptions pomOptions = listOfPOMs.getOrCreatePOMOptions(pomFile); pomOptions.setArtifact(dirRelPath + "target/" + mavenProject.getArtifactId() + "-*." + extension); if ("jar".equals(extension) && generateJavadoc && "ant".equals(packageType) && listOfJavadocPOMs != null) { String artifactId = mavenProject.getArtifact().getArtifactId(); - ListOfPOMs.POMOptions javadocPomOptions = listOfJavadocPOMs.getOrCreatePOMOptions(pomFile); + POMOptions javadocPomOptions = listOfJavadocPOMs.getOrCreatePOMOptions(pomFile); javadocPomOptions.setIgnorePOM(true); javadocPomOptions.setArtifact(dirRelPath + "target/" + artifactId + ".javadoc.jar"); javadocPomOptions.setClassifier("javadoc"); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
