From 46e02e60e574597d1d21cc2485cd91764a444264 Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Wed, 3 Aug 2016 12:34:13 -0700 Subject: [PATCH 1/4] updating poms for 3.11-SNAPSHOT development --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1959f7..657b3ca 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.cortez.samples javaee7-angular - 3.10-SNAPSHOT + 3.11-SNAPSHOT war javaee7-angular From a7818026d883566689be0d363db9d786213096c0 Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Wed, 3 Aug 2016 12:34:59 -0700 Subject: [PATCH 2/4] updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 657b3ca..2fa8a11 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.cortez.samples javaee7-angular - 3.11-SNAPSHOT + 3.10 war javaee7-angular From 8089e795647fbc7b493e047d7511b6b956387d8a Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Wed, 3 Aug 2016 12:35:03 -0700 Subject: [PATCH 3/4] Updating develop poms back to pre merge state --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2fa8a11..657b3ca 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.cortez.samples javaee7-angular - 3.10 + 3.11-SNAPSHOT war javaee7-angular From e99e2c460e29cef92afe02f2f7d60683d50edb33 Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Thu, 27 Oct 2016 08:10:08 -0700 Subject: [PATCH 4/4] Added MIT License. (cherry picked from commit 261ff07) --- LICENSE | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..5468a9c --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2014 Roberto Cortez + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.