Merge branch 'releases/1.8.0'

Author: mbhave

.clean-cf-release-build

@@ -1,32 +1,51 @@
 set -e -x
 
 #clean up source code, we don't need that anymore
-rm -rf ${BUILD_DIR}/uaa/scim
 rm -rf ${BUILD_DIR}/uaa/common
+rm -rf ${BUILD_DIR}/uaa/docs
 rm -rf ${BUILD_DIR}/uaa/gatling
+rm -rf ${BUILD_DIR}/uaa/gem
+rm -rf ${BUILD_DIR}/uaa/gradle
 rm -rf ${BUILD_DIR}/uaa/samples
-rm -rf ${BUILD_DIR}/uaa/docs
+rm -rf ${BUILD_DIR}/uaa/scim
+rm -rf ${BUILD_DIR}/uaa/scripts
 rm -rf ${BUILD_DIR}/uaa/uaa
 
-rm -f ${BUILD_DIR}/uaa/README.md
-rm -f ${BUILD_DIR}/uaa/NOTICE
-rm -f ${BUILD_DIR}/uaa/.run-script.sh
+rm -f ${BUILD_DIR}/uaa/.clean-cf-release-build
+rm -f ${BUILD_DIR}/uaa/.git
+rm -f ${BUILD_DIR}/uaa/.gitignore
+rm -f ${BUILD_DIR}/uaa/.gitreview
 rm -f ${BUILD_DIR}/uaa/.travis.yml
-rm -f ${BUILD_DIR}/uaa/pom.xml
+rm -f ${BUILD_DIR}/uaa/build.gradle
+rm -f ${BUILD_DIR}/uaa/gradle.properties
+rm -f ${BUILD_DIR}/uaa/gradlew
+rm -f ${BUILD_DIR}/uaa/gradlew.bat
 rm -f ${BUILD_DIR}/uaa/LICENSE
+rm -f ${BUILD_DIR}/uaa/NOTICE
+rm -f ${BUILD_DIR}/uaa/README.md
+rm -f ${BUILD_DIR}/uaa/settings.gradle
+rm -f ${BUILD_DIR}/uaa/shared_versions.gradle
 
-rm -rf ${BUILD_DIR}/login/src
+rm -rf ${BUILD_DIR}/login/.gradle
 rm -rf ${BUILD_DIR}/login/docs
+rm -rf ${BUILD_DIR}/login/gradle
+rm -rf ${BUILD_DIR}/login/scripts
+rm -rf ${BUILD_DIR}/login/src
+rm -rf ${BUILD_DIR}/login/uaa
 
-rm -f ${BUILD_DIR}/login/README.md
-rm -f ${BUILD_DIR}/login/NOTICE
 rm -f ${BUILD_DIR}/login/.apply_spring_profiles_to_login_yaml.sh
-rm -f ${BUILD_DIR}/login/.cobertura-instrument.sh
-rm -f ${BUILD_DIR}/login/.cobertura-report.sh
+rm -f ${BUILD_DIR}/login/.git
 rm -f ${BUILD_DIR}/login/.gitignore
+rm -f ${BUILD_DIR}/login/.gitmodules
 rm -f ${BUILD_DIR}/login/.gitreview
-rm -f ${BUILD_DIR}/login/cloudfoundry*.iml
-rm -f ${BUILD_DIR}/login/.run-script.sh
 rm -f ${BUILD_DIR}/login/.travis.yml
-rm -f ${BUILD_DIR}/login/pom.xml
+rm -f ${BUILD_DIR}/login/build.gradle
+rm -f ${BUILD_DIR}/login/build_properties.gradle
+rm -f ${BUILD_DIR}/login/gradle.properties
+rm -f ${BUILD_DIR}/login/gradlew
+rm -f ${BUILD_DIR}/login/gradlew.bat
 rm -f ${BUILD_DIR}/login/LICENSE
