added missing dependencies to distribution
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6d326138 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6d326138 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6d326138 Branch: refs/heads/auroraMesosIntegration Commit: 6d32613860201b83f0555c37b1acc2d14f0e9819 Parents: c72417e Author: Shameera Rathnayaka <[email protected]> Authored: Tue Nov 1 21:31:07 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Nov 1 21:31:07 2016 -0400 ---------------------------------------------------------------------- modules/cloud/aurora-client/pom.xml | 4 +- .../main/resources/aurora-scheduler.properties | 2 +- modules/distribution/pom.xml | 205 ++++++++++--------- pom.xml | 2 + 4 files changed, 114 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6d326138/modules/cloud/aurora-client/pom.xml ---------------------------------------------------------------------- diff --git a/modules/cloud/aurora-client/pom.xml b/modules/cloud/aurora-client/pom.xml index 8188c49..20f8f7c 100644 --- a/modules/cloud/aurora-client/pom.xml +++ b/modules/cloud/aurora-client/pom.xml @@ -44,12 +44,12 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20160212</version> + <version>${json.version}</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.5</version> + <version>${commons.io.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/airavata/blob/6d326138/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties ---------------------------------------------------------------------- diff --git a/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties b/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties index 0e1cc95..20e1973 100644 --- a/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties +++ b/modules/cloud/aurora-client/src/main/resources/aurora-scheduler.properties @@ -1,6 +1,6 @@ #Aurora scheduler properties -aurora.scheduler.host=52.15.129.208 +aurora.scheduler.host=52.15.103.85â aurora.scheduler.port=8081 http://git-wip-us.apache.org/repos/asf/airavata/blob/6d326138/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 427d4b4..4d2f973 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -24,92 +24,6 @@ <artifactId>apache-airavata-distribution</artifactId> <name>Airavata server distribution</name> <packaging>pom</packaging> - <url>http://airavata.apache.org/</url> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> - <executions> - <execution> - <id>unpack</id> - <phase>compile</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-server-configuration</artifactId> - <version>${project.version}</version> - <type>jar</type> - </artifactItem> - </artifactItems> - <!--includes>**/*.war</includes --> - <outputDirectory>${project.build.directory}/conf</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.5.5</version> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <tarLongFileMode>posix</tarLongFileMode> - <finalName>${archieve.name}-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assembly/bin-assembly.xml</descriptor> - <!-- <descriptor>src/main/assembly/src-assembly.xml</descriptor> --> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${airavata.bin.zip}</file> - <type>zip</type> - <classifier>bin</classifier> - </artifact> - <artifact> - <file>${airavata.bin.tar.gz}</file> - <type>tar.gz</type> - <classifier>bin</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>org.apache.derby</groupId> @@ -273,11 +187,11 @@ <artifactId>airavata-gfac-impl</artifactId> <version>${project.version}</version> </dependency> -<!-- <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-bes</artifactId> - <version>${project.version}</version> - </dependency>--> + <!-- <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-gfac-bes</artifactId> + <version>${project.version}</version> + </dependency>--> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-gfac-core</artifactId> @@ -288,17 +202,30 @@ <artifactId>airavata-gfac-service</artifactId> <version>${project.version}</version> </dependency> -<!-- <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-workflow-model-core</artifactId> - <version>${project.version}</version> - </dependency>--> + <!-- <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-workflow-model-core</artifactId> + <version>${project.version}</version> + </dependency>--> + + <!--Cloud module --> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>aurora-client</artifactId> <version>${project.version}</version> </dependency> <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>${json.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons.io.version}</version> + </dependency> + <!-- end Cloud module --> + <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-model-utils</artifactId> <version>${project.version}</version> @@ -560,6 +487,92 @@ </dependency> </dependencies> + <url>http://airavata.apache.org/</url> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.8</version> + <executions> + <execution> + <id>unpack</id> + <phase>compile</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-server-configuration</artifactId> + <version>${project.version}</version> + <type>jar</type> + </artifactItem> + </artifactItems> + <!--includes>**/*.war</includes --> + <outputDirectory>${project.build.directory}/conf</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.5</version> + <executions> + <execution> + <id>distribution-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <tarLongFileMode>posix</tarLongFileMode> + <finalName>${archieve.name}-${project.version}</finalName> + <descriptors> + <descriptor>src/main/assembly/bin-assembly.xml</descriptor> + <!-- <descriptor>src/main/assembly/src-assembly.xml</descriptor> --> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${airavata.bin.zip}</file> + <type>zip</type> + <classifier>bin</classifier> + </artifact> + <artifact> + <file>${airavata.bin.tar.gz}</file> + <type>tar.gz</type> + <classifier>bin</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> <jersey.version>1.13</jersey.version> http://git-wip-us.apache.org/repos/asf/airavata/blob/6d326138/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 81b258f..93e19f5 100644 --- a/pom.xml +++ b/pom.xml @@ -105,6 +105,8 @@ <maven.replacer.plugin.version>1.5.3</maven.replacer.plugin.version> <kafka-clients.version>0.8.2.2</kafka-clients.version> <logback.version>1.1.6</logback.version> + <json.version>20160212</json.version> + <commons.io.version>2.4</commons.io.version> </properties> <developers>
