You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2017/01/10 15:22:36 UTC
asterixdb git commit: Specify Phase For Built-Plugin Invocations
Repository: asterixdb
Updated Branches:
refs/heads/master 361a905a8 -> e3687b76d
Specify Phase For Built-Plugin Invocations
To avoid a chicken/egg problem, usages of plugins built with the reactor
must have a supplied phase, otherwise they need to be installed prior to
being used in the build.
Also, support having dependencies that are not installed, but contained
within the reactor.
Change-Id: I13bb817a7f247dc538965a5c6dc9052aca60ed4e
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1425
Reviewed-by: Till Westmann <ti...@apache.org>
Tested-by: Michael Blow <mb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e3687b76
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e3687b76
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e3687b76
Branch: refs/heads/master
Commit: e3687b76d24c5f16060fc6ad68c7f2e31cbcde28
Parents: 361a905
Author: Michael Blow <mb...@apache.org>
Authored: Mon Jan 9 17:18:32 2017 -0500
Committer: Michael Blow <mb...@apache.org>
Committed: Tue Jan 10 07:22:05 2017 -0800
----------------------------------------------------------------------
asterixdb/asterix-installer/pom.xml | 1 +
.../main/java/org/apache/asterix/license/GenerateFileMojo.java | 4 +---
.../src/main/java/org/apache/asterix/license/LicenseMojo.java | 4 ++--
asterixdb/asterix-server/pom.xml | 1 +
asterixdb/asterix-yarn/pom.xml | 1 +
5 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e3687b76/asterixdb/asterix-installer/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-installer/pom.xml b/asterixdb/asterix-installer/pom.xml
index f8cb866..36afffa 100644
--- a/asterixdb/asterix-installer/pom.xml
+++ b/asterixdb/asterix-installer/pom.xml
@@ -46,6 +46,7 @@
<version>${project.version}</version>
<executions>
<execution>
+ <phase>generate-resources</phase>
<goals>
<!--<goal>licensedownload</goal>-->
<goal>generate</goal>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e3687b76/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/GenerateFileMojo.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/GenerateFileMojo.java b/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/GenerateFileMojo.java
index 179d426..191aa6b 100644
--- a/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/GenerateFileMojo.java
+++ b/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/GenerateFileMojo.java
@@ -56,7 +56,6 @@ import org.apache.asterix.license.project.Project;
import org.apache.commons.io.IOUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
@@ -64,8 +63,7 @@ import org.apache.maven.project.ProjectBuildingException;
@Mojo(name = "generate",
requiresProject = true,
- requiresDependencyResolution = ResolutionScope.TEST,
- defaultPhase = LifecyclePhase.GENERATE_RESOURCES)
+ requiresDependencyResolution = ResolutionScope.TEST)
public class GenerateFileMojo extends LicenseMojo {
public static final Pattern FOUNDATION_PATTERN = Pattern.compile("^\\s*This product includes software developed " +
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e3687b76/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/LicenseMojo.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/LicenseMojo.java b/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/LicenseMojo.java
index debb06f..eab4f10 100644
--- a/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/LicenseMojo.java
+++ b/asterixdb/asterix-maven-plugins/license-automation-plugin/src/main/java/org/apache/asterix/license/LicenseMojo.java
@@ -159,8 +159,8 @@ public abstract class LicenseMojo extends AbstractMojo {
licenseUrl = fakeLicenseUrl;
}
}
- File path = new File(localRepository.getBasedir(), localRepository.pathOf(depProject.getArtifact()));
- addProject(new Project(depProject, depLocation, path), new LicenseSpec(licenseUrl, displayName), true);
+ addProject(new Project(depProject, depLocation, depProject.getArtifact().getFile()),
+ new LicenseSpec(licenseUrl, displayName), true);
}
protected void addProject(Project project, LicenseSpec spec, boolean additive) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e3687b76/asterixdb/asterix-server/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index c764752..4009b1e 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -47,6 +47,7 @@
<version>${project.version}</version>
<executions>
<execution>
+ <phase>generate-resources</phase>
<goals>
<goal>generate</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e3687b76/asterixdb/asterix-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml
index adb183b..3c484f9 100644
--- a/asterixdb/asterix-yarn/pom.xml
+++ b/asterixdb/asterix-yarn/pom.xml
@@ -91,6 +91,7 @@
<version>${project.version}</version>
<executions>
<execution>
+ <phase>generate-resources</phase>
<goals>
<goal>generate</goal>
</goals>