Merge branch 'master' into metrics-fix

Author: Travis Tomsu

.github/workflows/buildAndTest.yaml

@@ -25,15 +25,18 @@ jobs:
         java: [8, 11, 15]
     steps:
     - uses: actions/checkout@v2
+
     - uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.java }}
+
     - uses: actions/cache@v2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
+
     - name: Mvn install # Need this when the directory/pom structure changes
       run: |
         ./mvnw \
@@ -51,13 +54,23 @@ jobs:
           --fail-at-end \
           --threads 1.5C \
           test
+
+    - name: Aggregate Report
+      run: |
+        ./mvnw \
+          --batch-mode \
+          --define aggregate=true \
+          surefire-report:report-only
+
     - name: Archive logs
       if: always()
       continue-on-error: true
       uses: actions/upload-artifact@v2
       with:
         name: Unit Test Logs - Java ${{ matrix.java }}
-        path: "**/target/surefire-reports/*"
+        path: |
+          **/target/surefire-reports/*
+          **/target/site
 
 
   integrationTests:
@@ -134,13 +147,23 @@ jobs:
             --define skip.surefire.tests=true \
             --define it.${{ matrix.it }}=true \
             verify
+
+      - name: Aggregate Report
+        run: |
+          ./mvnw \
+            --batch-mode \
+            --define aggregate=true \
+            surefire-report:failsafe-report-only
+
       - name: Archive logs
         if: always()
         continue-on-error: true
         uses: actions/upload-artifact@v2
         with:
           name: Integration Test Logs - ${{ matrix.it}}
-          path: "**/target/failsafe-reports/*"
+          path: |
+            **/target/failsafe-reports/*
+            **/target/site
 
 
   releaseCheck:

spring-cloud-gcp-dependencies/pom.xml

@@ -312,6 +312,11 @@
     -->
 		<profile>
 			<id>release</id>
+			<activation>
+				<property>
+					<name>release</name>
+				</property>
+			</activation>
 			<build>
 				<plugins>
 					<plugin>

spring-cloud-gcp-samples/pom.xml

@@ -30,7 +30,6 @@
 		<skip.failsafe.tests>false</skip.failsafe.tests>
 		<integration-test.pattern>**/*IntegrationTest*</integration-test.pattern>
 		<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-		<nexus-staging-plugin.version>1.6.8</nexus-staging-plugin.version>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<maven.sources.skip>true</maven.sources.skip>
 	</properties>
@@ -92,24 +91,6 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>${nexus-staging-plugin.version}</version>
-						<extensions>true</extensions>
-						<configuration>
-							<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-							<serverId>ossrh</serverId>
-							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 
 	<dependencies>

spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/src/test/java/VisionOcrSampleIntegrationTest.java renamed to spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/src/test/java/com/example/VisionOcrSampleIntegrationTest.java

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import com.example.Application;
+package com.example;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;