Unverified Commit f28befe9 authored by Daniel Bluhm's avatar Daniel Bluhm Committed by GitHub

Merge pull request #491 from marshallmcdonnell/marshall/488-top-level-pom

Create top-level POM for ICE + BATS refactoring
parents de1a36e8 0baf77d6
...@@ -4,11 +4,23 @@ Please see [the website](https://www.eclipse.org/ice) for more information on th ...@@ -4,11 +4,23 @@ Please see [the website](https://www.eclipse.org/ice) for more information on th
## Build Instructions ## Build Instructions
Checkout the project and from the org.eclipse.ice.build directory execute Checkout the project and execute
```bash ```bash
mvn clean install mvn clean install
``` ```
### Building BATS
The above build instructions will NOT include building `org.eclipse.ice.bats`.
This is due to the need to have an installation of Docker to run the BATS integration test.
In order to include BATS, you can instead run the `full` profile for the build instruction:
```bash
mvn clean install -P full
```
## Using the project generators ## Using the project generators
Once the build is complete, use the project generators to get started with a new Eclipse ICE project. From the shell, execute the following for a basic project: Once the build is complete, use the project generators to get started with a new Eclipse ICE project. From the shell, execute the following for a basic project:
......
...@@ -24,13 +24,13 @@ A test Fuseki container will be started and stopped during the tests using the [ ...@@ -24,13 +24,13 @@ A test Fuseki container will be started and stopped during the tests using the [
(GitHub repo link [here](https://github.com/fabric8io/docker-maven-plugin) (GitHub repo link [here](https://github.com/fabric8io/docker-maven-plugin)
``` ```
$ mvn clean docker:build install $ mvn clean install
``` ```
This installs the jar file to the local repository in `~/.m2`. It is also possible to build the package without installing by running This installs the jar file to the local repository in `~/.m2`. It is also possible to build the package without installing by running
``` ```
$ mvn clean docker:build verify $ mvn clean verify
``` ```
In both cases one can skip the tests by including `-DskipTests` in your build. In both cases one can skip the tests by including `-DskipTests` in your build.
......
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
<id>prepare-fuseki-database</id> <id>prepare-fuseki-database</id>
<phase>pre-integration-test</phase> <phase>pre-integration-test</phase>
<goals> <goals>
<goal>build</goal>
<goal>start</goal> <goal>start</goal>
</goals> </goals>
</execution> </execution>
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.build</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>org.eclipse.ice.build</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>../org.eclipse.ice.tests.util</module>
<module>../org.eclipse.ice.data</module>
<module>../org.eclipse.ice.dev</module>
<module>../org.eclipse.ice.archetypes</module>
<module>../org.eclipse.ice.commands</module>
<module>../org.eclipse.ice.bats</module>
</modules>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice</artifactId>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>org.eclipse.ice</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>org.eclipse.ice.tests.util</module>
<module>org.eclipse.ice.data</module>
<module>org.eclipse.ice.dev</module>
<module>org.eclipse.ice.archetypes</module>
<module>org.eclipse.ice.commands</module>
</modules>
<profiles>
<profile>
<id>full</id>
<modules>
<module>org.eclipse.ice.tests.util</module>
<module>org.eclipse.ice.data</module>
<module>org.eclipse.ice.dev</module>
<module>org.eclipse.ice.archetypes</module>
<module>org.eclipse.ice.commands</module>
<module>org.eclipse.ice.bats</module>
</modules>
</profile>
</profiles>
</project>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment