You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/04/24 20:25:16 UTC
git commit: fixing the build error
Repository: airavata
Updated Branches:
refs/heads/master e524d7ee8 -> 8c6a9a5a2
fixing the build error
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8c6a9a5a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8c6a9a5a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8c6a9a5a
Branch: refs/heads/master
Commit: 8c6a9a5a24764026fd05f2371370e6177c750634
Parents: e524d7e
Author: lahiru <la...@apache.org>
Authored: Thu Apr 24 14:24:15 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Thu Apr 24 14:24:15 2014 -0400
----------------------------------------------------------------------
modules/distribution/client/java/pom.xml | 5 ---
.../java/src/main/assembly/bin-assembly.xml | 1 -
modules/gfac/gfac-core/pom.xml | 37 ++++++++++++--------
modules/gfac/gfac-ec2/pom.xml | 5 ---
.../orchestrator-client-sdks/pom.xml | 5 ---
5 files changed, 22 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8c6a9a5a/modules/distribution/client/java/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/client/java/pom.xml b/modules/distribution/client/java/pom.xml
index 1acc02a..aebb9af 100644
--- a/modules/distribution/client/java/pom.xml
+++ b/modules/distribution/client/java/pom.xml
@@ -314,11 +314,6 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
<artifactId>airavata-orchestrator-service</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/airavata/blob/8c6a9a5a/modules/distribution/client/java/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/client/java/src/main/assembly/bin-assembly.xml b/modules/distribution/client/java/src/main/assembly/bin-assembly.xml
index 4bfe5de..9497ba8 100644
--- a/modules/distribution/client/java/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/client/java/src/main/assembly/bin-assembly.xml
@@ -122,7 +122,6 @@
<include>org.apache.airavata:airavata-workflow-tracking:jar</include>
<include>org.apache.airavata:gsissh:jar</include>
<include>org.apache.airavata:airavata-model-utils:jar</include>
- <include>org.apache.airavata:airavata-job-monitor:jar</include>
<include>org.apache.airavata:airavata-orchestrator-service:jar</include>
<include>org.apache.openjpa:openjpa-all:jar</include>
<include>xerces:xercesImpl:jar:2.9.1</include>
http://git-wip-us.apache.org/repos/asf/airavata/blob/8c6a9a5a/modules/gfac/gfac-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/pom.xml b/modules/gfac/gfac-core/pom.xml
index e755c66..1ec707e 100644
--- a/modules/gfac/gfac-core/pom.xml
+++ b/modules/gfac/gfac-core/pom.xml
@@ -94,11 +94,6 @@
<artifactId>airavata-workflow-tracking</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>gfac-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- Credential Store -->
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -259,26 +254,38 @@
<artifactId>xmlbeans</artifactId>
<version>${xmlbeans.version}</version>
</dependency>
-
+ <!-- this is the dependency for amqp implementation -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.0.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <forkMode>always</forkMode>
+ <failIfNoTests>false</failIfNoTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jsonschema2pojo</groupId>
+ <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <version>0.4.0</version>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/resources/schema</sourceDirectory>
+ <targetPackage>org.apache.airavata</targetPackage>
+ </configuration>
<executions>
<execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>generate</goal>
</goals>
- <configuration>
- <outputDirectory>target/lib</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/airavata/blob/8c6a9a5a/modules/gfac/gfac-ec2/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ec2/pom.xml b/modules/gfac/gfac-ec2/pom.xml
index df2d035..6851658 100644
--- a/modules/gfac/gfac-ec2/pom.xml
+++ b/modules/gfac/gfac-ec2/pom.xml
@@ -52,11 +52,6 @@
<artifactId>airavata-workflow-execution-context</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>gfac-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- Workflow Tracking -->
<dependency>
<groupId>org.apache.airavata</groupId>
http://git-wip-us.apache.org/repos/asf/airavata/blob/8c6a9a5a/modules/orchestrator/orchestrator-client-sdks/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client-sdks/pom.xml b/modules/orchestrator/orchestrator-client-sdks/pom.xml
index 78945ed..059f936 100644
--- a/modules/orchestrator/orchestrator-client-sdks/pom.xml
+++ b/modules/orchestrator/orchestrator-client-sdks/pom.xml
@@ -48,11 +48,6 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
<artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>