You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2018/12/29 19:10:08 UTC
[1/3] usergrid git commit: Minor updates that prevent deployment
errors
Repository: usergrid
Updated Branches:
refs/heads/master 6af6f17a3 -> 87f53a96f
Minor updates that prevent deployment errors
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/07557785
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/07557785
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/07557785
Branch: refs/heads/master
Commit: 075577853f229b17cc8877c86ff02506a26d69e1
Parents: 0635958
Author: Joost van Ulden <jo...@vanulden.com>
Authored: Mon Aug 27 20:07:01 2018 -0700
Committer: Joost van Ulden <jo...@vanulden.com>
Committed: Mon Aug 27 20:07:01 2018 -0700
----------------------------------------------------------------------
deployment/aws/pom.xml | 7 ++++---
.../aws/src/main/groovy/tag_instance.groovy | 18 ------------------
2 files changed, 4 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/07557785/deployment/aws/pom.xml
----------------------------------------------------------------------
diff --git a/deployment/aws/pom.xml b/deployment/aws/pom.xml
index 88a423b..91ad738 100644
--- a/deployment/aws/pom.xml
+++ b/deployment/aws/pom.xml
@@ -30,7 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <aws.s3.release-bucket>ug-cloudformation</aws.s3.release-bucket>
+ <aws.s3.release-bucket>fs-ug-cloudformation</aws.s3.release-bucket>
<!-- Pulls the file path from maven when using the dependency plugin. This doesn't work b/c it doesn't name the file properly to ROOT.war. Solve that to use the latest from the repo-->
<!--<stack.war>${org.apache.usergrid:usergrid-rest:war}</stack.war>-->
<stack.war>../../stack/rest/target/ROOT.war</stack.war>
@@ -126,7 +126,7 @@
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
- <version>0.8.0</version>
+ <version>0.9.3</version>
</dependency>
</dependencies>
</plugin>
@@ -218,6 +218,7 @@
<artifactId>aws-java-sdk</artifactId>
<version>1.9.7</version>
</dependency>
+
<dependency>
<artifactId>groovy-all</artifactId>
<groupId>org.codehaus.groovy</groupId>
@@ -229,7 +230,7 @@
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid-rest</artifactId>
<!-- Change this if you want to deploy a specific version, otherwise the latest in the repository will be used-->
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/07557785/deployment/aws/src/main/groovy/tag_instance.groovy
----------------------------------------------------------------------
diff --git a/deployment/aws/src/main/groovy/tag_instance.groovy b/deployment/aws/src/main/groovy/tag_instance.groovy
index 99d3288..e48881f 100644
--- a/deployment/aws/src/main/groovy/tag_instance.groovy
+++ b/deployment/aws/src/main/groovy/tag_instance.groovy
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. The ASF licenses this file to You
- * under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License. For additional information regarding
- * copyright in this work, please see the NOTICE file in the top level
- * directory of this distribution.
- */
-
//
// tag_instance.groovy
[2/3] usergrid git commit: PATCH - Updated Portal Dependencies
Posted by mr...@apache.org.
PATCH - Updated Portal Dependencies
Portal will now build without errors.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4fd27f12
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4fd27f12
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4fd27f12
Branch: refs/heads/master
Commit: 4fd27f12e440639de829fffb3b3bc424616f0b25
Parents: 0755778
Author: Joost van Ulden <jo...@vanulden.com>
Authored: Tue Aug 28 20:26:39 2018 -0700
Committer: Joost van Ulden <jo...@vanulden.com>
Committed: Tue Aug 28 20:26:39 2018 -0700
----------------------------------------------------------------------
portal/Gruntfile.js | 2 +-
portal/package.json | 51 +++++++++++++++++++++++++-----------------------
2 files changed, 28 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/4fd27f12/portal/Gruntfile.js
----------------------------------------------------------------------
diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js
index f0cdc94..9ea0c43 100644
--- a/portal/Gruntfile.js
+++ b/portal/Gruntfile.js
@@ -94,7 +94,7 @@ module.exports = function(grunt) {
mangle: false,
compress: false,
beautify: true,
- wrap: true
+ wrap: false
},
files: {
'js/generated/usergrid-dev.js': [
http://git-wip-us.apache.org/repos/asf/usergrid/blob/4fd27f12/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index 74a68ac..8b7588f 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -1,5 +1,5 @@
{
- "name": "usergrid",
+ "name": "usergrid",
"version": "2.0.19",
"packageName": "appsvc-ui",
"description": "full usergrid portal",
@@ -9,37 +9,40 @@
"url": "https://github.com/usergrid/usergrid.git"
},
"devDependencies": {
- "chromedriver": "~2.10.0-1",
- "grunt": "~0.4.4",
- "grunt-cli": "~0.1.11",
- "grunt-contrib-cssmin": "~0.7.0",
- "grunt-contrib-uglify": "~0.2.7",
+ "bower": "~1.2.8",
+ "chromedriver": "^2.41.0",
+ "grunt": ">=0.4.5 <1.0.0",
"grunt-angular-templates": "~0.4.7",
- "grunt-contrib-watch": "~0.5.3",
- "grunt-contrib-connect": "~0.5.0",
+ "grunt-bower-task": "^0.5.0",
+ "grunt-cli": "^1.3.1",
+ "grunt-contrib-clean": "~0.4.0",
+ "grunt-contrib-compress": "^1.4.3",
"grunt-contrib-concat": "~0.3.0",
- "karma-script-launcher": "~0.1.0",
+ "grunt-contrib-connect": "^1.0.2",
+ "grunt-contrib-copy": "~0.4.1",
+ "grunt-contrib-cssmin": "~0.7.0",
+ "grunt-contrib-uglify": "^3.4.0",
+ "grunt-contrib-watch": "^1.1.0",
+ "grunt-dom-munger": "~3.1.0",
+ "grunt-istanbul": "^0.8.0",
+ "grunt-karma": "2.0.0",
+ "grunt-protractor-runner": "^5.0.0",
+ "karma": "^3.0.0",
"karma-chrome-launcher": "~0.1.1",
- "karma-html2js-preprocessor": "~0.1.0",
+ "karma-coffee-preprocessor": "~0.1.1",
"karma-firefox-launcher": "~0.1.2",
+ "karma-html2js-preprocessor": "~0.1.0",
"karma-jasmine": "~0.1.3",
- "karma-coffee-preprocessor": "~0.1.1",
- "requirejs": "~2.1.9",
+ "karma-phantomjs-launcher": "^1.0.4",
"karma-requirejs": "~0.2.0",
- "karma-phantomjs-launcher": "~0.1.1",
- "karma": "~0.10.8",
- "grunt-karma": "~0.6.2",
- "protractor": "~0.22.0",
- "grunt-protractor-runner": "~0.2.0",
- "grunt-contrib-copy": "~0.4.1",
- "grunt-contrib-compress": "~0.12.0",
- "grunt-contrib-clean": "~0.4.0",
- "grunt-dom-munger": "~3.1.0",
- "bower": "~1.2.8",
- "grunt-bower-task": "~0.4.0",
- "grunt-istanbul": "~0.2.5"
+ "karma-script-launcher": "~0.1.0",
+ "protractor": "^5.4.0",
+ "requirejs": "~2.1.9"
},
"engines": {
"node": ">=0.10.21"
+ },
+ "dependencies": {
+ "grunt-jslint": "^1.1.15"
}
}
[3/3] usergrid git commit: Merge commit 'refs/pull/596/head' of
github.com:apache/usergrid
Posted by mr...@apache.org.
Merge commit 'refs/pull/596/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/87f53a96
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/87f53a96
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/87f53a96
Branch: refs/heads/master
Commit: 87f53a96ff14d4ab6bb394b5e9150991e98bf6c0
Parents: 6af6f17 4fd27f1
Author: Michael Russo <ru...@google.com>
Authored: Sat Dec 29 11:10:00 2018 -0800
Committer: Michael Russo <ru...@google.com>
Committed: Sat Dec 29 11:10:00 2018 -0800
----------------------------------------------------------------------
portal/Gruntfile.js | 2 +-
portal/package.json | 51 +++++++++++++++++++++++++-----------------------
2 files changed, 28 insertions(+), 25 deletions(-)
----------------------------------------------------------------------