Merge branch 'master' into greenkeeper/stylelint-config-standard-18.0.0

CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased][] (7.1.0 ?)
+## [Unreleased][]
+
+## [7.1.0][] - 2017-12-06
 
 ### Features
 
@@ -256,9 +258,10 @@ This release overlays on [App-Framework v3.0.3](https://github.com/uPortal-Proje
 See also:
 - the [6.0.0 milestone](https://github.com/uPortal-Project/uportal-home/milestone/5?closed=1).
 
-[Unreleased]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-7.0.3...HEAD
-[7.0.3]: https://github.com/uPortal-Project/uportal-home/releases/tag/uportal-home-parent-7.0.3
-[7.0.2]: https://github.com/uPortal-Project/uportal-home/releases/tag/uportal-home-parent-7.0.2
+[Unreleased]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-7.1.0...HEAD
+[7.1.0]: https://github.com/uPortal-Project/uportal-home/releases/tag/uportal-home-parent-7.0.3...uportal-home-parent-7.1.0
+[7.0.3]: https://github.com/uPortal-Project/uportal-home/releases/tag/uportal-home-parent-7.0.2..uportal-home-parent-7.0.3
+[7.0.2]: https://github.com/uPortal-Project/uportal-home/releases/tag/uportal-home-parent-7.0.1...uportal-home-parent-7.0.2
 [7.0.1]: https://github.com/uPortal-Project/uportal-home/compare/angularjs-portal-parent-7.0.0...uportal-home-parent-7.0.1
 [7.0.0]: https://github.com/uPortal-Project/uportal-home/compare/angularjs-portal-parent-6.7.0...uportal-home-parent-7.0.0
 [6.7.0]: https://github.com/uPortal-Project/uportal-home/compare/angularjs-portal-parent-6.6.0...angularjs-portal-parent-6.7.0

appveyor.yml

@@ -27,6 +27,11 @@ install:
   - mvn --version
   - node --version
   - npm --version
+
+  # Work around for "Error: EPERM: operation not permitted" from require js
+  # This can be removed when https://github.com/uPortal-Project/uportal-app-framework/issues/346 is resolved
+  - npm config set unsafe-perm=true
+
   - npm install
 build_script:
   - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V

docs/apereo-incubation.md

@@ -19,7 +19,7 @@ Items are checked where the project believes it now fulfills the exit criteria.
   - [x] 4.1.1 Out-bound licensing
   - [x] 4.1.2 License marking
   - [x] 4.1.3 Contributor License Agreements
-  - [ ] 4.1.4 Name trademark clarity
+  - [x] 4.1.4 Name trademark clarity
 - [ ] 4.2 Community
   - [ ] 4.2.a Level of community involvement
   - [ ] 4.2.b Organization of community
@@ -76,6 +76,7 @@ Next actions:
 
 Naming considerations: Names should reflect uPortal commitment and represent how the product should be used.
 
+Benito Gonzalez confirmed via US Patent and Trademark search that uPortal-home is not registered.
 
 + Proposed names:
   + `uw-frame` → `uPortal-app-framework`

mock-portal/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apereo.uportal</groupId>
     <artifactId>uportal-home-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>uportal-home-mock-portal</artifactId>