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 2017/04/04 11:28:06 UTC
[1/2] airavata git commit: updating apache parent pom
Repository: airavata
Updated Branches:
refs/heads/master a90e9bb15 -> 71d67f1c7
updating apache parent pom
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7958a0f8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7958a0f8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7958a0f8
Branch: refs/heads/master
Commit: 7958a0f8b02345c5c4eaf69ce8eaa8fbddd05e6f
Parents: 5100c07
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Apr 4 07:27:49 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Apr 4 07:27:49 2017 -0400
----------------------------------------------------------------------
pom.xml | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7958a0f8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5f2dcc3..f4c21ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>16</version>
+ <version>18</version>
</parent>
<groupId>org.apache.airavata</groupId>
@@ -70,8 +70,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<axis2.version>1.5.1</axis2.version>
- <derby.version>10.11.1.1</derby.version>
- <org.slf4j.version>1.7.10</org.slf4j.version>
+ <derby.version>10.13.1.1</derby.version>
+ <org.slf4j.version>1.7.25</org.slf4j.version>
<log4j.version>1.2.17</log4j.version>
<axiom.version>1.2.8</axiom.version>
<surefire.version>2.18.1</surefire.version>
@@ -88,7 +88,6 @@
<atomixmiser.version>0.9.4</atomixmiser.version>
<jython.version>2.5.3</jython.version>
<jersey.version>1.13</jersey.version>
- <tomcat.version>7.0.41</tomcat.version>
<cargo.version>1.3.1</cargo.version>
<oa4mp.version>1.1.3</oa4mp.version>
<antrun.version>1.8</antrun.version>
@@ -552,10 +551,15 @@
<executions>
<execution>
<goals>
- <goal>process</goal>
+ <goal>bundle</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -583,7 +587,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.6.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -659,7 +663,7 @@
<!--<module>modules/workflow</module>-->
<!--<module>modules/xbaya-gui</module>-->
<module>modules/distribution</module>
- <module>modules/test-suite</module>
+ <!--<module>modules/test-suite</module>-->
</modules>
</profile>
<profile>
[2/2] airavata git commit: Merge remote-tracking branch
'origin/master'
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/71d67f1c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/71d67f1c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/71d67f1c
Branch: refs/heads/master
Commit: 71d67f1c753930f6018b0b8449f9c7b0568bc7db
Parents: 7958a0f a90e9bb
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Apr 4 07:28:03 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Apr 4 07:28:03 2017 -0400
----------------------------------------------------------------------
.../scigap/production/files/airavata.jks | 76 +++++++++++
.../scigap/production/files/airavata_sym.jks | 30 +++++
.../production/files/client_truststore.jks | 126 +++++++++++++++++++
.../scigap/production/group_vars/all/vars.yml | 92 ++++++++++++++
.../scigap/production/group_vars/all/vault.yml | 20 +++
.../ansible/inventories/scigap/production/hosts | 21 ++++
.../ansible/roles/database/defaults/main.yml | 1 +
dev-tools/ansible/roles/database/tasks/main.yml | 1 -
dev-tools/ansible/roles/database/vars/main.yml | 1 -
9 files changed, 366 insertions(+), 2 deletions(-)
----------------------------------------------------------------------