Merge branch 'master' of https://github.com/Alfresco/governance-services into feature/APPS-860_ReproduceFilterEventsByLogin

.travis.settings.xml

@@ -6,6 +6,15 @@
             <activeByDefault>true</activeByDefault>
          </activation>
          <repositories>
+            <repository>
+               <id>central</id>
+               <name>Central Repository</name>
+               <url>https://repo.maven.apache.org/maven2</url>
+               <layout>default</layout>
+               <snapshots>
+                  <enabled>false</enabled>
+               </snapshots>
+            </repository>
             <repository>
                <id>alfresco-internal</id>
                <releases>
@@ -19,21 +28,23 @@
             </repository>
          </repositories>
          <pluginRepositories>
+            <pluginRepository>
+               <id>central</id>
+               <name>Central Repository</name>
+               <url>https://repo.maven.apache.org/maven2</url>
+               <layout>default</layout>
+               <snapshots>
+                  <enabled>false</enabled>
+               </snapshots>
+               <releases>
+                  <updatePolicy>never</updatePolicy>
+               </releases>
+            </pluginRepository>
             <pluginRepository>
                <id>alfresco-internal</id>
                <name>Alfresco Internal Repository</name>
-               <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
-            </pluginRepository>
-            <pluginRepository>
-               <id>alfresco-public</id>
-               <name>Alfresco Public Repository</name>
                <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
             </pluginRepository>
-            <pluginRepository>
-               <id>alfresco-private</id>
-               <name>Alfresco Private Repository</name>
-               <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
-            </pluginRepository>
          </pluginRepositories>
       </profile>
    </profiles>
@@ -55,7 +66,7 @@
          <password>${env.MAVEN_PASSWORD}</password>
       </server>
       <server>
-         <id>alfresco-private</id>
+         <id>alfresco-public</id>
          <username>${env.MAVEN_USERNAME}</username>
          <password>${env.MAVEN_PASSWORD}</password>
       </server>

.travis.yml

@@ -42,7 +42,6 @@ stages:
   - name: Build AGS
   - name: Tests
     if: commit_message !~ /\[skip tests\]/
-  - name: Security Scans
   - name: Release
     if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[(community|enterprise) release .*\]/
   - name: Publish
@@ -72,11 +71,3 @@ jobs:
       before_script: source scripts/setUpMavenPhase.sh
       script:
         - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-
-    - name: "Source Clear Scan (SCA)"
-      stage: Security Scans
-      script: travis_wait 30 bash scripts/source_clear.sh
-    - name: "Static Analysis (SAST)"
-      stage: Security Scans
-      script:
-       - echo "Static Analysis (SAST)"

README.md

@@ -3,6 +3,22 @@
 ## Contributing
 Please refer to our [How to contribute](/CONTRIBUTING.md) guide and our [Contributor Covenant Code of Conduct](/CODE_OF_CONDUCT.md).
 
+## Configuring the ~/.m2/settings.xml file for local development
+In order to be able to pull all the necessary project dependencies, the alfresco Maven
+repositories should be configured in your local `~/.m2/settings.xml` file on your workstation.
+
+The necessary `<repository/>` and `<pluginRepository/>` configuration is available in the
+[.travis.settings.xml](.travis.settings.xml) file (_alfresco-internal_ profile),
+which is used by the project 's CI pipeline.
+Just copy the **alfresco-internal** profile into your own `~/m2/repository.xml`.
+You will also need to define an `alfresco-internal` server, but with your own Alfresco Nexus
+credentials.
+
+For additional instructions you can check the official Maven documentation:
+* [setting up repositories](https://maven.apache.org/guides/mini/guide-multiple-repositories.html)
+* [setting up servers](https://maven.apache.org/settings.html#servers)
+* [password encryption](https://maven.apache.org/guides/mini/guide-encryption.html)
+
 ## Configuring and starting Alfresco/Share
 * Clone the project (e.g. `git clone git@github.com:Alfresco/governance-services.git`)
 * Import the project as a maven project

pom.xml

@@ -34,42 +34,6 @@
       <maven>3.3.9</maven>
    </prerequisites>
 
-   <repositories>
-      <repository>
-         <id>alfresco-internal</id>
-         <name>Alfresco Internal Repository</name>
-         <url>https://artifacts.alfresco.com/nexus/content/groups/internal/</url>
-      </repository>
-      <repository>
-         <id>alfresco-public</id>
-         <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
-      </repository>
-      <repository>
-         <id>alfresco-public-snapshots</id>
-         <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
-      </repository>
-   </repositories>
-
-   <pluginRepositories>
-      <pluginRepository>
-         <id>alfresco-private</id>
-         <name>Alfresco Internal Repository</name>
-         <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
-      </pluginRepository>
-      <pluginRepository>
-         <id>alfresco-public</id>
-         <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
-      </pluginRepository>
-      <pluginRepository>
-         <id>alfresco-plugin-public</id>
-         <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
-      </pluginRepository>
-      <pluginRepository>
-         <id>alfresco-plugin-public-snapshots</id>
-         <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
-      </pluginRepository>
-   </pluginRepositories>
-
    <distributionManagement>
       <repository>
          <id>alfresco-internal</id>
@@ -98,18 +62,6 @@
             <module>rm-automation</module>
             <module>rm-benchmark</module>
          </modules>
-         <repositories>
-            <repository>
-               <id>alfresco-internal</id>
-               <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
-            </repository>
-         </repositories>
-         <pluginRepositories>
-            <pluginRepository>
-               <id>alfresco-private</id>
-               <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
-            </pluginRepository>
-         </pluginRepositories>
       </profile>
       <!-- Generate the Javadoc for Public API only (filtered on AlfrescoPublicApi annotation) -->
       <profile>

travis/.travis.tests-stage.yml

@@ -11,7 +11,7 @@ jobs:
           target_paths: $TRAVIS_BUILD_NUMBER/$TRAVIS_JOB_NUMBER
       install:
         - |
-          if [[ ${TRAVIS_BRANCH} == *community* ]]; then
+          if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then
             travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am
           else
             travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am
@@ -19,7 +19,7 @@ jobs:
         - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-community-rest-api -am
       before_script:
         - |
-          if [[ ${TRAVIS_BRANCH} == *community* ]]; then
+          if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then
             bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH false
           else
             bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH false
@@ -30,6 +30,7 @@ jobs:
 
     - name: "Enterprise Rest API Tests"
       stage: Tests
+      if: commit_message !~ /\[tests on community\]/
       addons:
         artifacts:
           paths:
@@ -51,6 +52,7 @@ jobs:
 
     - name: "Enterprise Rest API WORM Tests"
       stage: Tests
+      if: commit_message !~ /\[tests on community\]/
       addons:
         artifacts:
           paths:
@@ -72,6 +74,7 @@ jobs:
 
     - name: "Enterprise Rest API Cluster Tests"
       stage: Tests
+      if: commit_message !~ /\[tests on community\]/
       addons:
         artifacts:
           paths:
@@ -206,3 +209,8 @@ jobs:
       after_script:
         - bash scripts/getLogs.sh
         - bash scripts/cleanup.sh
+
+    - name: "Source Clear Scan (SCA)"
+      stage: Tests
+      if: branch = master OR branch =~ /release\/V3.\d+.*/
+      script: travis_wait 30 bash scripts/source_clear.sh