+rm -f ${BUILD_DIR}/login/NOTICE
+rm -f ${BUILD_DIR}/login/OpenAM-README.md
+rm -f ${BUILD_DIR}/login/README.md
+rm -f ${BUILD_DIR}/login/settings.gradle

.cobertura-instrument.sh

@@ -1,4 +1,3 @@
-target/
 *~
 #*
 .#*
@@ -28,5 +27,9 @@ Servers/
 *.swo
 coverage.ec
 git.properties
+build.properties
 *.md.html
 phantomjsdriver.log
+.gradle/
+build/
+/classes/

.cobertura-report.sh

@@ -0,0 +1,3 @@
+[submodule "uaa"]
+	path = uaa
+	url = https://github.com/cloudfoundry/uaa.git

.gitignore

@@ -1,49 +1,46 @@
 language: java
 env:
   global:
-    - CATALINA_PID=/tmp/tomcat.pid
-    - CATALINA_OUT=/tmp/tomcat.log
-    - CATALINA_OPTS="-XX:MaxPermSize=256M -DUAA_PROFILE=local"
+    - secure: "J5DYxGOG/3MjrzoEJLla/GVq2Z5Nx2oCbYEDNRbAnIIol0Dj5JK1++mXpED3+4fJKkNQBhqMZn1t6P0s/OIng0pUpg9QB7tKAMdJ+N7FKRAM5Ko8g+XhWXWAmxbob3uy2qPIEGWDczskTBmwZus/Zv3N59qwNUGq3HRiCR5BR3g="
   matrix:
-    - SPRING_PROFILES=default,coverage
-    - SPRING_PROFILES=default,saml,coverage
+    - TESTENV=default
+    - TESTENV=default,saml
 cache:
-  apt: true
   directories:
-  - $HOME/.m2/repository
+    - $HOME/.gradle
 before_install:
+  - cp $TRAVIS_BUILD_DIR/uaa/scripts/travis/init.gradle $HOME/.gradle
   - git pull --unshallow
-  - wget -O tomcat.tar.gz http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52.tar.gz
 install:
-  - $TRAVIS_BUILD_DIR/.apply_spring_profiles_to_login_yaml.sh $SPRING_PROFILES
+  - $TRAVIS_BUILD_DIR/.apply_spring_profiles_to_login_yaml.sh $TESTENV
   - cat src/main/resources/login.yml
