You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/12/05 16:36:48 UTC
[39/50] [abbrv] marmotta git commit: MARMOTTA-510: Updated Installer
to reflect recent module changes/renamings.
MARMOTTA-510: Updated Installer to reflect recent module changes/renamings.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9c4587b5
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9c4587b5
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9c4587b5
Branch: refs/heads/master
Commit: 9c4587b55448717c7a79b6f156264eba23706f45
Parents: dc7fcb5
Author: Jakob Frank <ja...@apache.org>
Authored: Mon Dec 1 17:39:39 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Dec 2 09:17:18 2014 +0100
----------------------------------------------------------------------
.../maven/plugins/refpack/RefPackMojo.java | 33 ++++++++------------
launchers/marmotta-webapp/pom.xml | 16 ++++++++++
2 files changed, 29 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c4587b5/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
index 658baef..74707cb 100644
--- a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
+++ b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
@@ -17,30 +17,13 @@
*/
package org.apache.marmotta.maven.plugins.refpack;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
-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;
-import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.project.ProjectBuildingResult;
+import org.apache.maven.plugins.annotations.*;
+import org.apache.maven.project.*;
import org.jdom2.Element;
import org.jdom2.Text;
import org.jdom2.output.Format;
@@ -58,6 +41,15 @@ import org.sonatype.aether.resolution.DependencyResolutionException;
import org.sonatype.aether.resolution.DependencyResult;
import org.sonatype.aether.util.artifact.DefaultArtifact;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
/**
* Generate IzPack refpack descriptions from Maven dependencies
*/
@@ -199,7 +191,8 @@ public class RefPackMojo extends AbstractMojo {
// but not the commons and the JS-client
&& !artifactId.equals("marmotta-commons") && !artifactId.equals("marmotta-client-js")
// and not the marmotta-sesame-tools
- && !artifactId.startsWith("marmotta-util-") && !artifactId.startsWith("marmotta-sail-") && !artifactId.startsWith("marmotta-rio-");
+ && !artifactId.startsWith("marmotta-util-") && !artifactId.startsWith("marmotta-sail-")
+ && !artifactId.startsWith("marmotta-rio-") && !artifactId.startsWith("marmotta-model-");
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c4587b5/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index fb87868..97f2c67 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -444,6 +444,22 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>installer</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- The marmotta-installer requires the war to be installed in the local repo -->
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
<dependencies>