You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/06/12 20:58:52 UTC
airavata git commit: fixing basic maven warnings
Repository: airavata
Updated Branches:
refs/heads/develop 3eca75420 -> 486d7330b
fixing basic maven warnings
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/486d7330
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/486d7330
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/486d7330
Branch: refs/heads/develop
Commit: 486d7330b691f5c15e23449c787b5d921d4c1106
Parents: 3eca754
Author: Suresh Marru <sm...@apache.org>
Authored: Sun Jun 12 16:58:41 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sun Jun 12 16:58:41 2016 -0400
----------------------------------------------------------------------
modules/commons/pom.xml | 2 +-
modules/gfac/gfac-core/pom.xml | 16 ++++++----------
modules/workflow/workflow-core/pom.xml | 9 ++-------
.../user-group-models/user_profile_model.thrift | 1 +
4 files changed, 10 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/486d7330/modules/commons/pom.xml
----------------------------------------------------------------------
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 7f9db2f..6ee9d59 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-model-utils</artifactId>
- <version>${parent.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
http://git-wip-us.apache.org/repos/asf/airavata/blob/486d7330/modules/gfac/gfac-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/pom.xml b/modules/gfac/gfac-core/pom.xml
index 6a103b9..0cbafe1 100644
--- a/modules/gfac/gfac-core/pom.xml
+++ b/modules/gfac/gfac-core/pom.xml
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
the License. -->
-<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">
+<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">
<parent>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-gfac</artifactId>
@@ -35,14 +36,9 @@
<artifactId>airavata-registry-cpi</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-cpi</artifactId>
+ <artifactId>airavata-registry-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -94,9 +90,9 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-client-configuration</artifactId>
<scope>test</scope>
@@ -141,7 +137,7 @@
<configuration>
<schemaDirectory>src/main/resources</schemaDirectory>
<xmlConfigs>
- <xmlConfig implementation="java.io.File">src/main/resources/gsissh-schemas.xsdconfig </xmlConfig>
+ <xmlConfig implementation="java.io.File">src/main/resources/gsissh-schemas.xsdconfig</xmlConfig>
</xmlConfigs>
<sourceGenerationDirectory>src/main/java</sourceGenerationDirectory>
<outputJar>target/generated/${project.artifactId}-${project.version}.jar</outputJar>
http://git-wip-us.apache.org/repos/asf/airavata/blob/486d7330/modules/workflow/workflow-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/pom.xml b/modules/workflow/workflow-core/pom.xml
index 51d7735..1047953 100644
--- a/modules/workflow/workflow-core/pom.xml
+++ b/modules/workflow/workflow-core/pom.xml
@@ -1,5 +1,6 @@
<?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">
+<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">
<parent>
<artifactId>workflow</artifactId>
<groupId>org.apache.airavata</groupId>
@@ -42,12 +43,6 @@
<artifactId>gson</artifactId>
<version>2.4</version>
</dependency>
- <!-- Airavata default parser dependency -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-cpi</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- Messaging dependency -->
<dependency>
<groupId>org.apache.airavata</groupId>
http://git-wip-us.apache.org/repos/asf/airavata/blob/486d7330/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift b/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
index 3d8a9de..a0abaed 100644
--- a/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
+++ b/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
@@ -81,6 +81,7 @@ struct Award {
struct UserProfile {
1: optional string userModelVersion = USER_PROFILE_VERSION,
2: optional string airavataInternalUserId = "DO_NOT_ADD_AT_CLIENT",
+ 3: optional string
3: optional string email,
4: optional string name,
5: optional i64 tier,