-  - mvn -U test-compile -P coverage --quiet
-  - mkdir -p target/tomcat
-  - tar zxf tomcat.tar.gz -C target/tomcat --strip-components 1
-  - export WEBAPPS_DIR=$TRAVIS_BUILD_DIR/target/tomcat/webapps
-  - rm -rf $WEBAPPS_DIR/*
-  - export IDENTITY_VERSION=`mvn help:evaluate -Dexpression=project.parent.version | grep -v "\[" | tail -n 1`
-  - mvn -U dependency:copy -Dartifact=org.cloudfoundry.identity:cloudfoundry-identity-uaa:$IDENTITY_VERSION:war -DoutputDirectory=$WEBAPPS_DIR --quiet
-  - mv $WEBAPPS_DIR/cloudfoundry-identity-uaa-*.war $WEBAPPS_DIR/uaa.war
-  - mvn -U dependency:copy -Dartifact=org.cloudfoundry.identity:cloudfoundry-identity-app:$IDENTITY_VERSION:war -DoutputDirectory=$WEBAPPS_DIR --quiet
-  - mv $WEBAPPS_DIR/cloudfoundry-identity-app-*.war $WEBAPPS_DIR/app.war
-  - mvn -U dependency:copy -Dartifact=org.cloudfoundry.identity:cloudfoundry-identity-api:$IDENTITY_VERSION:war -DoutputDirectory=$WEBAPPS_DIR --quiet
-  - mv $WEBAPPS_DIR/cloudfoundry-identity-api-*.war $WEBAPPS_DIR/api.war
-before_script:
-  - $TRAVIS_BUILD_DIR/.cobertura-instrument.sh
-  - mvn -Dwar.exploded.dir=$WEBAPPS_DIR/login war:exploded -P coverage
-  - export CI_LOGGING_CONFIG=$TRAVIS_BUILD_DIR/src/test/resources/log4j_ci.properties
 script:
-  - ./.run-script.sh start
-  - mvn -Dspring.profiles.active=${SPRING_PROFILES} -Dlogging.config=file://$CI_LOGGING_CONFIG -Dlog4j.configuration=$CI_LOGGING_CONFIG verify -DforceIntegrationTests -DfailIfNoTests=false -Dtest="org.cloudfoundry.identity.uaa.login.feature.*" -P coverage
-  - curl -v -X POST http://localhost:8080/login/healthz/coverage/flush
-  - ./.run-script.sh stop
-  - mvn -Dspring.profiles.active=${SPRING_PROFILES} -Dlogging.config=file://$CI_LOGGING_CONFIG -Dlog4j.configuration=$CI_LOGGING_CONFIG test -P coverage
+  - ./gradlew -Dspring.profiles.active=$TESTENV :cobertura
 after_success:
-  - $TRAVIS_BUILD_DIR/.cobertura-report.sh
-  - mvn coveralls:cobertura
+  - ./gradlew :coveralls
+  - python scripts/travis/travis_after_all.py
+  - export $(cat .to_export_back)
+  - |
+      if [ "$BUILD_LEADER" = "YES" ]; then
+        if [ "$BUILD_AGGREGATE_STATUS" = "others_succeeded" ]; then
+          echo "All Succeded!"
+          if [ "$TRAVIS_BRANCH" = "develop" ]; then
+            $TRAVIS_BUILD_DIR/scripts/travis/auto-bump-uaa.sh
+          fi
+        else
+          echo "Some Failed"
+        fi
+      fi
 after_failure:
-  - cat $CATALINA_OUT
+  - python scripts/travis/travis_after_all.py
+  - export $(cat .to_export_back)
+  - |
+      if [ "$BUILD_LEADER" = "YES" ]; then
+        if [ "$BUILD_AGGREGATE_STATUS" = "others_failed" ]; then
+          echo "All Failed"
+        else
+          echo "Some Failed"
+        fi
+      fi
 after_script:
-  - rm -rf tomcat
-  - rm -f tomcat.tar.gz
+  - echo leader=$BUILD_LEADER status=$BUILD_AGGREGATE_STATUS

.gitmodules

@@ -11,27 +11,23 @@ from the UAA and no data are stored locally).
 ## Running and Testing the Login Server
 
 The Login Server is a standard JEE servlet application, and you can
-build a war file and deploy it to any container you like (`mvn
-package` and look in the `target` directory).  For convenience there
-is also a Maven profile that will run the Login Server, the UAA and
-some sample apps all in the same container from the command line
-(assuming you have the UAA and Login Server cloned in separate
-directories with a common parent):
-
-    $ (cd uaa; mvn clean install)
-    $ cd login-server
-    $ mvn clean install
-    $ mvn tomcat7:run -P integration
-
-The unit tests will have been run as part of `mvn install`, or can be
-run on their own with `mvn test`.
-
-You can run the Login Server integration tests using the command line as
-well. These integration tests will be skipped automatically if a Login
-Server and UAA have not been started locally. These tests require
+build a war file and deploy it to any container you like (`./gradlew
+:war` and look in the `build/libs` directory).  For convenience there
+is also a Gradle task that will run the Login Server, the UAA and
+some sample apps all in the same container from the command line:
+
+    $ ./gradlew run
+
+You can run the Login Server tests using the command line as
+well. The integration tests require
 [PhantomJS](http://phantomjs.org/download.html) to be installed.
 
-    $ mvn verify
+    $ ./gradlew :test
+    $ ./gradlew :integrationTest
+
+You can run all tests for the login server and the uaa with
+
+    $ ./gradlew test integrationTest
 
 There are two documents that can help you configure the login server in your environment.