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