diff --git a/core/.gitattributes b/.gitattributes similarity index 61% rename from core/.gitattributes rename to .gitattributes index 8303247a395..a1ca838b969 100644 --- a/core/.gitattributes +++ b/.gitattributes @@ -5,4 +5,6 @@ *.css eol=crlf *.xml eol=crlf *.js eol=crlf -*.properties eol=crlf \ No newline at end of file +*.properties eol=crlf +# Shell scripts require LF +*.sh text eol=lf \ No newline at end of file diff --git a/core/.gitbugtraq b/.gitbugtraq similarity index 100% rename from core/.gitbugtraq rename to .gitbugtraq diff --git a/data-model/.gitignore b/.gitignore similarity index 94% rename from data-model/.gitignore rename to .gitignore index 93468433619..e24fe67a13e 100644 --- a/data-model/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ *.iml *.iws +#VSCode +/.vscode + # Mac .DS_Store diff --git a/packaging/.travis.settings.xml b/.travis.settings.xml similarity index 90% rename from packaging/.travis.settings.xml rename to .travis.settings.xml index 48b88983e0f..2b315c0b802 100644 --- a/packaging/.travis.settings.xml +++ b/.travis.settings.xml @@ -30,6 +30,11 @@ + + alfresco-public + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + alfresco-internal ${env.MAVEN_USERNAME} diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..4440855ad4b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,252 @@ +dist: xenial +sudo: required +language: java +jdk: + - openjdk11 + +services: + - docker + +cache: + directories: + - $HOME/.m2 +# the cache can grow constantly +before_cache: + - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-community-repo + - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-core + - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-data-model + - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-repository + - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-remote-api + - rm -rf $HOME/.m2/repository/org/alfresco/content-services-community + - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-community-repo-* + - rm -rf $HOME/.m2/repository/org/alfresco/tas/alfresco-community-repo-*-test + +branches: + only: + - master + - /release\/.*/ + +stages: + - name: test + if: commit_message !~ /\[skip tests\]/ + - release + - publish + - trigger_downstream + +before_install: "cp .travis.settings.xml $HOME/.m2/settings.xml" + +install: + - travis_retry mvn install -DskipTests=true -Dversion.edition=Community -PcommunityDocker -B -V + +jobs: + include: + - stage: test + name: "WhiteSource scan" + # only on release branches or master and if it is not a PR + if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request + script: + # Download the latest version of WhiteSource Unified Agent + - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar + # Run WhiteSource Unified Agent + - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config + # - name: "Source Clear Scan" + # # only on SP branches or master and if it is not a PR + # if: fork = false AND (branch = master OR branch =~ /release\/SP\/.*/) AND type != pull_request + # script: skip + # addons: + # srcclr: true + + - name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test" + script: + - travis_retry mvn test -pl core,data-model + - mvn test -B -pl repository -Dtest=AllUnitTestsSuite + + - name: "Repository - AppContext01TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Repository - AppContext02TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Repository - AppContext03TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.3.2 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dalfresco-pdf-renderer.url=http://localhost:8090/ -Djodconverter.url=http://localhost:8090/ -Dimg.url=http://localhost:8090/ -Dtika.url=http://localhost:8090/ -Dtransform.misc.url=http://localhost:8090/ + + - name: "Repository - AppContext04TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.3.2 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Repository - AppContext05TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + - "mkdir -p $HOME/tmp" + - "cp repository/src/test/resources/realms/alfresco-realm.json $HOME/tmp" + - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} + - "export HOST_IP=$(ip address show | grep -E \"([0-9]{1,3}\\.){3}[0-9]{1,3}\" | grep -v 127.0.0.1 | awk '{ print $2 }' | head -n 1 )" + - "export HOST_IP=$(echo ${HOST_IP%/*})" + - docker run -d -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -e DB_VENDOR=h2 -p 8999:8080 -e KEYCLOAK_IMPORT=/tmp/alfresco-realm.json -v $HOME/tmp/alfresco-realm.json:/tmp/alfresco-realm.json quay.io/alfresco/alfresco-identity-service:1.2 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AppContext05TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "-Didentity-service.auth-server-url=http://${HOST_IP}:8999/auth" + + - name: "Repository - AppContext06TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.3.2 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AppContext06TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dalfresco-pdf-renderer.url=http://localhost:8090/ -Djodconverter.url=http://localhost:8090/ -Dimg.url=http://localhost:8090/ -Dtika.url=http://localhost:8090/ -Dtransform.misc.url=http://localhost:8090/ + + - name: "Repository - AppContextExtraTestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Repository - MiscContextTestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.3.2 + script: travis_wait 20 mvn test -B -pl repository -Dtest=MiscContextTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dalfresco-pdf-renderer.url=http://localhost:8090/ -Djodconverter.url=http://localhost:8090/ -Dimg.url=http://localhost:8090/ -Dtika.url=http://localhost:8090/ -Dtransform.misc.url=http://localhost:8090/ + + - name: "Repository - MySQL tests" + before_install: + - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mysql:5.7.23 --transaction-isolation='READ-COMMITTED' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Repository - PostgreSQL 10 tests" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.9 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Repository - PostgreSQL 11 tests" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Repository - MariaDB tests" + before_install: + - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.2.18 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver + + - name: "Remote-api - AppContext01TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl remote-api -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Remote-api - AppContext02TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl remote-api -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Remote-api - AppContext03TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl remote-api -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Remote-api - AppContext04TestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl remote-api -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "Remote-api - AppContextExtraTestSuite" + before_install: + - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' + - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 + script: travis_wait 20 mvn test -B -pl remote-api -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + + - name: "REST API TAS tests part1" + jdk: openjdk11 + script: + - docker images + - ./packaging/tests/scripts/start-compose.sh ./packaging/tests/environment/docker-compose-minimal+transforms.yml + - ./packaging/tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" + - travis_wait 60 mvn install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false + + - name: "REST API TAS tests part2" + jdk: openjdk11 + install: + - ./packaging/tests/scripts/start-compose.sh ./packaging/tests/environment/docker-compose-minimal+transforms.yml + - ./packaging/tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" + script: + - travis_wait 60 mvn install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false + + - name: "REST API TAS tests part3" + jdk: openjdk11 + install: + - ./packaging/tests/scripts/start-compose.sh ./packaging/tests/environment/docker-compose-minimal+transforms.yml + - ./packaging/tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" + script: + - travis_wait 60 mvn install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false + + - name: "CMIS TAS tests" + jdk: openjdk11 + install: + - ./packaging/tests/scripts/start-compose.sh ./packaging/tests/environment/docker-compose-minimal+transforms.yml + - ./packaging/tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" + script: + - travis_wait 40 mvn install -q -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false + + - name: "Email TAS tests" + jdk: openjdk11 + install: + - ./packaging/tests/scripts/start-compose.sh ./packaging/tests/environment/docker-compose-minimal.yml + - ./packaging/tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" + script: + - travis_wait 30 mvn install -q -f packaging/tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false + + - name: "WebDAV TAS tests" + jdk: openjdk11 + install: + - ./packaging/tests/scripts/start-compose.sh ./packaging/tests/environment/docker-compose-minimal.yml + - ./packaging/tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" + script: + - travis_wait 30 mvn install -q -f packaging/tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false + + - name: "Integration TAS tests" + jdk: openjdk11 + install: + - ./packaging/tests/scripts/start-compose.sh ./packaging/tests/environment/docker-compose-minimal.yml + - ./packaging/tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" + script: + - travis_wait 30 mvn install -q -f packaging/tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false + +## Comment out for now to avoid pushing 8.300 to nuxus until we are ready +## - stage: release +## name: "Push to Nexus" +## if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message !~ /\[no-release\]/ +## before_install: +## - "cp .travis.settings.xml $HOME/.m2/settings.xml" +## script: +## # Use full history for release +## - git checkout -B "${TRAVIS_BRANCH}" +## # Add email to link commits to user +## - git config user.email "${GIT_EMAIL}" +## # Skip building of release commits +## - mvn --batch-mode -q -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform +# +# - name: "Trigger alfresco-enterprise-repo build" +# stage: trigger_downstream +# # for all active branches and if it is not a PR +# if: fork = false AND type != pull_request AND commit_message !~ /\[no-downstream\]/ +# install: skip +# script: bash trigger-travis.sh "Alfresco" "alfresco-enterprise-repo-play1" "${TRAVIS_BRANCH}" + diff --git a/core/.whitesource b/.whitesource similarity index 100% rename from core/.whitesource rename to .whitesource diff --git a/core/.wss-unified-agent.config b/.wss-unified-agent.config similarity index 99% rename from core/.wss-unified-agent.config rename to .wss-unified-agent.config index 6f9cb577958..0e61b820479 100644 --- a/core/.wss-unified-agent.config +++ b/.wss-unified-agent.config @@ -131,7 +131,7 @@ apiKey= #userKey is required if WhiteSource administrator has enabled "Enforce user level access" option #userKey= -projectName=alfresco-core +projectName=alfresco-community-repo projectVersion= projectToken= diff --git a/core/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from core/CONTRIBUTING.md rename to CONTRIBUTING.md diff --git a/core/LICENSE.txt b/LICENSE.txt similarity index 100% rename from core/LICENSE.txt rename to LICENSE.txt diff --git a/README.md b/README.md index e69de29bb2d..31f886bbbb3 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,23 @@ +# README + +Repository is a work in progress and is temporary. It will be deleted. Please do not clone it. + +It is an attempt to combine a number of existing community projects to make development of the repository component +simpler. It creates an alfresco.war and an alfresco/alfresco-community-repo-base docker image that contains no other +ACS components. A branch of acs-community-packaging is also being changed so that dependency management flows from +this project to the packaging and AMP projects. + +## Project versions + +This table shows the project branches/tags that have been used to create the branches on alfresco-community-repo. + +| alfresco-community-repo | alfresco-core | alfresco-data-model | alfresco-repository | alfresco-remote-api | acs-community-packaging | +| ----------------------- | ------------------ | -------------------- | -------------------- | -------------------- | ----------------------- | +|master | master | master | master | master | develop | +|release/6.2.N | support/SP/7.N | support/SP/8.50.N | support/SP/7.N | support/SP/7.N | develop | +|release/6.2.1 | tags/7.33 | tags/8.50.14 | support/HF/7.183.N | support/HF/7.133.N | develop | +|release/6.2.0 | tags/7.22 | support/HF/8.50.2.N | support/HF/7.134.N | support/HF/7.107.N | develop | +|release/6.1.1 | support/HF/7.5.7.N | support/HF/8.25.11.N | support/HF/7.33.42.N | support/HF/7.34.25.N | develop | +|release/6.1.0 | support/HF/7.5.1.N | tags/8.25.1 | support/HF/7.33.12.N | support/HF/7.34.1.N | develop | +|release/6.0.1 | tags/7.5 | tags/8.18 | support/HF/6.56.15.N | support/HF/6.39.7.N | develop | +|release/6.0.0 | tags/7.3 | tags/8.9 | support/HF/6.56.5.N | support/HF/6.39.2.N | develop | diff --git a/core/.gitignore b/core/.gitignore deleted file mode 100644 index 93468433619..00000000000 --- a/core/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -*.class - -# Eclipse -.classpath -.settings -.project - -# Intellij -.idea/ -*.iml -*.iws - -# Mac -.DS_Store - -# Maven -target -*.log -*.log.* - -# Mobile Tools for Java (J2ME) - -.mtj -.tmp/ - -# Package Files # - -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml - -hs_err_pid* diff --git a/core/.travis.settings.xml b/core/.travis.settings.xml deleted file mode 100644 index dffe7fbfe1f..00000000000 --- a/core/.travis.settings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - alfresco-public - ${env.MAVEN_USERNAME} - ${env.MAVEN_PASSWORD} - - - diff --git a/core/.travis.yml b/core/.travis.yml deleted file mode 100644 index 203105794c6..00000000000 --- a/core/.travis.yml +++ /dev/null @@ -1,52 +0,0 @@ -dist: trusty -sudo: required -language: java -jdk: - - openjdk11 - -cache: - directories: - - $HOME/.m2 - -branches: - only: - - master - - /support\/.*/ - -install: travis_retry mvn install -DskipTests=true -B -V - -stages: - - test - - release - -jobs: - include: - - stage: test - name: "Build and test" - script: travis_retry mvn test - - name: "WhiteSource scan" - # only on SP branches or master and if it is not a PR - if: fork = false AND (branch = master OR branch =~ /support\/SP\/.*/) AND type != pull_request - script: - # Download the latest version of WhiteSource Unified Agent - - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar - # Run WhiteSource Unified Agent - - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config - - name: "Source Clear Scan" - # only on SP branches or master and if it is not a PR - if: fork = false AND (branch = master OR branch =~ /support\/SP\/.*/) AND type != pull_request - script: skip - addons: - srcclr: true - - stage: release - name: "Push to Nexus" - if: fork = false AND (branch = master OR branch =~ /support\/.*/) AND type != pull_request AND commit_message !~ /\[no-release\]/ - before_install: - - "cp .travis.settings.xml $HOME/.m2/settings.xml" - script: - # Use full history for release - - git checkout -B "${TRAVIS_BRANCH}" - # Add email to link commits to user - - git config user.email "${GIT_EMAIL}" - # Skip building of release commits - - mvn --batch-mode -q -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform diff --git a/core/pom.xml b/core/pom.xml index de4664b25fb..cc9810670e9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,16 +1,15 @@ 4.0.0 - - - org.alfresco - alfresco-super-pom - 12 - alfresco-core - 8.40-SNAPSHOT Alfresco Core Alfresco core libraries and utils + + org.alfresco + alfresco-community-repo + 8.300-SNAPSHOT + + scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git @@ -25,32 +24,22 @@ - - 5.2.7.RELEASE - 8.5 - 11 - - commons-codec commons-codec - 1.14 commons-httpclient commons-httpclient - 3.1-HTTPCLIENT-1265 commons-logging commons-logging - 1.2 commons-io commons-io - 2.7 org.apache.commons @@ -71,12 +60,10 @@ org.json json - 20160212 org.springframework spring-orm - ${dependency.spring.version} @@ -89,12 +76,10 @@ org.springframework spring-context - ${dependency.spring.version} org.quartz-scheduler quartz - 2.3.2 @@ -107,12 +92,10 @@ org.alfresco.surf spring-surf-core-configservice - ${dependency.surf.version} jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 com.sun.xml.bind @@ -127,19 +110,16 @@ jakarta.transaction jakarta.transaction-api - 1.3.3 joda-time joda-time - 2.10.6 javax.servlet javax.servlet-api - 3.0.1 provided @@ -147,25 +127,21 @@ org.slf4j slf4j-log4j12 - 1.7.30 test junit junit - 4.13 test org.mockito mockito-core - 3.4.4 test commons-dbcp commons-dbcp - 1.4-DBCP330 test diff --git a/data-model/.gitattributes b/data-model/.gitattributes deleted file mode 100644 index 8303247a395..00000000000 --- a/data-model/.gitattributes +++ /dev/null @@ -1,8 +0,0 @@ -.* eol=crlf -*.html eol=crlf -*.java eol=crlf -*.txt eol=crlf -*.css eol=crlf -*.xml eol=crlf -*.js eol=crlf -*.properties eol=crlf \ No newline at end of file diff --git a/data-model/.gitbugtraq b/data-model/.gitbugtraq deleted file mode 100644 index bacffb702d6..00000000000 --- a/data-model/.gitbugtraq +++ /dev/null @@ -1,4 +0,0 @@ -# For SmartGit -[bugtraq "jira"] - url = https://issues.alfresco.com/jira/browse/%BUGID% - logRegex = ([A-Z]+-\\d+) diff --git a/data-model/.travis.settings.xml b/data-model/.travis.settings.xml deleted file mode 100644 index dffe7fbfe1f..00000000000 --- a/data-model/.travis.settings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - alfresco-public - ${env.MAVEN_USERNAME} - ${env.MAVEN_PASSWORD} - - - diff --git a/data-model/.travis.yml b/data-model/.travis.yml deleted file mode 100644 index 8875933e0c2..00000000000 --- a/data-model/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -dist: trusty -sudo: required -language: java -jdk: - - openjdk11 - -cache: - directories: - - $HOME/.m2 - -branches: - only: - - master - - /support\/.*/ - -install: travis_retry mvn install -DskipTests=true -B -V - -stages: - - test - - release - -jobs: - include: - - stage: test - name: "Build and test" - script: travis_retry mvn test - - name: "WhiteSource scan" - # only on SP branches or master and if it is not a PR - if: fork = false AND (branch = master OR branch =~ /support\/SP\/.*/) AND type != pull_request - script: - # Download the latest version of WhiteSource Unified Agent - - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar - # Run WhiteSource Unified Agent - - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config - - stage: release - name: "Push to Nexus" - if: fork = false AND (branch = master OR branch =~ /support\/.*/) AND type != pull_request AND commit_message !~ /\[no-release\]/ - before_install: - - "cp .travis.settings.xml $HOME/.m2/settings.xml" - script: - # Use full history for release - - git checkout -B "${TRAVIS_BRANCH}" - # Add email to link commits to user - - git config user.email "${GIT_EMAIL}" - # Skip building of release commits - - mvn --batch-mode -q -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform diff --git a/data-model/.whitesource b/data-model/.whitesource deleted file mode 100644 index f0569521415..00000000000 --- a/data-model/.whitesource +++ /dev/null @@ -1,8 +0,0 @@ -{ - "generalSettings": { - "shouldScanRepo": true - }, - "checkRunSettings": { - "vulnerableCheckRunConclusionLevel": "failure" - } -} \ No newline at end of file diff --git a/data-model/.wss-unified-agent.config b/data-model/.wss-unified-agent.config deleted file mode 100644 index e3e5f08dbbf..00000000000 --- a/data-model/.wss-unified-agent.config +++ /dev/null @@ -1,228 +0,0 @@ -#################################################################### -# WhiteSource Unified-Agent configuration file -#################################################################### -########################################## -# GENERAL SCAN MODE: Files and Package Managers -########################################## - -checkPolicies=true -forceCheckAllDependencies=true -forceUpdate=true -forceUpdate.failBuildOnPolicyViolation=true -offline=false -#ignoreSourceFiles=true -#scanComment= -#updateInventory=false -#resolveAllDependencies=false -#failErrorLevel=ALL -#requireKnownSha1=false -#generateScanReport=true -#scanReportTimeoutMinutes=10 -#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model - -#projectPerFolder=true -#projectPerFolderIncludes= -#projectPerFolderExcludes= - -#wss.connectionTimeoutMinutes=60 -# Change the below URL to your WhiteSource server. -# Use the 'WhiteSource Server URL' which can be retrieved -# from your 'Profile' page on the 'Server URLs' panel. -# Then, add the '/agent' path to it. -wss.url=https://saas.whitesourcesoftware.com/agent - -#npm.resolveDependencies=false -#npm.ignoreSourceFiles=false -#npm.includeDevDependencies=true -#npm.runPreStep=true -#npm.ignoreNpmLsErrors=true -#npm.ignoreScripts=true -#npm.yarnProject=true -#npm.accessToken= -#npm.identifyByNameAndVersion=true - -#bower.resolveDependencies=false -#bower.ignoreSourceFiles=true -#bower.runPreStep=true - -#nuget.resolvePackagesConfigFiles=false -#nuget.resolveCsProjFiles=false -#nuget.resolveDependencies=false -#nuget.restoreDependencies=true -#nuget.ignoreSourceFiles=true -#nuget.runPreStep=true -#nuget.resolveNuspecFiles=false - -#python.resolveDependencies=false -#python.ignoreSourceFiles=false -#python.ignorePipInstallErrors=true -#python.installVirtualenv=true -#python.resolveHierarchyTree=false -#python.requirementsFileIncludes=requirements.txt -#python.resolveSetupPyFiles=true -#python.runPipenvPreStep=true -#python.pipenvDevDependencies=true -#python.IgnorePipenvInstallErrors=true - -#maven.ignoredScopes=test provided -maven.resolveDependencies=true -#maven.ignoreSourceFiles=true -#maven.aggregateModules=true -maven.ignorePomModules=false -#maven.runPreStep=true -#maven.ignoreMvnTreeErrors=true -#maven.environmentPath= -#maven.m2RepositoryPath= - -#gradle.ignoredScopes= -#gradle.resolveDependencies=false -#gradle.runAssembleCommand=false -#gradle.runPreStep=true -#gradle.ignoreSourceFiles=true -#gradle.aggregateModules=true -#gradle.preferredEnvironment=wrapper -#gradle.localRepositoryPath= - -#paket.resolveDependencies=false -#paket.ignoredGroups= -#paket.ignoreSourceFiles=false -#paket.runPreStep=true -#paket.exePath= - -#go.resolveDependencies=false -#go.collectDependenciesAtRuntime=true -#go.dependencyManager= -#go.ignoreSourceFiles=true -#go.glide.ignoreTestPackages=false -#go.gogradle.enableTaskAlias=true - -#ruby.resolveDependencies = false -#ruby.ignoreSourceFiles = false -#ruby.installMissingGems = true -#ruby.runBundleInstall = true -#ruby.overwriteGemFile = true - -#sbt.resolveDependencies=false -#sbt.ignoreSourceFiles=true -#sbt.aggregateModules=true -#sbt.runPreStep=true -#sbt.targetFolder= - -#php.resolveDependencies=false -#php.runPreStep=true -#php.includeDevDependencies=true - -#html.resolveDependencies=false - -#cocoapods.resolveDependencies=false -#cocoapods.runPreStep=true -#cocoapods.ignoreSourceFiles=false - -#hex.resolveDependencies=false -#hex.runPreStep=true -#hex.ignoreSourceFiles=false -#hex.aggregateModules=true - -################################## -# Organization tokens: -################################## -apiKey= - -#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option -#userKey= - -projectName=alfresco-data-model -projectVersion= -projectToken= - -productName=ACS Community -productVersion= -productToken= -#updateType=APPEND -#requesterEmail=user@provider.com - -######################################################################################### -# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE -######################################################################################### -#includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx - -#includes=**/*.m **/*.mm **/*.js **/*.php -includes=**/*.jar -#includes=**/*.gem **/*.rb -#includes=**/*.dll **/*.cs **/*.nupkg -#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2 -#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py - -## Exclude file extensions or specific directories by adding **/*. or **/** -excludes=**/*sources.jar **/*javadoc.jar - -case.sensitive.glob=false -followSymbolicLinks=true - -################################## -# Archive properties -################################## -#archiveExtractionDepth=2 -#archiveIncludes=**/*.war **/*.ear -#archiveExcludes=**/*sources.jar - -################################## -# Proxy settings -################################## -#proxy.host= -#proxy.port= -#proxy.user= -#proxy.pass= - -################################## -# SCM settings -################################## -#scm.type= -#scm.user= -#scm.pass= -#scm.ppk= -#scm.url= -#scm.branch= -#scm.tag= -#scm.npmInstall= -#scm.npmInstallTimeoutMinutes= -#scm.repositoriesFile= - -############################################## -# SCAN MODE: Linux package manager settings -############################################## -#scanPackageManager=true - -################################## -# SCAN MODE: Docker images -################################## -#docker.scanImages=true -#docker.includes=.*.* -#docker.excludes= -#docker.pull.enable=true -#docker.pull.images=.*.* -#docker.pull.maxImages=10 -#docker.pull.tags=.*.* -#docker.pull.digest= -#docker.delete.force=true -#docker.login.sudo=false - -#docker.aws.enable=true -#docker.aws.registryIds= - -################################## -# SCAN MODE: Docker containers -################################## -#docker.scanContainers=true -#docker.containerIncludes=.*.* -#docker.containerExcludes= - -################################ -# Serverless settings -################################ -#serverless.provider= -#serverless.scanFunctions=true -#serverless.includes= -#serverless.excludes= -#serverless.region= -#serverless.maxFunctions=10 diff --git a/data-model/CONTRIBUTING.md b/data-model/CONTRIBUTING.md deleted file mode 100644 index 8d059e27ca0..00000000000 --- a/data-model/CONTRIBUTING.md +++ /dev/null @@ -1,16 +0,0 @@ -### Contributing -Thanks for your interest in contributing to this project! - -The following is a set of guidelines for contributing to this library. Most of them will make the life of the reviewer easier and therefore decrease the time required for the patch be included in the next version. - -Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](http://community.alfresco.com/community/ecm) where they can be referenced from multiple projects. - -Read an [overview on how this project is goverened](https://community.alfresco.com/docs/DOC-6385-project-overview-repository). - -You can report an issue in the ALF project of the [Alfresco issue tracker](http://issues.alfresco.com). - -Read [instructions for a good issue report](https://community.alfresco.com/docs/DOC-6263-reporting-an-issue). - -Read [instructions for making a contribution](https://community.alfresco.com/docs/DOC-6269-submitting-contributions). - -Please follow [the coding standards](https://community.alfresco.com/docs/DOC-4658-coding-standards). diff --git a/data-model/LICENSE.txt b/data-model/LICENSE.txt deleted file mode 100644 index 65c5ca88a67..00000000000 --- a/data-model/LICENSE.txt +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/data-model/pom.xml b/data-model/pom.xml index 4904b677f9d..4e85a77870f 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -1,16 +1,14 @@ 4.0.0 - - - org.alfresco - alfresco-super-pom - 12 - - alfresco-data-model Alfresco Data Model Alfresco Data Model classes - 8.138-SNAPSHOT + + + org.alfresco + alfresco-community-repo + 8.300-SNAPSHOT + scm:git:https://github.com/Alfresco/alfresco-data-model.git @@ -28,16 +26,12 @@ 1.24.1 - - 8.38 - 3.3.7 source/java/org/alfresco/repo/search/impl/parsers/CMIS*er.java, source/java/org/alfresco/repo/search/impl/parsers/FTSParser.java, source/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java - 11 @@ -141,78 +135,10 @@ - - - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-rs-client - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-ws-policy - ${dependency.cxf.version} - - - - org.bouncycastle - bcmail-jdk15on - 1.66 - - - - com.github.junrar - junrar - 4.0.0 - - - - org.jsoup - jsoup - 1.13.1 - - - - com.google.guava - guava - 28.2-jre - - - - org.apache.commons - commons-compress - 1.19 - - - - org.apache.pdfbox - pdfbox - 2.0.17 - - - - org.alfresco alfresco-core - ${dependency.alfresco-core.version} @@ -258,7 +183,6 @@ jakarta.transaction jakarta.transaction-api - 1.3.3 @@ -276,7 +200,7 @@ org.apache.chemistry.opencmis chemistry-opencmis-commons-impl - 1.0.0 + ${dependency.opencmis.version} com.sun.xml.messaging.saaj @@ -292,7 +216,7 @@ org.apache.chemistry.opencmis chemistry-opencmis-server-bindings - 1.0.0 + ${dependency.opencmis.version} commons-lang @@ -336,7 +260,6 @@ xerces xercesImpl - 2.12.0-alfresco-patched-20191004 @@ -397,19 +320,16 @@ junit junit - 4.13 test org.antlr gunit - 3.5.2 - test + test org.mockito mockito-core - 3.4.4 test diff --git a/packaging/.gitattributes b/packaging/.gitattributes deleted file mode 100644 index 8303247a395..00000000000 --- a/packaging/.gitattributes +++ /dev/null @@ -1,8 +0,0 @@ -.* eol=crlf -*.html eol=crlf -*.java eol=crlf -*.txt eol=crlf -*.css eol=crlf -*.xml eol=crlf -*.js eol=crlf -*.properties eol=crlf \ No newline at end of file diff --git a/packaging/.gitbugtraq b/packaging/.gitbugtraq deleted file mode 100644 index bacffb702d6..00000000000 --- a/packaging/.gitbugtraq +++ /dev/null @@ -1,4 +0,0 @@ -# For SmartGit -[bugtraq "jira"] - url = https://issues.alfresco.com/jira/browse/%BUGID% - logRegex = ([A-Z]+-\\d+) diff --git a/packaging/.gitignore b/packaging/.gitignore deleted file mode 100644 index f9983e601ee..00000000000 --- a/packaging/.gitignore +++ /dev/null @@ -1,41 +0,0 @@ -*.class - -# Eclipse -.classpath -.settings -.project - -# Intellij -.idea/ -*.iml -*.iws - -#VSCode -/.vscode - -# Mac -.DS_Store - -# Maven -target -*.log -*.log.* - - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -# Alfresco -alf_data/ - -helm/alfresco-content-services-community/charts/* -helm/alfresco-content-services-community/requirements.lock -helm/alfresco-content-services-community*.tgz - -# Travis deployment folder -deploy_dir \ No newline at end of file diff --git a/packaging/.travis.yml b/packaging/.travis.yml deleted file mode 100644 index 1e0b9de3e1c..00000000000 --- a/packaging/.travis.yml +++ /dev/null @@ -1,143 +0,0 @@ -dist: xenial -os: linux -language: java -jdk: - - openjdk11 - -services: - - docker - -cache: - directories: - - $HOME/.m2 -# the cache can grow constantly -before_cache: - - rm -rf $HOME/.m2/repository/org/alfresco/acs-community-packaging -env: - global: - - VERSION_EDITION=Community - # Must be in the format - ie. 6.3.0-repo-xxxx-x or 6.3.0-Ax - - RELEASE_VERSION=6.2.2-RC1 - - DEVELOPMENT_VERSION=6.2.2-SNAPSHOT -branches: - only: - - master - - develop - -stages: - - name: test - if: commit_message !~ /\[skip tests\]/ - - release - - publish - -before_install: "cp .travis.settings.xml $HOME/.m2/settings.xml" - -jobs: - include: - - stage: test - name: "WhiteSource scan" - # only on master or develop and if it is not a PR - if: fork = false AND branch =~ ^(master|develop)$ AND type != pull_request - install: - - travis_retry travis_wait 30 mvn -q install "-Dversion.edition=${VERSION_EDITION}" -f war/pom.xml - script: - # Download the latest version of WhiteSource Unified Agent - - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar - # Run WhiteSource Unified Agent - - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war - - name: "REST API TAS tests part1" - jdk: openjdk11 - install: - - travis_retry travis_wait 40 mvn install -q "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -PcommunityDocker - - ./tests/scripts/start-compose.sh ./tests/environment/docker-compose-minimal+transforms.yml - - ./tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" - script: - - travis_wait 60 mvn install -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false - - name: "REST API TAS tests part2" - jdk: openjdk11 - install: - - travis_retry travis_wait 40 mvn install -q "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -PcommunityDocker - - ./tests/scripts/start-compose.sh ./tests/environment/docker-compose-minimal+transforms.yml - - ./tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" - script: - - travis_wait 60 mvn install -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false - - name: "REST API TAS tests part3" - jdk: openjdk11 - install: - - travis_retry travis_wait 40 mvn install -q "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -PcommunityDocker - - ./tests/scripts/start-compose.sh ./tests/environment/docker-compose-minimal+transforms.yml - - ./tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" - script: - - travis_wait 60 mvn install -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false - - name: "CMIS TAS tests" - jdk: openjdk11 - install: - - travis_retry travis_wait 40 mvn install -q "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -PcommunityDocker - - ./tests/scripts/start-compose.sh ./tests/environment/docker-compose-minimal+transforms.yml - - ./tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" - script: - - travis_wait 40 mvn install -q -f tests/tas-cmis/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false - - name: "Email TAS tests" - jdk: openjdk11 - install: - - travis_retry travis_wait 40 mvn install -q "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -PcommunityDocker - - ./tests/scripts/start-compose.sh ./tests/environment/docker-compose-minimal.yml - - ./tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" - script: - - travis_wait 30 mvn install -q -f tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false - - name: "WebDAV TAS tests" - jdk: openjdk11 - install: - - travis_retry travis_wait 40 mvn install -q "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -PcommunityDocker - - ./tests/scripts/start-compose.sh ./tests/environment/docker-compose-minimal.yml - - ./tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" - script: - - travis_wait 30 mvn install -q -f tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false - - name: "Integration TAS tests" - jdk: openjdk11 - install: - - travis_retry travis_wait 40 mvn install -q "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -PcommunityDocker - - ./tests/scripts/start-compose.sh ./tests/environment/docker-compose-minimal.yml - - ./tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" - script: - - travis_wait 30 mvn install -q -f tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false - - stage: Release - name: "Maven release" - if: commit_message ~= /\[release\]/ AND fork = false AND branch =~ ^(master|develop)$ AND type != pull_request - install: travis_retry travis_wait 40 mvn clean install -DskipTests=true "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -B -V - # Fail the job if there is a docker image tag that matches the RELEASE_VERSION (or project version in the POM if not set) - before_script: ./scripts/travis/verify_release_tag.sh - script: travis_wait 40 ./scripts/travis/maven_release.sh ${RELEASE_VERSION} ${DEVELOPMENT_VERSION} - # Copy alfresco.war and the distribution zip to deploy_dir - before_deploy: - # Move the final artifacts to a single folder (deploy_dir) to be copied to S3 - - mkdir -p deploy_dir - - cp war/target/alfresco.war deploy_dir - - cp distribution/target/*-distribution*.zip deploy_dir - deploy: - - provider: s3 - access_key_id: ${AWS_STAGING_ACCESS_KEY} - secret_access_key: ${AWS_STAGING_SECRET_KEY} - bucket: "alfresco-artefacts-staging" - region: "eu-west-1" - skip_cleanup: true - acl: private - local_dir: deploy_dir - upload_dir: "alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}" - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^(master|develop)$ - - stage: "Publish" - name: "Copy to S3 Release" - if: commit_message ~= /\[publish\]/ AND fork = false AND branch = master AND type != pull_request - # Nothing to build/install as we are just copying from S3 buckets - install: skip - script: skip - before_deploy: pip install awscli - deploy: - - provider: script - script: ./scripts/travis/copy_to_release_bucket.sh ${TRAVIS_BUILD_NUMBER} ${TRAVIS_BRANCH} - on: - branch: master - - diff --git a/packaging/.whitesource b/packaging/.whitesource deleted file mode 100644 index f0569521415..00000000000 --- a/packaging/.whitesource +++ /dev/null @@ -1,8 +0,0 @@ -{ - "generalSettings": { - "shouldScanRepo": true - }, - "checkRunSettings": { - "vulnerableCheckRunConclusionLevel": "failure" - } -} \ No newline at end of file diff --git a/packaging/.wss-unified-agent.config b/packaging/.wss-unified-agent.config deleted file mode 100644 index 9039a34c86d..00000000000 --- a/packaging/.wss-unified-agent.config +++ /dev/null @@ -1,228 +0,0 @@ -#################################################################### -# WhiteSource Unified-Agent configuration file -#################################################################### -########################################## -# GENERAL SCAN MODE: Files and Package Managers -########################################## - -checkPolicies=true -forceCheckAllDependencies=true -forceUpdate=true -forceUpdate.failBuildOnPolicyViolation=true -offline=false -#ignoreSourceFiles=true -#scanComment= -#updateInventory=false -#resolveAllDependencies=false -#failErrorLevel=ALL -#requireKnownSha1=false -#generateScanReport=true -#scanReportTimeoutMinutes=10 -#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model - -#projectPerFolder=true -#projectPerFolderIncludes= -#projectPerFolderExcludes= - -#wss.connectionTimeoutMinutes=60 -# Change the below URL to your WhiteSource server. -# Use the 'WhiteSource Server URL' which can be retrieved -# from your 'Profile' page on the 'Server URLs' panel. -# Then, add the '/agent' path to it. -wss.url=https://saas.whitesourcesoftware.com/agent - -#npm.resolveDependencies=false -#npm.ignoreSourceFiles=false -#npm.includeDevDependencies=true -#npm.runPreStep=true -#npm.ignoreNpmLsErrors=true -#npm.ignoreScripts=true -#npm.yarnProject=true -#npm.accessToken= -#npm.identifyByNameAndVersion=true - -#bower.resolveDependencies=false -#bower.ignoreSourceFiles=true -#bower.runPreStep=true - -#nuget.resolvePackagesConfigFiles=false -#nuget.resolveCsProjFiles=false -#nuget.resolveDependencies=false -#nuget.restoreDependencies=true -#nuget.ignoreSourceFiles=true -#nuget.runPreStep=true -#nuget.resolveNuspecFiles=false - -#python.resolveDependencies=false -#python.ignoreSourceFiles=false -#python.ignorePipInstallErrors=true -#python.installVirtualenv=true -#python.resolveHierarchyTree=false -#python.requirementsFileIncludes=requirements.txt -#python.resolveSetupPyFiles=true -#python.runPipenvPreStep=true -#python.pipenvDevDependencies=true -#python.IgnorePipenvInstallErrors=true - -#maven.ignoredScopes=test provided -maven.resolveDependencies=true -#maven.ignoreSourceFiles=true -#maven.aggregateModules=true -maven.ignorePomModules=false -#maven.runPreStep=true -#maven.ignoreMvnTreeErrors=true -#maven.environmentPath= -#maven.m2RepositoryPath= - -#gradle.ignoredScopes= -#gradle.resolveDependencies=false -#gradle.runAssembleCommand=false -#gradle.runPreStep=true -#gradle.ignoreSourceFiles=true -#gradle.aggregateModules=true -#gradle.preferredEnvironment=wrapper -#gradle.localRepositoryPath= - -#paket.resolveDependencies=false -#paket.ignoredGroups= -#paket.ignoreSourceFiles=false -#paket.runPreStep=true -#paket.exePath= - -#go.resolveDependencies=false -#go.collectDependenciesAtRuntime=true -#go.dependencyManager= -#go.ignoreSourceFiles=true -#go.glide.ignoreTestPackages=false -#go.gogradle.enableTaskAlias=true - -#ruby.resolveDependencies = false -#ruby.ignoreSourceFiles = false -#ruby.installMissingGems = true -#ruby.runBundleInstall = true -#ruby.overwriteGemFile = true - -#sbt.resolveDependencies=false -#sbt.ignoreSourceFiles=true -#sbt.aggregateModules=true -#sbt.runPreStep=true -#sbt.targetFolder= - -#php.resolveDependencies=false -#php.runPreStep=true -#php.includeDevDependencies=true - -#html.resolveDependencies=false - -#cocoapods.resolveDependencies=false -#cocoapods.runPreStep=true -#cocoapods.ignoreSourceFiles=false - -#hex.resolveDependencies=false -#hex.runPreStep=true -#hex.ignoreSourceFiles=false -#hex.aggregateModules=true - -################################## -# Organization tokens: -################################## -apiKey= - -#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option -#userKey= - -projectName=content-services-community -projectVersion= -projectToken= - -productName=ACS Community -productVersion= -productToken= -#updateType=APPEND -#requesterEmail=user@provider.com - -######################################################################################### -# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE -######################################################################################### -#includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx - -#includes=**/*.m **/*.mm **/*.js **/*.php -includes=**/*.jar -#includes=**/*.gem **/*.rb -#includes=**/*.dll **/*.cs **/*.nupkg -#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2 -#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py - -## Exclude file extensions or specific directories by adding **/*. or **/** -excludes=**/*sources.jar **/*javadoc.jar - -case.sensitive.glob=false -followSymbolicLinks=true - -################################## -# Archive properties -################################## -#archiveExtractionDepth=2 -#archiveIncludes=**/*.war **/*.ear -#archiveExcludes=**/*sources.jar - -################################## -# Proxy settings -################################## -#proxy.host= -#proxy.port= -#proxy.user= -#proxy.pass= - -################################## -# SCM settings -################################## -#scm.type= -#scm.user= -#scm.pass= -#scm.ppk= -#scm.url= -#scm.branch= -#scm.tag= -#scm.npmInstall= -#scm.npmInstallTimeoutMinutes= -#scm.repositoriesFile= - -############################################## -# SCAN MODE: Linux package manager settings -############################################## -#scanPackageManager=true - -################################## -# SCAN MODE: Docker images -################################## -#docker.scanImages=true -#docker.includes=.*.* -#docker.excludes= -#docker.pull.enable=true -#docker.pull.images=.*.* -#docker.pull.maxImages=10 -#docker.pull.tags=.*.* -#docker.pull.digest= -#docker.delete.force=true -#docker.login.sudo=false - -#docker.aws.enable=true -#docker.aws.registryIds= - -################################## -# SCAN MODE: Docker containers -################################## -#docker.scanContainers=true -#docker.containerIncludes=.*.* -#docker.containerExcludes= - -################################ -# Serverless settings -################################ -#serverless.provider= -#serverless.scanFunctions=true -#serverless.includes= -#serverless.excludes= -#serverless.region= -#serverless.maxFunctions=10 diff --git a/packaging/CHANGELOG.md b/packaging/CHANGELOG.md deleted file mode 100644 index 8a484069fba..00000000000 --- a/packaging/CHANGELOG.md +++ /dev/null @@ -1,218 +0,0 @@ -

Release Notes - Alfresco - Version Community Edition 201911 GA -

-

Bug -

-
    -
  • [MNT-20436] - “POST /nodes/{nodeId}/children” RestAPI does not create a node without having a mandatory value object, but it outputs the 201 successful response. -
    • -
  • [MNT-20714] - [HotFix] /nodes/{nodeId}/content REST API fails for content created by a deleted user -
    • -
  • [MNT-20770] - Share non responsive during direct download from S3 if content store selector is also configured -
    • -
  • [MNT-20863] - Changing cm:name with REST API /nodes/{nodeId} does not update Primary Path -
    • -
- -

Release Notes - Alfresco - Version Community Edition 201910 EA -

-

- New Features -

-
    -
  • -

    Custom Transforms and Renditions

    -

    Alfresco Content Services (ACS) provides a number of content - transforms, but also allows custom transforms to be added. -

    It is now possible to create custom transforms that run in - separate processes known as T-Engines (short for Transformer - Engines). The same engines may be used in Community and - Enterprise Editions. They may be directly connected to the ACS - repository as Local Transforms, but in the Enterprise edition there - is the option to include them as part of the Transform Service - which provides more balanced throughput and better administration - capabilities. -

    For more information see Custom Transforms and Renditions -

    • -
  • -

    Open-source Transformation Engines

    -

    The core T-Engine images can now be used in Community - Edition.

    -

    T-Engines code has been Open-Sourced and is available on Github:

    - -

    Images are available on Docker Hub:

    - - - - - -

    -
    • -
  • -

    Removal of external executables from docker image

    -

    With the introduction of the new Local Transform Service - in Alfresco Community Edition, the capability of executing - remote transformations on T-Engines was enabled. Because of - this, the external executables (Alfresco-Pdf-renderer, Libreoffice - and Imagemagick) have been removed from the docker container to - facilitate the usage of out-of-process transformations. -

    -
    • -
-

Bug -

-
    -
  • [ALF-22013] - Docker Image for Base Tomcat locale is POSIX -
    • -
  • [ALF-22060] - Reader on the backing store is obtained twice in CachingContentStore -
    • -
  • [ALF-22056] - onCopyCompleteBehaviour not called in order of copy-action -
    • -
  • [ALF-22073] - MailActionExecutor doesn't consider email bodies with a HTML doctype as HTML -
    • -
  • [ALF-21988] - Tab order for number ranges not ok -
    • -
  • [ALF-22097] - T Engine - add source nodeId parameter -
    • -
-

Improvement -

-
    -
  • [REPO-4318] - [COMPLETE] Extraction of transformers and metadata extractors -
    • -
-

- -

Release Notes - Alfresco - Version Community Edition 201901 GA -

-

- New Features -

- -

Bug -

-
    -
  • [ALF-22049] - Alfresco does not start -
    • -
  • [ALF-22041] - EKS deployment - SOLR_ALFRESCO_HOST set to wrong host name -
    • -
  • [ALF-22031] - REST API calls silently rollback after the returning a success status -
    • -
  • [ALF-21963] - Workflow - backslash in nodeRef properties url. -
    • -
  • [ALF-21803] - Unable to add users to sites whose 'short name' is a substring of 'site' -
    • -
  • [ALF-21664] - Exception on workflow image by REST API -
    • -
  • [ALF-20854] - webdav error opening Spanish Accent files -
    • -
-

Improvement -

-
    -
  • [REPO-3668] - Renditions: Transform event consumer -
    • -
  • [REPO-7] - Embed ActiveMQ in the Platform -
    • -
  • [REPO-1957] - Transformations Improvement Plan -
    • -
-

- Deprecations -

-
    -
  • - TransformService and RenditionService: All Java APIs related to TransformService and RenditionService have been deprecated; the ability to perform arbitrary transformations will be phased out as the new DBP Transform Service takes effect. Renditions can be triggered using the existing repository REST API but will be processed asynchronously using the new services.
    -
    • -
-

- Known issues -

-
    -
  • - Due to the changes to the RenditionService the Media Management AMP is not supported yet.
    -
    • -
-

- -

Release Notes - Alfresco - Version Community Edition 201810 EA -

- -

Bug -

-
    -
  • [ALF-21783] - ScriptAuthorityService: No way to get more than 100 results with some methods -
    • -
  • [ALF-21917] - Document list edit metadata incorrect url escaping -
    • -
  • [ALF-22001] - Faceted search does not work in Japanese -
    • -
  • [ALF-22030] - ADF UI freezes noticeably on a periodic basis during KeyCloak auth requests -
    • -
-

Improvement -

-
    -
  • [REPO-2491] - Renditions: Rendition Testing -
    • -
  • [REPO-3651] - AWS Load Tests: Infrastructure and Revamp -
    • -
  • [REPO-3663] - AWS Load Tests: Initial AWS Cost Estimation with BMF -
    • -
  • [REPO-3667] - Renditions: Transform event producer -
    • -
  • [REPO-3677] - AWS Services: Basic Deployment -
    • -
  • [REPO-3703] - AWS Services: Native Services of ACS -
    • -
-

- -

Release Notes - Alfresco - Version Community Edition 201808 EA -

-

Bug -

-
    -
  • [ALF-21992] - BehaviourFilterImpl.isEnabled(NodeRef, QName) is checking wrong QName in case of subClass -
    • -
  • [ALF-22006] - VersionServicePolicies cannot be disabled on a specific node -
    • -
  • [ALF-22007] - TransactionListeners are executed in unpredictable order -
    • -
-

Improvement -

-
    -
  • [ALF-22011] - Upgrade to XMLBeans 3.0.0 -
    • -
- -

Release Notes - Alfresco - Version Community Edition 201806 GA -

-

Bug -

-
    -
  • [ALF-22000] - Docker: HTML link 693ce565f4c4:8080/share but name -
    • -
  • [ALF-22008] - It is not possible to upload a document without versions using CMIS -
    • -
diff --git a/packaging/CONTRIBUTING.md b/packaging/CONTRIBUTING.md deleted file mode 100644 index 8d059e27ca0..00000000000 --- a/packaging/CONTRIBUTING.md +++ /dev/null @@ -1,16 +0,0 @@ -### Contributing -Thanks for your interest in contributing to this project! - -The following is a set of guidelines for contributing to this library. Most of them will make the life of the reviewer easier and therefore decrease the time required for the patch be included in the next version. - -Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](http://community.alfresco.com/community/ecm) where they can be referenced from multiple projects. - -Read an [overview on how this project is goverened](https://community.alfresco.com/docs/DOC-6385-project-overview-repository). - -You can report an issue in the ALF project of the [Alfresco issue tracker](http://issues.alfresco.com). - -Read [instructions for a good issue report](https://community.alfresco.com/docs/DOC-6263-reporting-an-issue). - -Read [instructions for making a contribution](https://community.alfresco.com/docs/DOC-6269-submitting-contributions). - -Please follow [the coding standards](https://community.alfresco.com/docs/DOC-4658-coding-standards). diff --git a/packaging/LICENSE b/packaging/LICENSE deleted file mode 100644 index ed08681f12b..00000000000 --- a/packaging/LICENSE +++ /dev/null @@ -1,191 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - Copyright 2018 Alfresco Software, Inc. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/packaging/README.md b/packaging/README.md deleted file mode 100644 index 2bad172990f..00000000000 --- a/packaging/README.md +++ /dev/null @@ -1,37 +0,0 @@ - -# Alfresco Content Services Community Packaging -This project is producing packaging for [Alfresco Content Services Repository](https://community.alfresco.com/docs/DOC-6385-project-overview-repository). - -The SNAPSHOT version of the artifacts is **never** published. - -### Contributing guide -Please use [this guide](CONTRIBUTING.md) to make a contribution to the project. - -This produces the docker images for alfresco-content-repository-community and the distribution zip for the entire Alfresco Content Services Community product - -# General - -### Build: -* ```mvn clean install``` in the root of the project will build everything. - -## Docker Alfresco -On official releases, the image is published: https://hub.docker.com/r/alfresco/alfresco-content-repository-community/tags/ - -For testing locally: -1. Go to docker-alfresco folder -2. Run *mvn clean install* if you have not done so -3. Build the docker image: ```docker build . --tag acr-community:6.0.tag``` -4. Check that the image has been created locally with your desired name/tag: ```docker images``` - -### Docker-compose & Kubernetes -Use the deployment project if you want the sample docker-compose or helm: https://github.com/Alfresco/acs-community-deployment - -## Distribution zip -In this folder the distribution zip is build. It contains all the war files, libraries, certificates and settings files you need to deploy Alfresco Content Services Community on the supported application servers. - -## How to - -* [Create a custom Docker image](https://github.com/Alfresco/acs-packaging/blob/master/docs/create-custom-image.md) -* [Creating customized Docker images using an existing Docker image](https://github.com/Alfresco/acs-packaging/blob/master/docs/create-custom-image-using-existing-docker-image.md) -* [Verifying that AMPs have been applied](https://github.com/Alfresco/acs-packaging/blob/master/docs/verify-the-amp-has-been-applied.md) -* [Create and configure custom Transforms](https://github.com/Alfresco/acs-packaging/blob/master/docs/custom-transforms-and-renditions.md) diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml deleted file mode 100644 index ffc3bb67ac1..00000000000 --- a/packaging/distribution/pom.xml +++ /dev/null @@ -1,175 +0,0 @@ - - 4.0.0 - alfresco-content-services-community-distribution - Alfresco Content Services Community Distribution zip - jar - - - org.alfresco - acs-community-packaging - 6.2.2-SNAPSHOT - ../pom.xml - - - - - - org.alfresco - content-services-community - ${project.version} - war - - - org.alfresco - alfresco-repository - - - org.alfresco - alfresco-data-model - - - org.alfresco - alfresco-server-root - war - - - org.alfresco - alfresco-mmt - - - - org.postgresql - postgresql - ${dependency.postgresql.version} - - - - org.alfresco - alfresco-pdf-renderer - linux - tgz - - - org.alfresco - alfresco-pdf-renderer - win64 - tgz - - - - org.alfresco - alfresco-content-services-share-distribution - zip - - - * - * - - - - - - - ${project.artifactId}-${project.version} - - - src/main/resources - true - - - - - maven-dependency-plugin - - - extract-keystore - generate-resources - - unpack - - - - - - org.alfresco - alfresco-repository - alfresco/keystore/** - - - - org.alfresco - alfresco-content-services-share-distribution - zip - - - - - - extract-jlan-dll - generate-resources - - unpack - - - - - org.alfresco - alfresco-jlan-embed - windll - *.dll - - - - - - - - copy-resources - generate-resources - - copy - - - - - org.alfresco - alfresco-server-root - war - ${project.build.outputDirectory}/web-server/webapps - ROOT.war - - - org.alfresco.aos-module - alfresco-vti-bin - war - ${project.build.outputDirectory}/web-server/webapps - _vti_bin.war - - - - - - - - - maven-assembly-plugin - - - make-assembly - package - - single - - - false - - src/assembly/distribution.xml - - - - - - - - - diff --git a/packaging/distribution/src/assembly/distribution.xml b/packaging/distribution/src/assembly/distribution.xml deleted file mode 100644 index e1d5d3da9a0..00000000000 --- a/packaging/distribution/src/assembly/distribution.xml +++ /dev/null @@ -1,118 +0,0 @@ - - distribution - - - - zip - - - - - - target/classes - - - - - ${highest.basedir}/installer/bitrock/licenses - licenses - - - - target/dependency/alfresco/keystore - alf_data/keystore - - - - target/dependency - bin - - *.dll - - - - - - ${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version} - - - web-server/** - modules/** - amps/** - - - - ${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples - web-server/shared/classes/alfresco/web-extension - - - - - - - false - amps - ${artifact.artifactId}.${artifact.extension} - - *:*:amp - - - - - false - true - bin - ${artifact.artifactId}.${artifact.extension} - - org.alfresco:alfresco-mmt - - - - - - false - true - web-server/webapps - alfresco.war - - org.alfresco:content-services*:war - - - - false - true - web-server/lib - - org.postgresql:* - - - - false - true - web-server/shared/classes - - org.alfresco:*:jar - - true - - - alfresco/extension/** - alfresco-global.properties.sample - - - - - - - false - true - alfresco-pdf-renderer - - org.alfresco:alfresco-pdf-renderer - - - - - - diff --git a/packaging/distribution/src/main/resources/README.txt b/packaging/distribution/src/main/resources/README.txt deleted file mode 100644 index ca56b88ec5e..00000000000 --- a/packaging/distribution/src/main/resources/README.txt +++ /dev/null @@ -1,8 +0,0 @@ -Alfresco Community (Build: ${installer.version.name}) -=============================== - -Contains: - - Alfresco Content Services Community: ${project.version} - - Alfresco Share: ${alfresco.share.version} - -For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm diff --git a/packaging/distribution/src/main/resources/bin/apply_amps.bat b/packaging/distribution/src/main/resources/bin/apply_amps.bat deleted file mode 100644 index 87008216d56..00000000000 --- a/packaging/distribution/src/main/resources/bin/apply_amps.bat +++ /dev/null @@ -1,41 +0,0 @@ -@echo off -rem ------- -rem Script for apply AMPs to installed WAR -rem ------- - -set ALF_AMP_PARAMS= -set ALF_AMP_NOWAIT= - -:ParamsLoop -if "%~1"=="" goto ParamsLoopContinue -if "%~1"=="nowait" shift & set ALF_AMP_NOWAIT=yes& goto ParamsLoop -set ALF_AMP_PARAMS=%ALF_AMP_PARAMS% %1 -shift -goto :ParamsLoop - -:ParamsLoopContinue -for /D %%D IN (%~dp0..\) do set ALF_HOME=%%~dpD -set CATALINA_HOME=%ALF_HOME%tomcat - -if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat" - -:start -echo This script will apply all the AMPs in %ALF_HOME%amps to the alfresco.war and share.war files in %CATALINA_HOME%\webapps -if "%ALF_AMP_NOWAIT%" == "yes" goto nowait1 -echo Press control-c to stop this script . . . -pause -:nowait1 -"%JAVA_HOME%\bin\java" -jar "%ALF_HOME%bin\alfresco-mmt.jar" install "%ALF_HOME%amps" "%CATALINA_HOME%\webapps\alfresco.war" -directory%ALF_AMP_PARAMS% -"%JAVA_HOME%\bin\java" -jar "%ALF_HOME%bin\alfresco-mmt.jar" list "%CATALINA_HOME%\webapps\alfresco.war" -"%JAVA_HOME%\bin\java" -jar "%ALF_HOME%bin\alfresco-mmt.jar" install "%ALF_HOME%amps_share" "%CATALINA_HOME%\webapps\share.war" -directory%ALF_AMP_PARAMS% -"%JAVA_HOME%\bin\java" -jar "%ALF_HOME%bin\alfresco-mmt.jar" list "%CATALINA_HOME%\webapps\share.war" -echo . -echo About to clean out tomcat/webapps/alfresco directory and temporary files... -if "%ALF_AMP_NOWAIT%" == "yes" goto nowait2 -pause -:nowait2 -set ALF_AMP_PARAMS= -set ALF_AMP_NOWAIT= -rmdir /S /Q "%CATALINA_HOME%\webapps\alfresco" -rmdir /S /Q "%CATALINA_HOME%\webapps\share" -call "%ALF_HOME%bin\clean_tomcat.bat" \ No newline at end of file diff --git a/packaging/distribution/src/main/resources/bin/apply_amps.sh b/packaging/distribution/src/main/resources/bin/apply_amps.sh deleted file mode 100644 index c8095bd1de9..00000000000 --- a/packaging/distribution/src/main/resources/bin/apply_amps.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# ------- -# Script for apply AMPs to installed WAR -# ------- -pushd $(dirname $0)>/dev/null -export SCRIPTPATH=$(pwd) -export ALF_HOME=${SCRIPTPATH%/*} -export CATALINA_HOME=$ALF_HOME/tomcat -required_java_version="1.7" - -if [ -f $CATALINA_HOME/bin/setenv.sh ]; then - . $CATALINA_HOME/bin/setenv.sh -fi - -# Verify Java installation into ALF_HOME folder -if [ -f $ALF_HOME/java/bin/java ] && [ -x $ALF_HOME/java/bin/java ]; then - echo - echo "Found java executable in $ALF_HOME/java" - _java=$ALF_HOME/java/bin/java - -# Verify Java installation into JAVA_HOME -elif [ -n "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then - echo - echo "Found java executable in JAVA_HOME: $JAVA_HOME" - - _java="$JAVA_HOME/bin/java" - -# Verify Java installation from linux repositories -elif type -p java; then - echo - echo "Found installed java executable on the system" - - _java=java - -else - echo - echo "Java is not installed . . . The required Java version is $required_java_version or higher" - echo "Please install Java and try again. Script will be closed. " - read DUMMY - exit 15 -fi - -echo -echo "This script will apply all the AMPs in amps and amps_share to the alfresco.war and share.war files in $CATALINA_HOME/webapps" -echo "Press control-c to stop this script . . ." -echo "Press any other key to continue . . ." -read RESP -{ -$_java -jar $ALF_HOME/bin/alfresco-mmt.jar install $ALF_HOME/amps $CATALINA_HOME/webapps/alfresco.war -directory $* -$_java -jar $ALF_HOME/bin/alfresco-mmt.jar list $CATALINA_HOME/webapps/alfresco.war -$_java -jar $ALF_HOME/bin/alfresco-mmt.jar install $ALF_HOME/amps_share $CATALINA_HOME/webapps/share.war -directory $* -$_java -jar $ALF_HOME/bin/alfresco-mmt.jar list $CATALINA_HOME/webapps/share.war -} || -{ - echo - echo "Error. Appling of the AMPs is failed. See error message above." - echo -} -echo "About to clean out $ALF_HOME/tomcat/webapps/alfresco and share directories and temporary files..." -echo "Press control-c to stop this script . . ." -echo "Press any other key to continue . . ." -read DUMMY -rm -rf $CATALINA_HOME/webapps/alfresco -rm -rf $CATALINA_HOME/webapps/share -. $ALF_HOME/bin/clean_tomcat.sh -popd>/dev/null \ No newline at end of file diff --git a/packaging/distribution/src/main/resources/bin/clean_tomcat.bat b/packaging/distribution/src/main/resources/bin/clean_tomcat.bat deleted file mode 100644 index 5014e508d6c..00000000000 --- a/packaging/distribution/src/main/resources/bin/clean_tomcat.bat +++ /dev/null @@ -1,13 +0,0 @@ -rem @echo off -rem --------------------------------- -rem Script to clean Tomcat temp files -rem --------------------------------- - -set ALF_HOME=%~dp0.. -set CATALINA_HOME=%ALF_HOME%\tomcat - -echo Cleaning temporary Alfresco files from Tomcat... -rmdir /S /Q "%CATALINA_HOME%\temp\Alfresco" "%CATALINA_HOME%\work\Catalina\localhost\alfresco" -rmdir /S /Q "%CATALINA_HOME%\work\Catalina\localhost\share" -rmdir /S /Q "%CATALINA_HOME%\work\Catalina\localhost\awe" -rmdir /S /Q "%CATALINA_HOME%\work\Catalina\localhost\wcmqs" \ No newline at end of file diff --git a/packaging/distribution/src/main/resources/bin/clean_tomcat.sh b/packaging/distribution/src/main/resources/bin/clean_tomcat.sh deleted file mode 100644 index 0298283e6f6..00000000000 --- a/packaging/distribution/src/main/resources/bin/clean_tomcat.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# --------------------------------- -# Script to clean Tomcat temp files -# --------------------------------- -echo "Cleaning temporary Alfresco files from Tomcat..." -rm -rf tomcat/temp/Alfresco tomcat/work/Catalina/localhost/alfresco -rm -rf tomcat/work/Catalina/localhost/share -rm -rf tomcat/work/Catalina/localhost/awe -rm -rf tomcat/work/Catalina/localhost/wcmqs \ No newline at end of file diff --git a/packaging/distribution/src/main/resources/keystore/CreateSSLKeystores.txt b/packaging/distribution/src/main/resources/keystore/CreateSSLKeystores.txt deleted file mode 100644 index a949d3e5764..00000000000 --- a/packaging/distribution/src/main/resources/keystore/CreateSSLKeystores.txt +++ /dev/null @@ -1,141 +0,0 @@ -Instructions for Generating Repository SSL Keystores -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - is the keystore password. The file ${dir.keystore}/ssl-keystore-passwords.properties contains passwords for the SSL keystore, -${dir.keystore}/ssl-truststore-passwords.properties contains passwords for the SSL truststore. - -These instructions will create an RSA public/private key pair for the repository with a certificate that has been signed by the Alfresco Certificate Authority (CA). -It will also create a truststore for the repository containing the CA certificate; this will be used to authenticate connections to specific repository -URLs from Solr. It assumes the existence of the Alfresco CA key and certificate to sign the repository certificate; for security reasons these are not generally available. -You can either generate your own CA key and certificate (see instructions below) or use a recognised Certificate Authority such as Verisign. For Alfresco employees the key -and certificate are available in svn. - -(i) Generate the repository public/private key pair in a keystore: - -$ keytool -genkey -alias ssl.repo -keyalg RSA -keystore ssl.keystore -storetype JCEKS -storepass -Enter keystore password: -Re-enter new password: -What is your first and last name? - [Unknown]: Alfresco Repository -What is the name of your organizational unit? - [Unknown]: -What is the name of your organization? - [Unknown]: Alfresco Software Ltd. -What is the name of your City or Locality? - [Unknown]: Maidenhead -What is the name of your State or Province? - [Unknown]: UK -What is the two-letter country code for this unit? - [Unknown]: GB -Is CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB correct? - [no]: yes - -Enter key password for - (RETURN if same as keystore password): - -(ii) Generate a certificate request for the repository key - -$ keytool -keystore ssl.keystore -alias ssl.repo -certreq -file repo.csr -storetype JCEKS -storepass - -(iii) Alfresco CA signs the certificate request, creating a certificate that is valid for 365 days. - -$ openssl x509 -CA ca.crt -CAkey ca.key -CAcreateserial -req -in repo.csr -out repo.crt -days 365 -Signature ok -subject=/C=GB/ST=UK/L=Maidenhead/O=Alfresco Software Ltd./OU=Unknown/CN=Alfresco Repository -Getting CA Private Key -Enter pass phrase for ca.key: - -(iv) Import the Alfresco CA key into the repository key store - -$ keytool -import -alias ssl.alfreco.ca -file ca.crt -keystore ssl.keystore -storetype JCEKS -storepass -Enter keystore password: -Owner: CN=Alfresco CA, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB -Issuer: CN=Alfresco CA, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB -Serial number: 805ba6dc8f62f8b8 -Valid from: Fri Aug 12 13:28:58 BST 2011 until: Mon Aug 09 13:28:58 BST 2021 -Certificate fingerprints: - MD5: 4B:45:94:2D:8E:98:E8:12:04:67:AD:AE:48:3C:F5:A0 - SHA1: 74:42:22:D0:52:AD:82:7A:FD:37:46:37:91:91:F4:77:89:3A:C9:A3 - Signature algorithm name: SHA1withRSA - Version: 3 - -Extensions: - -#1: ObjectId: 2.5.29.14 Criticality=false -SubjectKeyIdentifier [ -KeyIdentifier [ -0000: 08 42 40 DC FE 4A 50 87 05 2B 38 4D 92 70 8E 51 .B@..JP..+8M.p.Q -0010: 4E 38 71 D6 N8q. -] -] - -#2: ObjectId: 2.5.29.19 Criticality=false -BasicConstraints:[ - CA:true - PathLen:2147483647 -] - -#3: ObjectId: 2.5.29.35 Criticality=false -AuthorityKeyIdentifier [ -KeyIdentifier [ -0000: 08 42 40 DC FE 4A 50 87 05 2B 38 4D 92 70 8E 51 .B@..JP..+8M.p.Q -0010: 4E 38 71 D6 N8q. -] - -[CN=Alfresco CA, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB] -SerialNumber: [ 805ba6dc 8f62f8b8] -] - -Trust this certificate? [no]: yes -Certificate was added to keystore - -(v) Import the CA-signed repository certificate into the repository keystore - -$ keytool -import -alias ssl.repo -file repo.crt -keystore ssl.keystore -storetype JCEKS -storepass -Enter keystore password: -Certificate reply was installed in keystore - -(vi) Convert the repository keystore to a pkcs12 keystore (for use in browsers such as Firefox). Give the pkcs12 key store the key store password 'alfresco'. - -keytool -importkeystore -srckeystore ssl.keystore -srcstorepass -srcstoretype JCEKS -srcalias ssl.repo -srckeypass kT9X6oe68t -destkeystore firefox.p12 -deststoretype pkcs12 -deststorepass alfresco -destalias ssl.repo -destkeypass alfresco - -(vi) Create a repository truststore containing the Alfresco CA certificate - -keytool -import -alias ssl.alfreco.ca -file ca.crt -keystore ssl.keystore -storetype JCEKS -storepass -keytool -import -alias alfreco.ca -file ca.crt -keystore ssl.truststore -storetype JCEKS -storepass - -(vii) Copy the keystore and truststore to the repository keystore location defined by the property 'dir.keystore'. -(viii) Update the SSL properties i.e. properties starting with the prefixes 'alfresco.encryption.ssl.keystore' and 'alfresco.encryption.ssl.truststore'. - -Instructions for Generating a Certificate Authority (CA) Key and Certificate -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -(i) Generate the CA private key - -$ openssl genrsa -des3 -out ca.key 1024 -Generating RSA private key, 1024 bit long modulus -..........++++++ -..++++++ -e is 65537 (0x10001) -Enter pass phrase for ca.key: -Verifying - Enter pass phrase for ca.key: - -(ii) Generate the CA self-signed certificate - -$ openssl req -new -x509 -days 3650 -key ca.key -out ca.crt -Enter pass phrase for ca.key: -You are about to be asked to enter information that will be incorporated -into your certificate request. -What you are about to enter is what is called a Distinguished Name or a DN. -There are quite a few fields but you can leave some blank -For some fields there will be a default value, -If you enter '.', the field will be left blank. ------ -Country Name (2 letter code) [AU]:GB -State or Province Name (full name) [Some-State]:UK -Locality Name (eg, city) []:Maidenhead -Organization Name (eg, company) [Internet Widgits Pty Ltd]:Alfresco Software Ltd. -Organizational Unit Name (eg, section) []: -Common Name (eg, YOUR name) []:Alfresco CA -Email Address []: - diff --git a/packaging/distribution/src/main/resources/keystore/generate_keystores.bat b/packaging/distribution/src/main/resources/keystore/generate_keystores.bat deleted file mode 100644 index 5aed5e9fa01..00000000000 --- a/packaging/distribution/src/main/resources/keystore/generate_keystores.bat +++ /dev/null @@ -1,58 +0,0 @@ -@rem Please edit the variables below to suit your installation -@rem Note: for an installation created by the Alfresco installer, you only need to edit ALFRESCO_HOME - -@rem Alfresco installation directory -set ALFRESCO_HOME=C:\Alfresco-5.2 -@rem The directory containing the alfresco keystores, as referenced by keystoreFile and truststoreFile attributes in tomcat\conf\server.xml -set ALFRESCO_KEYSTORE_HOME=%ALFRESCO_HOME%\alf_data\keystore -@rem Java installation directory -set JAVA_HOME=%ALFRESCO_HOME%\java -@rem Location in which new keystore files will be generated -set CERTIFICATE_HOME=%USERPROFILE% -@rem The repository server certificate subject name, as specified in tomcat\conf\tomcat-users.xml with roles="repository" -set REPO_CERT_DNAME=CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB -@rem The SOLR client certificate subject name, as specified in tomcat\conf\tomcat-users.xml with roles="repoclient" -set SOLR_CLIENT_CERT_DNAME=CN=Alfresco Repository Client, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB -@rem The number of days before the certificate expires -set CERTIFICATE_VALIDITY=36525 - -@rem Ensure certificate output dir exists -@if not exist "%CERTIFICATE_HOME%" mkdir "%CERTIFICATE_HOME%" - -@rem Remove old output files (note they are backed up elsewhere) -@if exist "%CERTIFICATE_HOME%\ssl.keystore" del "%CERTIFICATE_HOME%\ssl.keystore" -@if exist "%CERTIFICATE_HOME%\ssl.truststore" del "%CERTIFICATE_HOME%\ssl.truststore" -@if exist "%CERTIFICATE_HOME%\browser.p12" del "%CERTIFICATE_HOME%\browser.p12" -@if exist "%CERTIFICATE_HOME%\ssl.repo.client.keystore" del "%CERTIFICATE_HOME%\ssl.repo.client.keystore" -@if exist "%CERTIFICATE_HOME%\ssl.repo.client.truststore" del "%CERTIFICATE_HOME%\ssl.repo.client.truststore" - -@rem Generate new self-signed certificates for the repository and solr -"%JAVA_HOME%\bin\keytool" -genkeypair -keyalg RSA -dname "%REPO_CERT_DNAME%" -validity %CERTIFICATE_VALIDITY% -alias ssl.repo -keypass kT9X6oe68t -keystore "%CERTIFICATE_HOME%\ssl.keystore" -storetype JCEKS -storepass kT9X6oe68t -"%JAVA_HOME%\bin\keytool" -exportcert -alias ssl.repo -file "%CERTIFICATE_HOME%\ssl.repo.crt" -keystore "%CERTIFICATE_HOME%\ssl.keystore" -storetype JCEKS -storepass kT9X6oe68t -"%JAVA_HOME%\bin\keytool" -genkeypair -keyalg RSA -dname "%SOLR_CLIENT_CERT_DNAME%" -validity %CERTIFICATE_VALIDITY% -alias ssl.repo.client -keypass kT9X6oe68t -keystore "%CERTIFICATE_HOME%\ssl.repo.client.keystore" -storetype JCEKS -storepass kT9X6oe68t -"%JAVA_HOME%\bin\keytool" -exportcert -alias ssl.repo.client -file "%CERTIFICATE_HOME%\ssl.repo.client.crt" -keystore "%CERTIFICATE_HOME%\ssl.repo.client.keystore" -storetype JCEKS -storepass kT9X6oe68t - -@rem Create trust relationship between repository and solr -"%JAVA_HOME%\bin\keytool" -importcert -noprompt -alias ssl.repo.client -file "%CERTIFICATE_HOME%\ssl.repo.client.crt" -keystore "%CERTIFICATE_HOME%\ssl.truststore" -storetype JCEKS -storepass kT9X6oe68t -@rem Create trust relationship between repository and itself - used for searches -"%JAVA_HOME%\bin\keytool" -importcert -noprompt -alias ssl.repo -file "%CERTIFICATE_HOME%\ssl.repo.crt" -keystore "%CERTIFICATE_HOME%\ssl.truststore" -storetype JCEKS -storepass kT9X6oe68t -@rem Create trust relationship between solr and repository -"%JAVA_HOME%\bin\keytool" -importcert -noprompt -alias ssl.repo -file "%CERTIFICATE_HOME%\ssl.repo.crt" -keystore "%CERTIFICATE_HOME%\ssl.repo.client.truststore" -storetype JCEKS -storepass kT9X6oe68t -@rem Export repository keystore to pkcs12 format for browser compatibility -"%JAVA_HOME%\bin\keytool" -importkeystore -srckeystore "%CERTIFICATE_HOME%\ssl.keystore" -srcstorepass kT9X6oe68t -srcstoretype JCEKS -srcalias ssl.repo -srckeypass kT9X6oe68t -destkeystore "%CERTIFICATE_HOME%\browser.p12" -deststoretype pkcs12 -deststorepass alfresco -destalias ssl.repo -destkeypass alfresco - -@rem Ensure keystore dir actually exists -@if not exist "%ALFRESCO_KEYSTORE_HOME%" mkdir "%ALFRESCO_KEYSTORE_HOME%" - -@rem Install the new files -copy /Y "%CERTIFICATE_HOME%\ssl.keystore" "%ALFRESCO_KEYSTORE_HOME%\ssl.keystore" -copy /Y "%CERTIFICATE_HOME%\ssl.truststore" "%ALFRESCO_KEYSTORE_HOME%\ssl.truststore" -copy /Y "%CERTIFICATE_HOME%\browser.p12" "%ALFRESCO_KEYSTORE_HOME%\browser.p12" - -@echo **************************************** -@echo You must copy the following files to the correct location. -@echo %CERTIFICATE_HOME%\ssl.repo.client.keystore -@echo %CERTIFICATE_HOME%\ssl.repo.client.truststore -@echo eg. for Solr 4 the location is SOLR_HOME\workspace-SpacesStore\conf and SOLR_HOME\archive-SpacesStore\conf -@echo Please ensure that you set dir.keystore=%ALFRESCO_KEYSTORE_HOME% in alfresco-global.properties -@echo **************************************** \ No newline at end of file diff --git a/packaging/distribution/src/main/resources/keystore/generate_keystores.sh b/packaging/distribution/src/main/resources/keystore/generate_keystores.sh deleted file mode 100644 index 180c9909455..00000000000 --- a/packaging/distribution/src/main/resources/keystore/generate_keystores.sh +++ /dev/null @@ -1,82 +0,0 @@ -#! /bin/sh -# Please edit the variables below to suit your installation -# Note: for an installation created by the Alfresco installer, you only need to edit ALFRESCO_HOME - -# Alfresco installation directory -if [ -z "$ALFRESCO_HOME" ]; then - ALFRESCO_HOME=/opt/alfresco-5.2 - echo "Setting ALFRESCO_HOME to $ALFRESCO_HOME" -fi - -# The directory containing the alfresco keystores, as referenced by keystoreFile and truststoreFile attributes in tomcat/conf/server.xml -ALFRESCO_KEYSTORE_HOME=$ALFRESCO_HOME/alf_data/keystore - -# Location in which new keystore files will be generated -if [ -z "$CERTIFICATE_HOME" ]; then - CERTIFICATE_HOME=$HOME - echo "Certificates will be generated in $CERTIFICATE_HOME and then moved to $ALFRESCO_KEYSTORE_HOME" -fi - -# Java installation directory -JAVA_HOME=$ALFRESCO_HOME/java - -# The repository server certificate subject name, as specified in tomcat/conf/tomcat-users.xml with roles="repository" -REPO_CERT_DNAME="CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB" -# The SOLR client certificate subject name, as specified in tomcat/conf/tomcat-users.xml with roles="repoclient" -SOLR_CLIENT_CERT_DNAME="CN=Alfresco Repository Client, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB" -# The number of days before the certificate expires -CERTIFICATE_VALIDITY=36525 - -# Stop -if [ -f "$ALFRESCO_HOME/alfresco.sh" ]; then "$ALFRESCO_HOME/alfresco.sh" stop; fi - -# Ensure certificate output dir exists -mkdir -p "$CERTIFICATE_HOME" - -# Remove old output files (note they are backed up elsewhere) -if [ -f "$CERTIFICATE_HOME/ssl.keystore" ]; then rm "$CERTIFICATE_HOME/ssl.keystore"; fi -if [ -f "$CERTIFICATE_HOME/ssl.truststore" ]; then rm "$CERTIFICATE_HOME/ssl.truststore"; fi -if [ -f "$CERTIFICATE_HOME/browser.p12" ]; then rm "$CERTIFICATE_HOME/browser.p12"; fi -if [ -f "$CERTIFICATE_HOME/ssl.repo.client.keystore" ]; then rm "$CERTIFICATE_HOME/ssl.repo.client.keystore"; fi -if [ -f "$CERTIFICATE_HOME/ssl.repo.client.truststore" ]; then rm "$CERTIFICATE_HOME/ssl.repo.client.truststore"; fi - -# Generate new self-signed certificates for the repository and solr -"$JAVA_HOME/bin/keytool" -genkeypair -keyalg RSA -dname "$REPO_CERT_DNAME" -validity $CERTIFICATE_VALIDITY -alias ssl.repo -keypass kT9X6oe68t -keystore "$CERTIFICATE_HOME/ssl.keystore" -storetype JCEKS -storepass kT9X6oe68t -"$JAVA_HOME/bin/keytool" -exportcert -alias ssl.repo -file "$CERTIFICATE_HOME/ssl.repo.crt" -keystore "$CERTIFICATE_HOME/ssl.keystore" -storetype JCEKS -storepass kT9X6oe68t -"$JAVA_HOME/bin/keytool" -genkeypair -keyalg RSA -dname "$SOLR_CLIENT_CERT_DNAME" -validity $CERTIFICATE_VALIDITY -alias ssl.repo.client -keypass kT9X6oe68t -keystore "$CERTIFICATE_HOME/ssl.repo.client.keystore" -storetype JCEKS -storepass kT9X6oe68t -"$JAVA_HOME/bin/keytool" -exportcert -alias ssl.repo.client -file "$CERTIFICATE_HOME/ssl.repo.client.crt" -keystore "$CERTIFICATE_HOME/ssl.repo.client.keystore" -storetype JCEKS -storepass kT9X6oe68t - -# Create trust relationship between repository and solr -"$JAVA_HOME/bin/keytool" -importcert -noprompt -alias ssl.repo.client -file "$CERTIFICATE_HOME/ssl.repo.client.crt" -keystore "$CERTIFICATE_HOME/ssl.truststore" -storetype JCEKS -storepass kT9X6oe68t -# Create trust relationship between repository and itself - used for searches -"$JAVA_HOME/bin/keytool" -importcert -noprompt -alias ssl.repo -file "$CERTIFICATE_HOME/ssl.repo.crt" -keystore "$CERTIFICATE_HOME/ssl.truststore" -storetype JCEKS -storepass kT9X6oe68t -# Create trust relationship between solr and repository -"$JAVA_HOME/bin/keytool" -importcert -noprompt -alias ssl.repo -file "$CERTIFICATE_HOME/ssl.repo.crt" -keystore "$CERTIFICATE_HOME/ssl.repo.client.truststore" -storetype JCEKS -storepass kT9X6oe68t -# Export repository keystore to pkcs12 format for browser compatibility -"$JAVA_HOME/bin/keytool" -importkeystore -srckeystore "$CERTIFICATE_HOME/ssl.keystore" -srcstorepass kT9X6oe68t -srcstoretype JCEKS -srcalias ssl.repo -srckeypass kT9X6oe68t -destkeystore "$CERTIFICATE_HOME/browser.p12" -deststoretype pkcs12 -deststorepass alfresco -destalias ssl.repo -destkeypass alfresco - -# Ensure keystore dir actually exists -mkdir -p "$ALFRESCO_KEYSTORE_HOME" - -# Back up old files -cp "$ALFRESCO_KEYSTORE_HOME/ssl.keystore" "$ALFRESCO_KEYSTORE_HOME/ssl.keystore.old" -cp "$ALFRESCO_KEYSTORE_HOME/ssl.truststore" "$ALFRESCO_KEYSTORE_HOME/ssl.truststore.old" -cp "$ALFRESCO_KEYSTORE_HOME/browser.p12" "$ALFRESCO_KEYSTORE_HOME/browser.p12.old" - -# Install the new files -cp "$CERTIFICATE_HOME/ssl.keystore" "$ALFRESCO_KEYSTORE_HOME/ssl.keystore" -cp "$CERTIFICATE_HOME/ssl.truststore" "$ALFRESCO_KEYSTORE_HOME/ssl.truststore" -cp "$CERTIFICATE_HOME/browser.p12" "$ALFRESCO_KEYSTORE_HOME/browser.p12" - -echo " " -echo "*******************************************" -echo "You must copy the following files to the correct location." -echo " " -echo " $CERTIFICATE_HOME/ssl.repo.client.keystore" -echo " $CERTIFICATE_HOME/ssl.repo.client.truststore" -echo " eg. for Solr 4 the location is SOLR_HOME/workspace-SpacesStore/conf/ and SOLR_HOME/archive-SpacesStore/conf/" -echo " " -echo "$ALFRESCO_KEYSTORE_HOME/browser.p12 has also been generated." -echo " " -echo "Please ensure that you set dir.keystore=$ALFRESCO_KEYSTORE_HOME in alfresco-global.properties" -echo "*******************************************" diff --git a/packaging/distribution/src/main/resources/keystore/readme.txt b/packaging/distribution/src/main/resources/keystore/readme.txt deleted file mode 100644 index 25f317223c9..00000000000 --- a/packaging/distribution/src/main/resources/keystore/readme.txt +++ /dev/null @@ -1,7 +0,0 @@ -See https://wiki.alfresco.com/wiki/Data_Encryption and https://wiki.alfresco.com/wiki/Alfresco_And_SOLR. - -keystore is the secret key keystore, containing the secret key used to encrypt and decrypt node properties. -ssl.keystore is the repository keystore, containing the repository private/public key pair and certificate. -ssl.truststore is the repository truststore, containing certificates that the repository trusts. - -browser.p12 is a pkcs12 keystore generated from ssl.keystore that contains the repository private key and certificate for use in browsers such as Firefox. \ No newline at end of file diff --git a/packaging/distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml b/packaging/distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml deleted file mode 100644 index ac2960c1485..00000000000 --- a/packaging/distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/packaging/docker-alfresco/Dockerfile b/packaging/docker-alfresco/Dockerfile index 691b4356c7e..6d0e9fb433f 100644 --- a/packaging/docker-alfresco/Dockerfile +++ b/packaging/docker-alfresco/Dockerfile @@ -2,6 +2,9 @@ # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat FROM alfresco/alfresco-base-tomcat:8.5.43-java-11-openjdk-centos-7 +# Set default docker_context. Will / Can be overriden with maven. +ARG resource_path=target + # Set default user information ARG GROUPNAME=Alfresco ARG GROUPID=1000 @@ -13,46 +16,44 @@ ARG TOMCAT_DIR=/usr/local/tomcat # Create prerequisite to store tools and properties -RUN mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension && \ - mkdir ${TOMCAT_DIR}/alfresco-mmt -RUN touch ${TOMCAT_DIR}/shared/classes/alfresco-global.properties +RUN mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/mimetypes && \ + mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/transform/renditions && \ + mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/transform/pipelines && \ + mkdir ${TOMCAT_DIR}/alfresco-mmt && \ + touch ${TOMCAT_DIR}/shared/classes/alfresco-global.properties # You need to run `mvn clean install` in the root of this project to update the following dependencies # Copy the WAR files to the appropriate location for your application server # Copy the JDBC drivers for the database you are using to the lib/ directory. # Copy the alfresco-mmt.jar -COPY target/war ${TOMCAT_DIR}/webapps -COPY target/connector/* ${TOMCAT_DIR}/lib/ -COPY target/alfresco-mmt/* ${TOMCAT_DIR}/alfresco-mmt/ - # Copy Licenses to the root of the Docker image RUN mkdir /licenses -COPY target/licenses/ /licenses/ +COPY ${resource_path}/licenses/ /licenses/ +COPY ${resource_path}/war ${TOMCAT_DIR}/webapps +COPY ${resource_path}/connector/* ${TOMCAT_DIR}/lib/ +COPY ${resource_path}/alfresco-mmt/* ${TOMCAT_DIR}/alfresco-mmt/ # Change the value of the shared.loader= property to the following: # shared.loader=${catalina.base}/shared/classes RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" ${TOMCAT_DIR}/conf/catalina.properties -RUN mkdir -p ${TOMCAT_DIR}/amps \ - ${TOMCAT_DIR}/shared/classes/alfresco/extension/mimetypes \ - ${TOMCAT_DIR}/shared/classes/alfresco/extension/transform/renditions \ - ${TOMCAT_DIR}/shared/classes/alfresco/extension/transform/pipelines +RUN mkdir -p ${TOMCAT_DIR}/amps #RUN echo -e '\n\ #log4j.logger.org.alfresco.repo.content.transform.TransformerDebug=debug\n\ #' >> ${TOMCAT_DIR}/shared/classes/alfresco/extension/custom-log4j.propertiesRUN mkdir -p ${TOMCAT_DIR}/amps # Copy the amps from build context to the appropriate location for your application server -COPY target/amps ${TOMCAT_DIR}/amps +COPY ${resource_path}/amps ${TOMCAT_DIR}/amps # Install amps on alfresco.war RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \ ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup -force -# Docker CMD from parent image starts the server +# Move the log file +RUN sed -i -e "s_log4j.appender.File.File\=alfresco.log_log4j.appender.File.File\=${TOMCAT_DIR}/logs\/alfresco.log_" \ + ${TOMCAT_DIR}/webapps/alfresco/WEB-INF/classes/log4j.properties && \ -# Make webapps folder read-only. -RUN chmod -R =r ${TOMCAT_DIR}/webapps && \ # Add catalina.policy to ROOT.war and alfresco.war # Grant all security permissions to alfresco webapp because of numerous permissions required in order to work properly. # Grant only deployXmlPermission to ROOT webapp. @@ -68,6 +69,14 @@ RUN yum install -y fontconfig-2.13.0-4.3.el7 \ dejavu-sans-fonts-2.33-6.el7 && \ yum clean all +# Generate default keystore. Please generate new one for production systems +ARG CERT_DNAME="CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB" +ARG CERT_VALIDITY=36525 +ARG KEYSTORE_PASSWORD=mp6yc0UD9e +RUN mkdir ${TOMCAT_DIR}/shared/classes/alfresco/keystore && \ + keytool -genseckey -dname "$CERT_DNAME" -validity ${CERT_VALIDITY} -alias metadata -keyalg AES -keysize 256 -keystore ${TOMCAT_DIR}/shared/classes/alfresco/keystore/keystore -storetype pkcs12 -storepass ${KEYSTORE_PASSWORD} + + # The standard configuration is to have all Tomcat files owned by root with group GROUPNAME and whilst owner has read/write privileges, # group only has restricted permissions and world has no permissions. RUN mkdir -p ${TOMCAT_DIR}/conf/Catalina/localhost && \ @@ -75,7 +84,6 @@ RUN mkdir -p ${TOMCAT_DIR}/conf/Catalina/localhost && \ groupadd -g ${GROUPID} ${GROUPNAME} && \ useradd -u ${USERID} -G ${GROUPNAME} ${IMAGEUSERNAME} && \ chgrp -R ${GROUPNAME} ${TOMCAT_DIR} && \ - chmod g+w ${TOMCAT_DIR}/logs && \ chmod g+rx ${TOMCAT_DIR}/conf && \ chmod -R g+r ${TOMCAT_DIR}/conf && \ find ${TOMCAT_DIR}/webapps -type d -exec chmod 0750 {} \; && \ @@ -84,14 +92,14 @@ RUN mkdir -p ${TOMCAT_DIR}/conf/Catalina/localhost && \ chmod g+r ${TOMCAT_DIR}/conf/Catalina && \ chmod g+rwx ${TOMCAT_DIR}/alf_data && \ chmod g+rwx ${TOMCAT_DIR}/logs && \ + chmod o-w ${TOMCAT_DIR}/logs && \ chmod g+rwx ${TOMCAT_DIR}/temp && \ chmod g+rwx ${TOMCAT_DIR}/work && \ + chmod o-w ${TOMCAT_DIR}/work - sed -i -e "s_log4j.appender.File.File\=alfresco.log_log4j.appender.File.File\=${TOMCAT_DIR}/logs\/alfresco.log_" \ - ${TOMCAT_DIR}/webapps/alfresco/WEB-INF/classes/log4j.properties +EXPOSE 10001 -# To remote debug into this image add: EXPOSE 8000 -# Changes are also required to the docker-compose/docker-compose.yml file. -# EXPOSE 8000 +# For remote debug +EXPOSE 8000 USER ${IMAGEUSERNAME} \ No newline at end of file diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 3deda74e00e..62084adc8b3 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - content-services-community-docker-alfresco - ACS Community Docker Image Builder for Alfresco Community + alfresco-community-repo-docker + Alfresco Community Repo Docker Base Builder pom org.alfresco - acs-community-packaging - 6.2.2-SNAPSHOT - ../pom.xml - + alfresco-community-repo-packaging + 8.300-SNAPSHOT + - alfresco/alfresco-content-repository-community + alfresco/alfresco-community-repo-base quay.io @@ -23,12 +22,6 @@ ${project.version} war - - org.alfresco - api-explorer - ${dependency.alfresco-api-explorer.version} - war - org.alfresco alfresco-server-root @@ -38,19 +31,12 @@ org.postgresql postgresql - ${dependency.postgresql.version} org.alfresco alfresco-mmt ${dependency.alfresco-mmt.version} - - org.alfresco - alfresco-share-services - ${alfresco.alfresco-share-services.version} - amp - org.alfresco.aos-module alfresco-aos-module @@ -124,13 +110,6 @@ false ${project.build.directory}/war/alfresco - - org.alfresco - api-explorer - ${dependency.alfresco-api-explorer.version} - war - ${project.build.directory}/war/api-explorer - org.alfresco alfresco-server-root @@ -159,7 +138,6 @@ org.postgresql postgresql - ${dependency.postgresql.version} jar false ${project.build.directory}/connector @@ -184,14 +162,6 @@ - - org.alfresco - alfresco-share-services - ${alfresco.alfresco-share-services.version} - amp - false - ${project.build.directory}/amps - org.alfresco.aos-module alfresco-aos-module diff --git a/packaging/l10n.properties b/packaging/l10n.properties index 0f319072f58..96ee00fb2dd 100644 --- a/packaging/l10n.properties +++ b/packaging/l10n.properties @@ -1,5 +1,5 @@ # Branch specific configuration file for localisation scripts -# here is no localization needed in the acs-community-packaging project for now +# here is no localization needed in the alfresco-community-repo-packaging project for now MESSAGE_SEARCH_PATH="" diff --git a/packaging/pom.xml b/packaging/pom.xml index 7f92efd6d93..7e399b6d6e4 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -1,20 +1,19 @@ 4.0.0 - acs-community-packaging - Alfresco Content Services Community Packaging - 6.2.2-SNAPSHOT + alfresco-community-repo-packaging + Alfresco Community Repo Packaging pom org.alfresco - alfresco-super-pom - 12 + alfresco-community-repo + 8.300-SNAPSHOT - scm:git:https://github.com/Alfresco/acs-community-packaging.git - scm:git:https://github.com/Alfresco/acs-community-packaging.git - https://github.com/Alfresco/acs-community-packaging + scm:git:https://github.com/Alfresco/alfresco-community-repo-packaging.git + scm:git:https://github.com/Alfresco/alfresco-community-repo-packaging.git + https://github.com/Alfresco/alfresco-community-repo-packaging HEAD @@ -34,56 +33,9 @@ Community latest - 7.147 - 7.200 - 8.50.18 - 7.34 - - 1.0.12 - - 7.16 - 6.0 - 1.1 - 2.3 - 7.1 - 6.0.1 - 6.2.1.1 - 1.2.15 - 0.2 - - 5.1.15.RELEASE - 4.4.0 - 2.10.2 - 2.10.1 - 3.3.6 - - - 6.2.2 - 6.2.2 - - - 3.2.0 - - - 1.3.1 - ${project.version} alfresco-community ${alfresco.package.name}-distribution - - 42.2.14 - - 3.0.20 - 3.3.0 - 1.1.4 - 1.37 - 1.13 - 1.8 - 1.6 - 1.5 - 2.3 - - 11 @@ -107,8 +59,6 @@ war - distribution - public-javadoc docker-alfresco @@ -120,440 +70,4 @@ - - - - org.alfresco - alfresco-core - ${dependency.alfresco-core.version} - - - org.alfresco - alfresco-core - ${dependency.alfresco-core.version} - tests - - - org.alfresco - alfresco-data-model - ${dependency.alfresco-data-model.version} - - - org.alfresco - alfresco-jlan-embed - ${dependency.alfresco-jlan.version} - - - org.alfresco - alfresco-remote-api - ${dependency.alfresco-remote-api.version} - - - org.alfresco - alfresco-remote-api - ${dependency.alfresco-remote-api.version} - tests - - - org.alfresco - alfresco-repository - ${dependency.alfresco-repository.version} - - - org.alfresco - alfresco-repository - ${dependency.alfresco-repository.version} - tests - - - org.alfresco - alfresco-trashcan-cleaner - ${dependency.alfresco-trashcan-cleaner.version} - - - org.alfresco - alfresco-heartbeat-data-sender - ${dependency.alfresco-hb-data-sender.version} - - - xalan - xalan - 2.7.2-alfresco - - - org.alfresco.services - alfresco-messaging-repo - ${dependency.alfresco-messaging-repo.version} - - - org.alfresco - alfresco-mmt - ${dependency.alfresco-mmt.version} - - - org.alfresco - alfresco-pdf-renderer - ${dependency.alfresco-pdf-renderer.version} - linux - tgz - - - org.alfresco - alfresco-pdf-renderer - ${dependency.alfresco-pdf-renderer.version} - win64 - tgz - - - org.alfresco - alfresco-pdf-renderer - ${dependency.alfresco-pdf-renderer.version} - - - org.alfresco - alfresco-server-root - ${dependency.alfresco-server-root.version} - war - - - org.alfresco.surf - spring-surf-core-configservice - ${dependency.alfresco-spring-webscripts.version} - - - org.alfresco.surf - spring-webscripts - ${dependency.alfresco-spring-webscripts.version} - - - org.alfresco.surf - spring-webscripts-api - ${dependency.alfresco-spring-webscripts.version} - - - org.quartz-scheduler - quartz - 2.3.2 - - - - - com.mchange - * - - - - - org.apache.httpcomponents - httpcore - 4.4.13 - - - joda-time - joda-time - 2.10.5 - - - commons-httpclient - commons-httpclient - 3.1-HTTPCLIENT-1265 - - - commons-logging - commons-logging - 1.2 - - - commons-beanutils - commons-beanutils - 1.9.4 - - - commons-codec - commons-codec - 1.14 - - - commons-collections - commons-collections - 3.2.2 - - - - commons-digester - commons-digester - 2.1 - - - commons-lang - commons-lang - 2.6 - - - commons-fileupload - commons-fileupload - 1.4 - - - com.sun.xml.bind - jaxb-impl - 2.3.2 - - - org.apache.httpcomponents - httpclient - 4.5.12 - - - org.apache.httpcomponents - httpclient-cache - 4.5.12 - - - org.apache.xmlbeans - xmlbeans - 3.1.0 - - - org.springframework - spring-aop - ${dependency.spring.version} - - - org.springframework - spring-beans - ${dependency.spring.version} - - - org.springframework - spring-context - ${dependency.spring.version} - - - org.springframework - spring-context-support - ${dependency.spring.version} - - - org.springframework - spring-core - ${dependency.spring.version} - - - - - org.springframework - spring-jcl - - - - - org.springframework - spring-expression - ${dependency.spring.version} - - - org.springframework - spring-jdbc - ${dependency.spring.version} - - - org.springframework - spring-jms - ${dependency.spring.version} - - - org.springframework - spring-orm - ${dependency.spring.version} - - - - - org.springframework - spring-jcl - - - - - org.springframework - spring-tx - ${dependency.spring.version} - - - org.springframework - spring-web - ${dependency.spring.version} - - - org.springframework - spring-webmvc - ${dependency.spring.version} - - - com.fasterxml.jackson.core - jackson-core - ${dependency.jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${dependency.jackson-databind.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${dependency.jackson.version} - - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${dependency.jackson.version} - - - org.codehaus.woodstox - woodstox-core-asl - 4.4.1 - - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-rs-client - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-ws-policy - ${dependency.cxf.version} - - - - org.apache.commons - commons-email - 1.5 - - - - junit - junit - 4.13 - test - - - org.alfresco - alfresco-log-sanitizer - ${dependency.alfresco-log-sanitizer.version} - - - org.alfresco.aos-module - alfresco-aos-module - ${alfresco.aos-module.version} - amp - - - org.alfresco.aos-module - alfresco-aos-module-distributionzip - ${alfresco.aos-module.version} - zip - - - org.alfresco.aos-module - alfresco-vti-bin - ${alfresco.aos-module.version} - war - - - org.alfresco - alfresco-content-services-share-distribution - ${alfresco.share.version} - zip - - - org.alfresco - alfresco-share-services - ${alfresco.alfresco-share-services.version} - amp - - - org.alfresco - share - ${alfresco.share.version} - war - - - org.alfresco - alfresco-wcmqs-distribution - ${alfresco.share.version} - zip - - - org.alfresco - alfresco-wcmqs-web - ${alfresco.share.version} - classes - - - org.alfresco - alfresco-wcmqs-client-api - ${alfresco.share.version} - - - org.alfresco.integrations - alfresco-googledrive-repo-community - ${alfresco.googledrive.version} - amp - - - org.alfresco.integrations - alfresco-googledrive-share-community - ${alfresco.googledrive.version} - amp - - - - org.bouncycastle - bcprov-jdk15on - 1.65 - - - org.bouncycastle - bcmail-jdk15on - 1.65 - - - - com.github.junrar - junrar - 4.0.0 - - - - org.jsoup - jsoup - 1.13.1 - - - - com.drewnoakes - metadata-extractor - 2.13.0 - - - diff --git a/packaging/public-javadoc/pom.xml b/packaging/public-javadoc/pom.xml deleted file mode 100644 index 32aadaad868..00000000000 --- a/packaging/public-javadoc/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - 4.0.0 - alfresco-public-javadoc - Alfresco Content Services Public API Javadoc - - org.alfresco - acs-community-packaging - 6.2.2-SNAPSHOT - ../pom.xml - - pom - - - 1.6.1 - - - - - - org.alfresco - alfresco-remote-api - - - org.alfresco - share - classes - ${alfresco.share.version} - - - - - com.docflex - docflex-alfresco-license - 1.0 - license - provided - - - - - - - - maven-dependency-plugin - - - - default-cli - false - - unpack - - - - - com.docflex - docflex-javadoc - ${docflex.version} - zip - - - ${project.build.directory} - - - - - - - maven-javadoc-plugin - - com.docflex.javadoc.Doclet - ${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar - - -license ${settings.localRepository}/com/docflex/docflex-alfresco-license/1.0/docflex-alfresco-license-1.0.license - -template ${project.build.directory}/docflex-javadoc-${docflex.version}/templates/JavadocPro/FramedDoc.tpl - -nodialog - -launchviewer=false - -p:filter.byAnns.include.classes=org.alfresco.api.AlfrescoPublicApi - -p:docTitle "Alfresco ${project.version} Public API" - -p:windowTitle "Alfresco ${project.version} Public API" - - true - true - - org.alfresco:* - - - org.alfresco:alfresco-xmlfactory - org.alfresco:alfresco-text-gen - - org.customer,org.apache - - - - - - - diff --git a/packaging/tests/environment/docker-compose-minimal+transforms.yml b/packaging/tests/environment/docker-compose-minimal+transforms.yml index d8f0a1f7e6c..44fb1569b13 100644 --- a/packaging/tests/environment/docker-compose-minimal+transforms.yml +++ b/packaging/tests/environment/docker-compose-minimal+transforms.yml @@ -7,7 +7,7 @@ version: "3" services: alfresco: - image: alfresco/alfresco-content-repository-community:latest + image: alfresco/alfresco-community-repo-base:latest environment: CATALINA_OPTS : "-agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n" # Some properties are built in Dockerfile because of cron expressions @@ -43,6 +43,11 @@ services: -Dftp.port=1221 -Dcors.enabled=true -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080 + + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=mp6yc0UD9e + -Dmetadata-keystore.metadata.algorithm=AES " ports: - 8082:8080 diff --git a/packaging/tests/environment/docker-compose-minimal.yml b/packaging/tests/environment/docker-compose-minimal.yml index 453db3ae8b1..965f23c7d8d 100644 --- a/packaging/tests/environment/docker-compose-minimal.yml +++ b/packaging/tests/environment/docker-compose-minimal.yml @@ -7,7 +7,7 @@ version: "3" services: alfresco: - image: alfresco/alfresco-content-repository-community:latest + image: alfresco/alfresco-community-repo-base:latest environment: CATALINA_OPTS : "-agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n" JAVA_OPTS : diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 95381bbe8cb..0bb047990be 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -1,15 +1,13 @@ 4.0.0 - content-repository-community-tas-tests-parent - 6.2.2-SNAPSHOT + alfresco-community-repo-tests pom org.alfresco - acs-community-packaging - 6.2.2-SNAPSHOT - ../pom.xml - + alfresco-community-repo-packaging + 8.300-SNAPSHOT + tas-restapi @@ -19,68 +17,4 @@ tas-integration - - - - org.alfresco.tas - utility - ${dependency.tas-utility.version} - test - - - io.rest-assured - rest-assured - ${dependency.rest-assured.version} - test - - - org.glassfish - javax.json - ${dependency.javax.json.version} - test - - - org.alfresco.tas - restapi - ${dependency.tas-restapi.version} - test - - - org.alfresco.tas - cmis - ${dependency.tas-cmis.version} - test - - - org.alfresco.tas - email - ${dependency.tas-email.version} - test - - - org.alfresco.tas - webdav - ${dependency.tas-webdav.version} - test - - - org.alfresco.tas - ftp - ${dependency.tas-ftp.version} - test - - - org.alfresco.test - dataprep - ${dependency.tas-dataprep.version} - test - - - org.springframework - spring-test - ${dependency.spring.version} - test - - - \ No newline at end of file diff --git a/packaging/tests/scripts/stop-compose.sh b/packaging/tests/scripts/stop-compose.sh index 6fe57386243..33dc6f54aad 100755 --- a/packaging/tests/scripts/stop-compose.sh +++ b/packaging/tests/scripts/stop-compose.sh @@ -10,10 +10,8 @@ fi echo "Killing ACS stack in ${DOCKER_COMPOSE_PATH}" -cd ${DOCKER_COMPOSE_PATH} - -docker-compose ps +docker-compose --file ${DOCKER_COMPOSE_PATH} ps # logs for debug -docker-compose logs --no-color -t alfresco -docker-compose kill -docker-compose rm -fv \ No newline at end of file +docker-compose --file ${DOCKER_COMPOSE_PATH} logs --no-color -t alfresco +docker-compose --file ${DOCKER_COMPOSE_PATH} kill +docker-compose --file ${DOCKER_COMPOSE_PATH} rm -fv \ No newline at end of file diff --git a/packaging/tests/scripts/wait-for-alfresco-start.sh b/packaging/tests/scripts/wait-for-alfresco-start.sh index df481913065..feb1edf5015 100755 --- a/packaging/tests/scripts/wait-for-alfresco-start.sh +++ b/packaging/tests/scripts/wait-for-alfresco-start.sh @@ -27,5 +27,10 @@ if (("$COUNTER" < "$TIMEOUT")) ; then else echo "Waited $COUNTER seconds" echo "Alfresco Could not start in time." + echo "All started containers:" + docker ps -a + ALFCONTAINER=`docker ps -a | grep _alfresco | awk '{ print $1 }'` + echo "Last 200 lines from alfresco.log on container $ALFCONTAINER:" + docker logs --tail=200 $ALFCONTAINER exit 1 fi \ No newline at end of file diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index a0e5c20dba5..7fa89260552 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -2,17 +2,15 @@ 4.0.0 org.alfresco.tas - content-repository-community-cmis-test - content-repository-community-cmis-test - 6.2.2-SNAPSHOT + alfresco-community-repo-cmis-test + cmis test jar org.alfresco - content-repository-community-tas-tests-parent - 6.2.2-SNAPSHOT - ../pom.xml - + alfresco-community-repo-tests + 8.300-SNAPSHOT + diff --git a/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DataListsTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DataListsTests.java deleted file mode 100644 index fec6d4b7fcd..00000000000 --- a/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DataListsTests.java +++ /dev/null @@ -1,590 +0,0 @@ -package org.alfresco.cmis; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import org.alfresco.utility.constants.UserRole; -import org.alfresco.utility.data.DataUser; -import org.alfresco.utility.data.RandomData; -import org.alfresco.utility.model.DataListItemModel; -import org.alfresco.utility.model.DataListModel; -import org.alfresco.utility.model.FileModel; -import org.alfresco.utility.model.FileType; -import org.alfresco.utility.model.SiteModel; -import org.alfresco.utility.model.TestGroup; -import org.alfresco.utility.model.UserModel; -import org.alfresco.utility.testrail.ExecutionType; -import org.alfresco.utility.testrail.annotation.TestRail; -import org.apache.chemistry.opencmis.commons.PropertyIds; -import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException; -import org.apache.chemistry.opencmis.commons.exceptions.CmisContentAlreadyExistsException; -import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException; -import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException; -import org.apache.chemistry.opencmis.commons.exceptions.CmisPermissionDeniedException; -import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; -import org.apache.chemistry.opencmis.commons.exceptions.CmisUnauthorizedException; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -public class DataListsTests extends CmisTest -{ - UserModel manager; - SiteModel testSite; - DataListModel dataListModel; - private DataUser.ListUserWithRoles usersWithRoles; - - @BeforeClass(alwaysRun = true) - public void dataPreparation() throws Exception - { - manager = dataUser.createRandomTestUser(); - testSite = dataSite.usingUser(manager).createPublicRandomSite(); - usersWithRoles = dataUser.usingUser(manager) - .addUsersWithRolesToSite(testSite, UserRole.SiteContributor, UserRole.SiteCollaborator, UserRole.SiteConsumer); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify admin user is able to create data list type contact") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void adminCanCreateContactDataList() throws Exception - { - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(dataUser.getAdminUser()).usingShared() - .createDataList(dataListModel).and().assertThat().existsInRepo() - .assertThat().objectTypeIdIs("F:dl:dataList"); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is able to create data list type contact") - @Test(groups = { TestGroup.SANITY, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void managerCanCreateContactDataList() throws Exception - { - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .createDataList(dataListModel).and().assertThat().existsInRepo() - .assertThat().objectTypeIdIs("F:dl:dataList") - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:contact"); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify collaborator user is able to create data list type contact") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void collaboratorCanCreatedIssueDataList() throws Exception - { - dataListModel = DataListModel.getRandomDataListModel("dl:issue"); - cmisApi.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)).usingSite(testSite) - .createDataList(dataListModel).and().assertThat().existsInRepo() - .assertThat().objectTypeIdIs("F:dl:dataList") - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:issue"); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify contributor user is able to create data list type contact") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void contributorCanCreateEventAgendaDataList() throws Exception - { - dataListModel = DataListModel.getRandomDataListModel("dl:eventAgenda"); - cmisApi.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)).usingSite(testSite) - .createDataList(dataListModel).and().assertThat().existsInRepo() - .assertThat().objectTypeIdIs("F:dl:dataList") - .assertThat().objectHasProperty("dl:dataListItemType", "dl:eventAgenda"); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify consumer user is able to create data list type contact") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions={CmisPermissionDeniedException.class, CmisUnauthorizedException.class}) - public void consumerCannotCreateEventAgendaDataList() throws Exception - { - dataListModel = DataListModel.getRandomDataListModel("dl:eventAgenda"); - cmisApi.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)).usingSite(testSite) - .createDataList(dataListModel).and().assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is able to create data list type contact") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void managerCanCreateContactDataListItem() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:contact"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:contactFirstName", "John"); - itemProperties.put("dl:contactLastName", "Snow"); - itemProperties.put("dl:contactEmail", "john.snow@stark.com"); - itemProperties.put("dl:contactCompany", "GOT"); - itemProperties.put("dl:contactJobTitle", "king"); - itemProperties.put("dl:contactPhoneOffice", "1234"); - itemProperties.put("dl:contactPhoneMobile", "5678"); - itemProperties.put("dl:contactNotes", "you know nothing john snow"); - - DataListItemModel contactItem = new DataListItemModel(itemProperties); - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:contact") - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is able to create data list type contact") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void managerCanCreateIssueListItem() throws Exception - { - UserModel assignUser = dataUser.createRandomTestUser(); - FileModel attachDoc1 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN); - FileModel attachDoc2 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN); - - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:issue"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueID", RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueStatus", "Not Started"); - itemProperties.put("dl:issuePriority", "Low"); - itemProperties.put("dl:issueDueDate", new Date()); - itemProperties.put("dl:issueComments", "comment"); - - DataListItemModel issueItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:issue"); - cmisApi.authenticateUser(manager).usingSite(testSite).createFile(attachDoc1).createFile(attachDoc2) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:issue") - .then().usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo() - .then().attachDocument(attachDoc1) - .attachDocument(attachDoc2) - .assertThat().objectHasRelationshipWith(attachDoc1) - .assertThat().objectHasRelationshipWith(attachDoc2) - .then().assignToUser(assignUser, "R:dl:issueAssignedTo") - .assertThat().userIsAssigned(assignUser); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is able to create data list type contact") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions=CmisObjectNotFoundException.class, - expectedExceptionsMessageRegExp="Type 'D:dl:invalidItem' is unknown!*") - public void managerCannotCreateInvalidDataListItem() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:invalidItem"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - - DataListItemModel contactItem = new DataListItemModel(itemProperties); - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:contact") - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify collaborator user is able to add issue item type for data list created by manager") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void collaboratorCanAddIssueItem() throws Exception - { - UserModel assignUser = dataUser.createRandomTestUser(); - FileModel attachDoc1 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN); - FileModel attachDoc2 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN); - - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:issue"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueID", RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueDueDate", new Date()); - itemProperties.put("dl:issueComments", "comment"); - DataListItemModel issueItem = new DataListItemModel(itemProperties); - dataListModel = DataListModel.getRandomDataListModel("dl:issue"); - - cmisApi.authenticateUser(manager).usingSite(testSite).createFile(attachDoc1).createFile(attachDoc2) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:issue") - .then().authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .then().usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo() - .then().attachDocument(attachDoc1) - .attachDocument(attachDoc2) - .assertThat().objectHasRelationshipWith(attachDoc1) - .assertThat().objectHasRelationshipWith(attachDoc2) - .then().assignToUser(assignUser, "R:dl:issueAssignedTo") - .assertThat().userIsAssigned(assignUser); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify contributor user is able to add issue item type for data list created by manager") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void contributorCanAddIssueItem() throws Exception - { - UserModel assignUser = dataUser.createRandomTestUser(); - FileModel attachDoc1 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN); - FileModel attachDoc2 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN); - - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:issue"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueID", RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueStatus", "Not Started"); - itemProperties.put("dl:issuePriority", "Low"); - DataListItemModel issueItem = new DataListItemModel(itemProperties); - dataListModel = DataListModel.getRandomDataListModel("dl:issue"); - - cmisApi.authenticateUser(manager).usingSite(testSite).createFile(attachDoc1).createFile(attachDoc2) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:issue") - .then().authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .then().usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo() - .then().attachDocument(attachDoc1) - .attachDocument(attachDoc2) - .assertThat().objectHasRelationshipWith(attachDoc1) - .assertThat().objectHasRelationshipWith(attachDoc2) - .then().assignToUser(assignUser, "R:dl:issueAssignedTo") - .assertThat().userIsAssigned(assignUser); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify consumer user is able to add issue item type for data list created by manager") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions={CmisPermissionDeniedException.class, CmisUnauthorizedException.class}) - public void consumerCannotAddIssueItem() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:issue"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - DataListItemModel issueItem = new DataListItemModel(itemProperties); - dataListModel = DataListModel.getRandomDataListModel("dl:issue"); - - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:issue") - .then().authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .then().usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify non invited user is able to add issue item type for data list created by manager in private site") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions={CmisPermissionDeniedException.class, CmisUnauthorizedException.class}) - public void nonInvitedUserCannotAddIssueItemInPrivateSite() throws Exception - { - SiteModel privateSite = dataSite.usingUser(manager).createPrivateRandomSite(); - - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:issue"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - DataListItemModel issueItem = new DataListItemModel(itemProperties); - dataListModel = DataListModel.getRandomDataListModel("dl:issue"); - - cmisApi.authenticateUser(manager).usingSite(privateSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:issue") - .then().authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is not able to create data list item with invalid status") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions=CmisConstraintException.class) - public void managerCannotCreateTaskItemWithInvalidStatusValue() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:simpletask"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:simpletaskStatus", "invalid-status"); - - DataListItemModel issueItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:simpletask"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .then().usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is not able to create data list item with invalid status") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions=IllegalArgumentException.class, - expectedExceptionsMessageRegExp="Property 'dl:fakePriority' is not valid for this type or one of the secondary types!*") - public void managerCannotCreateTaskItemWithInvalidParameter() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:simpletask"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:fakePriority", "High"); - - DataListItemModel issueItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:simpletask"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .then().usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is not able to assign issue item to deleted user") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions=CmisInvalidArgumentException.class, - expectedExceptionsMessageRegExp="Property cmis:targetId must be set!*") - public void managerCannotAssignIssueItemToDeletedUser() throws Exception - { - UserModel assignUser = dataUser.createRandomTestUser(); - - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:issue"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueID", RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueDueDate", new Date()); - itemProperties.put("dl:issueComments", "comment"); - DataListItemModel issueItem = new DataListItemModel(itemProperties); - dataListModel = DataListModel.getRandomDataListModel("dl:issue"); - - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:issue") - .then().usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo(); - dataUser.usingAdmin().deleteUser(assignUser); - cmisApi.assignToUser(assignUser, "R:dl:issueAssignedTo").assertThat().userIsAssigned(assignUser); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is not able to assign issue item twice to same user") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions=CmisRuntimeException.class) - public void managerCannotAssignIssueItemTwice() throws Exception - { - UserModel assignUser = dataUser.createRandomTestUser(); - - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:issue"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueID", RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueDueDate", new Date()); - itemProperties.put("dl:issueComments", "comment"); - DataListItemModel issueItem = new DataListItemModel(itemProperties); - dataListModel = DataListModel.getRandomDataListModel("dl:issue"); - - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:issue") - .then().usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo(); - cmisApi.assignToUser(assignUser, "R:dl:issueAssignedTo").assertThat().userIsAssigned(assignUser) - .then().assignToUser(assignUser, "R:dl:issueAssignedTo"); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is able to assign issue item for 2 users") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void managerCanAssignIssueItemForTwoUsers() throws Exception - { - UserModel assignUser = dataUser.createRandomTestUser(); - UserModel anotherUser = dataUser.createRandomTestUser(); - - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:issue"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueID", RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:issueDueDate", new Date()); - itemProperties.put("dl:issueComments", "comment"); - DataListItemModel issueItem = new DataListItemModel(itemProperties); - dataListModel = DataListModel.getRandomDataListModel("dl:issue"); - - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:issue") - .then().usingResource(dataListModel) - .createDataListItem(issueItem).assertThat().existsInRepo(); - cmisApi.assignToUser(assignUser, "R:dl:issueAssignedTo").assertThat().userIsAssigned(assignUser) - .then().assignToUser(anotherUser, "R:dl:issueAssignedTo"); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.SANITY, - description = "Verify manager user is able to delete contact data list with no items") - @Test(groups = { TestGroup.SANITY, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void managerCanDeleteContactDataList() throws Exception - { - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:contact") - .then().delete().assertThat().doesNotExistInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify manager user is not able to create contact data list items with same name twice") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions=CmisContentAlreadyExistsException.class) - public void managerCannotCreateContactDataListWithSameNameTwice() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:contact"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:contactFirstName", "John"); - DataListItemModel contactItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:contact") - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo() - .then().usingResource(dataListModel) - .then().createDataListItem(contactItem); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify manager user is not able to create contact data list items at item location") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions=CmisInvalidArgumentException.class, - expectedExceptionsMessageRegExp="Parent folder is not a folder!*") - public void managerCannotCreateContactDataListItemInsideItem() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:contact"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:contactFirstName", "John"); - DataListItemModel contactItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .and().assertThat().objectHasProperty("dl:dataListItemType", "dl:contact") - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo() - .then().usingResource(contactItem) - .createDataListItem(contactItem); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify manager user is not able to simple delete contact data list with items") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}, expectedExceptions=CmisConstraintException.class, - expectedExceptionsMessageRegExp="Could not delete folder with at least one child!*") - public void managerCannotSimpleDeleteContactDataListWithItems() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:contact"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:contactFirstName", "John"); - DataListItemModel contactItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo() - .then().usingResource(dataListModel).delete(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify manager user is able to delete(delete tree) contact data list with items in it") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void managerCanDeleteTreeContactDataListWithItems() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:contact"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:contactFirstName", "John"); - DataListItemModel contactItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo() - .then().usingResource(dataListModel) - .deleteFolderTree().assertThat().doesNotExistInRepo() - .and().usingResource(contactItem).assertThat().doesNotExistInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify collaborator user is not able to delete(delete tree) contact data list with items in it created by manager") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void collaboratorCannotDeleteTreeContactDataListWithItems() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:contact"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:contactFirstName", "John"); - DataListItemModel contactItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo() - .then().authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator)) - .usingResource(dataListModel) - .deleteFolderTree().assertThat() - .hasFailedDeletedObject(dataListModel.getNodeRef()) - .and().assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify contributor user is not able to delete(delete tree) contact data list with items in it created by manager") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void contributorCannotDeleteTreeContactDataListWithItems() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:contact"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:contactFirstName", "John"); - DataListItemModel contactItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo() - .then().authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor)) - .usingResource(dataListModel) - .deleteFolderTree().assertThat() - .hasFailedDeletedObject(dataListModel.getNodeRef()) - .and().assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify consumer user is not able to delete(delete tree) contact data list with items in it created by manager") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void consumerCannotDeleteTreeContactDataListWithItems() throws Exception - { - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:contact"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:contactFirstName", "John"); - DataListItemModel contactItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo() - .then().authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer)) - .usingResource(dataListModel) - .deleteFolderTree().assertThat() - .hasFailedDeletedObject(dataListModel.getNodeRef()) - .and().assertThat().existsInRepo(); - } - - @TestRail(section = {"cmis-api"}, executionType= ExecutionType.REGRESSION, - description = "Verify non invited user is not able to delete(delete tree) contact data list with items in it created by manager") - @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS, TestGroup.REQUIRE_SHARE}) - public void nonInvitedUserCannotDeleteTreeContactDataListWithItems() throws Exception - { - UserModel nonInvited = dataUser.createRandomTestUser(); - Map itemProperties = new HashMap(); - itemProperties.put(PropertyIds.OBJECT_TYPE_ID, "D:dl:contact"); - itemProperties.put(PropertyIds.NAME, RandomData.getRandomAlphanumeric()); - itemProperties.put("dl:contactFirstName", "John"); - DataListItemModel contactItem = new DataListItemModel(itemProperties); - - dataListModel = DataListModel.getRandomDataListModel("dl:contact"); - cmisApi.authenticateUser(manager).usingSite(testSite) - .then().createDataList(dataListModel).and().assertThat().existsInRepo() - .then().usingResource(dataListModel) - .createDataListItem(contactItem).assertThat().existsInRepo() - .then().authenticateUser(nonInvited) - .usingResource(dataListModel) - .deleteFolderTree().assertThat() - .hasFailedDeletedObject(dataListModel.getNodeRef()) - .and().assertThat().existsInRepo(); - } -} diff --git a/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/UpdatePropertiesTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/UpdatePropertiesTests.java index da87ca47f61..2e137a6e639 100644 --- a/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/UpdatePropertiesTests.java +++ b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/UpdatePropertiesTests.java @@ -99,7 +99,7 @@ public void siteManagerCannotUpdateFileWithInvalidProperty() throws Exception .createFile(testFile).assertThat().existsInRepo() .then().updateProperty("cmis:fakeProp", propertyNameValue); } - + @TestRail(section = {"cmis-api"}, executionType = ExecutionType.REGRESSION, description = "Verify that deleted user is not able to update properties with CMIS") @Test(groups = { TestGroup.REGRESSION, TestGroup.CMIS}, expectedExceptions=CmisUnauthorizedException.class) @@ -113,6 +113,10 @@ public void deletedUserCannotUpdateFileProperties() throws Exception .usingResource(shared) .createFile(testFile).and().assertThat().existsInRepo(); dataUser.deleteUser(toBeDeleted); + // Token will still be valid right after this call + // Just wait for it to expire + Thread.sleep(120 * 1000); + cmisApi.updateProperty("cmis:name", propertyNameValue); } diff --git a/packaging/tests/tas-cmis/src/test/resources/alfresco-cmis-context.xml b/packaging/tests/tas-cmis/src/test/resources/alfresco-cmis-context.xml index ecf3d2db4b2..c86884fa8e3 100644 --- a/packaging/tests/tas-cmis/src/test/resources/alfresco-cmis-context.xml +++ b/packaging/tests/tas-cmis/src/test/resources/alfresco-cmis-context.xml @@ -2,15 +2,14 @@ + http://www.springframework.org/schema/beans/spring-beans.xsd"> - diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index e6ea84e0fbf..4aa4a3b8fd7 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -2,17 +2,15 @@ 4.0.0 org.alfresco.tas - content-repository-community-email-test - content-repository-community-email-test - 6.2.2-SNAPSHOT + alfresco-community-repo-email-test + email test jar org.alfresco - content-repository-community-tas-tests-parent - 6.2.2-SNAPSHOT - ../pom.xml - + alfresco-community-repo-tests + 8.300-SNAPSHOT + diff --git a/packaging/tests/tas-email/src/test/resources/alfresco-email-context.xml b/packaging/tests/tas-email/src/test/resources/alfresco-email-context.xml index d6a5817e9c4..a67948e636c 100644 --- a/packaging/tests/tas-email/src/test/resources/alfresco-email-context.xml +++ b/packaging/tests/tas-email/src/test/resources/alfresco-email-context.xml @@ -2,13 +2,12 @@ + http://www.springframework.org/schema/beans/spring-beans.xsd"> - \ No newline at end of file diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 5eaa878833d..5880dce347d 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -2,17 +2,15 @@ 4.0.0 org.alfresco.tas - content-repository-community-integration-test - content-repository-community-integration-test - 6.2.2-SNAPSHOT + alfresco-community-repo-integration-test + integration test jar org.alfresco - content-repository-community-tas-tests-parent - 6.2.2-SNAPSHOT - ../pom.xml - + alfresco-community-repo-tests + 8.300-SNAPSHOT + diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 6096e82274d..f71fd2fb0ec 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -2,17 +2,15 @@ 4.0.0 org.alfresco.tas - content-repository-community-restapi-test - content-repository-community-restapi-test - 6.2.2-SNAPSHOT + alfresco-community-repo-restapi-test + restapi test jar org.alfresco - content-repository-community-tas-tests-parent - 6.2.2-SNAPSHOT - ../pom.xml - + alfresco-community-repo-tests + 8.300-SNAPSHOT + diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 1ff8428754e..db1b73dc48e 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -2,17 +2,15 @@ 4.0.0 org.alfresco.tas - content-repository-community-webdav-test - content-repository-community-webdav-test - 6.2.2-SNAPSHOT + alfresco-community-repo-webdav-test + webdav test jar org.alfresco - content-repository-community-tas-tests-parent - 6.2.2-SNAPSHOT - ../pom.xml - + alfresco-community-repo-tests + 8.300-SNAPSHOT + diff --git a/packaging/tests/tas-webdav/src/test/resources/alfresco-webdav-context.xml b/packaging/tests/tas-webdav/src/test/resources/alfresco-webdav-context.xml index f9e3b248ab5..9e9610c4005 100644 --- a/packaging/tests/tas-webdav/src/test/resources/alfresco-webdav-context.xml +++ b/packaging/tests/tas-webdav/src/test/resources/alfresco-webdav-context.xml @@ -2,14 +2,13 @@ + http://www.springframework.org/schema/beans/spring-beans.xsd"> - \ No newline at end of file diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9e63711f4c1..a26e5bd0eea 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -6,10 +6,9 @@ org.alfresco - acs-community-packaging - 6.2.2-SNAPSHOT - ../pom.xml - + alfresco-community-repo-packaging + 8.300-SNAPSHOT + local/development/workspace @@ -42,7 +41,6 @@ commons-logging commons-logging - 1.2 org.apache.avalon.framework @@ -73,7 +71,6 @@ javax.servlet javax.servlet-api - 3.0.1 provided @@ -99,18 +96,15 @@ commons-lang commons-lang - 2.6 org.springframework spring-test - ${dependency.spring.version} test org.mockito mockito-core - 3.3.3 test @@ -122,13 +116,11 @@ org.postgresql postgresql - ${dependency.postgresql.version} test mysql mysql-connector-java - ${dependency.mysql.version} test @@ -169,25 +161,6 @@ 8 - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.1.0 - - - validate - - parse-version - - - - maven-dependency-plugin diff --git a/packaging/war/src/main/resources/alfresco/version.properties b/packaging/war/src/main/resources/alfresco/version.properties index 39f1117e9aa..249ced4b9dc 100644 --- a/packaging/war/src/main/resources/alfresco/version.properties +++ b/packaging/war/src/main/resources/alfresco/version.properties @@ -4,9 +4,9 @@ # Version label -version.major=@parsedVersion.majorVersion@ -version.minor=@parsedVersion.minorVersion@ -version.revision=@parsedVersion.incrementalVersion@ +version.major=@acs.version.major@ +version.minor=@acs.version.minor@ +version.revision=@acs.version.revision@ version.label= # Edition label diff --git a/remote-api/.gitbugtraq b/remote-api/.gitbugtraq deleted file mode 100644 index bacffb702d6..00000000000 --- a/remote-api/.gitbugtraq +++ /dev/null @@ -1,4 +0,0 @@ -# For SmartGit -[bugtraq "jira"] - url = https://issues.alfresco.com/jira/browse/%BUGID% - logRegex = ([A-Z]+-\\d+) diff --git a/remote-api/.gitignore b/remote-api/.gitignore deleted file mode 100644 index 756a7325d22..00000000000 --- a/remote-api/.gitignore +++ /dev/null @@ -1,39 +0,0 @@ -*.class - -# Eclipse -.classpath -.settings -.project - -# Intellij -.idea/ -*.iml -*.iws - -# Mac -.DS_Store - -# Maven -target -*.log -*.log.* - -# Mobile Tools for Java (J2ME) - -.mtj -.tmp/ - -# Package Files # - -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml - -hs_err_pid* - -# Development -alf_data/ -/src/main/resources/alfresco-global.properties -/src/main/resources/alfresco/extension/custom-log4j.properties \ No newline at end of file diff --git a/remote-api/.travis.settings.xml b/remote-api/.travis.settings.xml deleted file mode 100644 index e8f11969355..00000000000 --- a/remote-api/.travis.settings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - alfresco-public - ${env.MAVEN_USERNAME} - ${env.MAVEN_PASSWORD} - - - diff --git a/remote-api/.travis.yml b/remote-api/.travis.yml index f2a014b7cd4..e69de29bb2d 100644 --- a/remote-api/.travis.yml +++ b/remote-api/.travis.yml @@ -1,65 +0,0 @@ -dist: xenial -sudo: required -language: java -jdk: - - openjdk11 -services: - - docker - -cache: - directories: - - $HOME/.m2 -# the cache can grow constantly -before_cache: - - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-remote-api - - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-repository - -branches: - only: - - master - - /support\/.*/ - - /feature\/.*/ - -stages: - - test - - release - -before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - -install: travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V - -jobs: - include: - - stage: test - name: "WhiteSource scan" - # only on support branches or master and if it is not a PR - if: fork = false AND (branch = master OR branch =~ /support\/SP\/.*/) AND type != pull_request - script: - # Download the latest version of WhiteSource Unified Agent - - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar - # Run WhiteSource Unified Agent - - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config - - name: "AppContext01TestSuite" - script: travis_wait 20 mvn test -B -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "AppContext02TestSuite" - script: travis_wait 20 mvn test -B -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "AppContext03TestSuite" - script: travis_wait 20 mvn test -B -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "AppContext04TestSuite" - script: travis_wait 20 mvn test -B -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "AppContextExtraTestSuite" - script: travis_wait 20 mvn test -B -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - stage: release - name: "Push to Nexus" - if: fork = false AND (branch = master OR branch =~ /support\/.*/) AND type != pull_request AND commit_message !~ /\[no-release\]/ - before_install: - - "cp .travis.settings.xml $HOME/.m2/settings.xml" - script: - # Use full history for release - - git checkout -B "${TRAVIS_BRANCH}" - # Add email to link commits to user - - git config user.email "${GIT_EMAIL}" - # Skip building of release commits - - mvn --batch-mode -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform diff --git a/remote-api/.whitesource b/remote-api/.whitesource deleted file mode 100644 index f0569521415..00000000000 --- a/remote-api/.whitesource +++ /dev/null @@ -1,8 +0,0 @@ -{ - "generalSettings": { - "shouldScanRepo": true - }, - "checkRunSettings": { - "vulnerableCheckRunConclusionLevel": "failure" - } -} \ No newline at end of file diff --git a/remote-api/.wss-unified-agent.config b/remote-api/.wss-unified-agent.config deleted file mode 100644 index 4dbb9c72bd2..00000000000 --- a/remote-api/.wss-unified-agent.config +++ /dev/null @@ -1,228 +0,0 @@ -#################################################################### -# WhiteSource Unified-Agent configuration file -#################################################################### -########################################## -# GENERAL SCAN MODE: Files and Package Managers -########################################## - -checkPolicies=true -forceCheckAllDependencies=true -forceUpdate=true -forceUpdate.failBuildOnPolicyViolation=true -offline=false -#ignoreSourceFiles=true -#scanComment= -#updateInventory=false -#resolveAllDependencies=false -#failErrorLevel=ALL -#requireKnownSha1=false -#generateScanReport=true -#scanReportTimeoutMinutes=10 -#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model - -#projectPerFolder=true -#projectPerFolderIncludes= -#projectPerFolderExcludes= - -#wss.connectionTimeoutMinutes=60 -# Change the below URL to your WhiteSource server. -# Use the 'WhiteSource Server URL' which can be retrieved -# from your 'Profile' page on the 'Server URLs' panel. -# Then, add the '/agent' path to it. -wss.url=https://saas.whitesourcesoftware.com/agent - -#npm.resolveDependencies=false -#npm.ignoreSourceFiles=false -#npm.includeDevDependencies=true -#npm.runPreStep=true -#npm.ignoreNpmLsErrors=true -#npm.ignoreScripts=true -#npm.yarnProject=true -#npm.accessToken= -#npm.identifyByNameAndVersion=true - -#bower.resolveDependencies=false -#bower.ignoreSourceFiles=true -#bower.runPreStep=true - -#nuget.resolvePackagesConfigFiles=false -#nuget.resolveCsProjFiles=false -#nuget.resolveDependencies=false -#nuget.restoreDependencies=true -#nuget.ignoreSourceFiles=true -#nuget.runPreStep=true -#nuget.resolveNuspecFiles=false - -#python.resolveDependencies=false -#python.ignoreSourceFiles=false -#python.ignorePipInstallErrors=true -#python.installVirtualenv=true -#python.resolveHierarchyTree=false -#python.requirementsFileIncludes=requirements.txt -#python.resolveSetupPyFiles=true -#python.runPipenvPreStep=true -#python.pipenvDevDependencies=true -#python.IgnorePipenvInstallErrors=true - -#maven.ignoredScopes=test provided -maven.resolveDependencies=true -#maven.ignoreSourceFiles=true -#maven.aggregateModules=true -maven.ignorePomModules=false -#maven.runPreStep=true -#maven.ignoreMvnTreeErrors=true -#maven.environmentPath= -#maven.m2RepositoryPath= - -#gradle.ignoredScopes= -#gradle.resolveDependencies=false -#gradle.runAssembleCommand=false -#gradle.runPreStep=true -#gradle.ignoreSourceFiles=true -#gradle.aggregateModules=true -#gradle.preferredEnvironment=wrapper -#gradle.localRepositoryPath= - -#paket.resolveDependencies=false -#paket.ignoredGroups= -#paket.ignoreSourceFiles=false -#paket.runPreStep=true -#paket.exePath= - -#go.resolveDependencies=false -#go.collectDependenciesAtRuntime=true -#go.dependencyManager= -#go.ignoreSourceFiles=true -#go.glide.ignoreTestPackages=false -#go.gogradle.enableTaskAlias=true - -#ruby.resolveDependencies = false -#ruby.ignoreSourceFiles = false -#ruby.installMissingGems = true -#ruby.runBundleInstall = true -#ruby.overwriteGemFile = true - -#sbt.resolveDependencies=false -#sbt.ignoreSourceFiles=true -#sbt.aggregateModules=true -#sbt.runPreStep=true -#sbt.targetFolder= - -#php.resolveDependencies=false -#php.runPreStep=true -#php.includeDevDependencies=true - -#html.resolveDependencies=false - -#cocoapods.resolveDependencies=false -#cocoapods.runPreStep=true -#cocoapods.ignoreSourceFiles=false - -#hex.resolveDependencies=false -#hex.runPreStep=true -#hex.ignoreSourceFiles=false -#hex.aggregateModules=true - -################################## -# Organization tokens: -################################## -apiKey= - -#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option -#userKey= - -projectName=alfresco-remote-api -projectVersion= -projectToken= - -productName=ACS Community -productVersion= -productToken= -#updateType=APPEND -#requesterEmail=user@provider.com - -######################################################################################### -# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE -######################################################################################### -#includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx - -#includes=**/*.m **/*.mm **/*.js **/*.php -includes=**/*.jar -#includes=**/*.gem **/*.rb -#includes=**/*.dll **/*.cs **/*.nupkg -#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2 -#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py - -## Exclude file extensions or specific directories by adding **/*. or **/** -excludes=**/*sources.jar **/*javadoc.jar - -case.sensitive.glob=false -followSymbolicLinks=true - -################################## -# Archive properties -################################## -#archiveExtractionDepth=2 -#archiveIncludes=**/*.war **/*.ear -#archiveExcludes=**/*sources.jar - -################################## -# Proxy settings -################################## -#proxy.host= -#proxy.port= -#proxy.user= -#proxy.pass= - -################################## -# SCM settings -################################## -#scm.type= -#scm.user= -#scm.pass= -#scm.ppk= -#scm.url= -#scm.branch= -#scm.tag= -#scm.npmInstall= -#scm.npmInstallTimeoutMinutes= -#scm.repositoriesFile= - -############################################## -# SCAN MODE: Linux package manager settings -############################################## -#scanPackageManager=true - -################################## -# SCAN MODE: Docker images -################################## -#docker.scanImages=true -#docker.includes=.*.* -#docker.excludes= -#docker.pull.enable=true -#docker.pull.images=.*.* -#docker.pull.maxImages=10 -#docker.pull.tags=.*.* -#docker.pull.digest= -#docker.delete.force=true -#docker.login.sudo=false - -#docker.aws.enable=true -#docker.aws.registryIds= - -################################## -# SCAN MODE: Docker containers -################################## -#docker.scanContainers=true -#docker.containerIncludes=.*.* -#docker.containerExcludes= - -################################ -# Serverless settings -################################ -#serverless.provider= -#serverless.scanFunctions=true -#serverless.includes= -#serverless.excludes= -#serverless.region= -#serverless.maxFunctions=10 diff --git a/remote-api/CONTRIBUTING.md b/remote-api/CONTRIBUTING.md deleted file mode 100644 index 8d059e27ca0..00000000000 --- a/remote-api/CONTRIBUTING.md +++ /dev/null @@ -1,16 +0,0 @@ -### Contributing -Thanks for your interest in contributing to this project! - -The following is a set of guidelines for contributing to this library. Most of them will make the life of the reviewer easier and therefore decrease the time required for the patch be included in the next version. - -Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](http://community.alfresco.com/community/ecm) where they can be referenced from multiple projects. - -Read an [overview on how this project is goverened](https://community.alfresco.com/docs/DOC-6385-project-overview-repository). - -You can report an issue in the ALF project of the [Alfresco issue tracker](http://issues.alfresco.com). - -Read [instructions for a good issue report](https://community.alfresco.com/docs/DOC-6263-reporting-an-issue). - -Read [instructions for making a contribution](https://community.alfresco.com/docs/DOC-6269-submitting-contributions). - -Please follow [the coding standards](https://community.alfresco.com/docs/DOC-4658-coding-standards). diff --git a/remote-api/LICENSE b/remote-api/LICENSE deleted file mode 100644 index 65c5ca88a67..00000000000 --- a/remote-api/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 4a02dbaae00..9fc6ce1511f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -2,14 +2,13 @@ 4.0.0 alfresco-remote-api Alfresco Remote API - 8.213-SNAPSHOT jar org.alfresco - alfresco-super-pom - 12 - + alfresco-community-repo + 8.300-SNAPSHOT + scm:git:https://github.com/Alfresco/alfresco-remote-api.git @@ -32,112 +31,20 @@ community - 11 - ${project.build.directory}/alf_data convert - 8.243 - 8.135 - 8.37 - - 1.1 - 2.11.1 - 2.10.1 - - 8.5 1.0.0 - 5.2.7.RELEASE - 42.2.14 - 3.3.7 - - - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-rs-client - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-ws-policy - ${dependency.cxf.version} - - - - com.github.junrar - junrar - 4.0.0 - - - - org.jsoup - jsoup - 1.13.1 - - - - commons-httpclient - commons-httpclient - 3.1-HTTPCLIENT-1265 - - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${dependency.jackson.version} - - - commons-logging - commons-logging - 1.2 - - - org.apache.httpcomponents - httpclient - 4.5.12 - - - org.apache.httpcomponents - httpcore - 4.4.13 - - - - org.springframework - spring-jms - ${dependency.spring.version} - - - - org.alfresco alfresco-repository - ${dependency.alfresco-repository.version} org.alfresco alfresco-data-model - ${dependency.alfresco-data-model.version} @@ -169,28 +76,23 @@ com.fasterxml.jackson.core jackson-core - ${dependency.jackson.version} com.fasterxml.jackson.core jackson-databind - ${dependency.jackson-databind.version} com.fasterxml.jackson.core jackson-annotations - ${dependency.jackson.version} javax.servlet javax.servlet-api - 3.0.1 provided org.apache.commons commons-csv - 1.8 org.apache.santuario @@ -201,7 +103,6 @@ org.alfresco.surf spring-webscripts - ${dependency.webscripts.version} javax.xml @@ -240,32 +141,27 @@ junit junit - 4.13 test org.mockito mockito-core - 3.4.2 test org.springframework spring-test - ${dependency.spring.version} test org.alfresco alfresco-repository - ${dependency.alfresco-repository.version} tests test org.alfresco alfresco-core - ${dependency.alfresco-core.version} tests test @@ -284,14 +180,12 @@ org.alfresco.surf spring-webscripts - ${dependency.webscripts.version} tests test org.postgresql postgresql - ${dependency.postgresql.version} test diff --git a/repository/.gitbugtraq b/repository/.gitbugtraq deleted file mode 100644 index bacffb702d6..00000000000 --- a/repository/.gitbugtraq +++ /dev/null @@ -1,4 +0,0 @@ -# For SmartGit -[bugtraq "jira"] - url = https://issues.alfresco.com/jira/browse/%BUGID% - logRegex = ([A-Z]+-\\d+) diff --git a/repository/.gitignore b/repository/.gitignore deleted file mode 100644 index 1578e425e01..00000000000 --- a/repository/.gitignore +++ /dev/null @@ -1,40 +0,0 @@ -*.class - -# Eclipse -.classpath -.settings -.project - -# Intellij -.idea/ -*.iml -*.iws - -#VSCode -/.vscode - -# Mac -.DS_Store - -# Maven -target -*.log -*.log.* - -# Mobile Tools for Java (J2ME) - -.mtj -.tmp/ - -# Package Files # - -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml - -hs_err_pid* -alf_data -/src/main/resources/alfresco-global.properties -/src/main/resources/alfresco/extension/custom-log4j.properties diff --git a/repository/.travis.settings.xml b/repository/.travis.settings.xml deleted file mode 100644 index 7eecd77df22..00000000000 --- a/repository/.travis.settings.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - alfresco-public - ${env.MAVEN_USERNAME} - ${env.MAVEN_PASSWORD} - - - quay.io - ${env.QUAY_USERNAME} - ${env.QUAY_PASSWORD} - - - diff --git a/repository/.travis.yml b/repository/.travis.yml index b3cc8154f83..e69de29bb2d 100644 --- a/repository/.travis.yml +++ b/repository/.travis.yml @@ -1,122 +0,0 @@ -dist: xenial -sudo: required -language: java -jdk: - - openjdk11 - -services: - - docker - -cache: - directories: - - $HOME/.m2 -# the cache can grow constantly -before_cache: - - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-repository - -branches: - only: - - master - - /support\/.*/ - -stages: - - test - - release - -install: travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V - -jobs: - include: - - stage: test - name: "AllUnitTestsSuite" - script: mvn test -B -Dtest=AllUnitTestsSuite - - name: "WhiteSource scan" - # only on support branches or master and if it is not a PR - if: fork = false AND (branch = master OR branch =~ /support\/SP\/.*/) AND type != pull_request - script: - # Download the latest version of WhiteSource Unified Agent - - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar - # Run WhiteSource Unified Agent - - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config - - name: "AppContext01TestSuite" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - script: travis_wait 20 mvn test -B -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "AppContext02TestSuite" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - script: travis_wait 20 mvn test -B -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "AppContext03TestSuite" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.3.2 - script: travis_wait 20 mvn test -B -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dalfresco-pdf-renderer.url=http://localhost:8090/ -Djodconverter.url=http://localhost:8090/ -Dimg.url=http://localhost:8090/ -Dtika.url=http://localhost:8090/ -Dtransform.misc.url=http://localhost:8090/ - - name: "AppContext04TestSuite" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.3.2 - script: travis_wait 20 mvn test -B -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "AppContext05TestSuite" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - - "mkdir -p $HOME/tmp" - - "cp src/test/resources/realms/alfresco-realm.json $HOME/tmp" - - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} - - "export HOST_IP=$(ip address show | grep -E \"([0-9]{1,3}\\.){3}[0-9]{1,3}\" | grep -v 127.0.0.1 | awk '{ print $2 }' | head -n 1 )" - - "export HOST_IP=$(echo ${HOST_IP%/*})" - - docker run -d -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -e DB_VENDOR=h2 -p 8999:8080 -e KEYCLOAK_IMPORT=/tmp/alfresco-realm.json -v $HOME/tmp/alfresco-realm.json:/tmp/alfresco-realm.json quay.io/alfresco/alfresco-identity-service:1.2 - script: travis_wait 20 mvn test -B -Dtest=AppContext05TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "-Didentity-service.auth-server-url=http://${HOST_IP}:8999/auth" - - name: "AppContext06TestSuite" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.3.2 - script: travis_wait 20 mvn test -B -Dtest=AppContext06TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dalfresco-pdf-renderer.url=http://localhost:8090/ -Djodconverter.url=http://localhost:8090/ -Dimg.url=http://localhost:8090/ -Dtika.url=http://localhost:8090/ -Dtransform.misc.url=http://localhost:8090/ - - name: "AppContextExtraTestSuite" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - script: travis_wait 20 mvn test -B -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "MiscContextTestSuite" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.3.2 - script: travis_wait 20 mvn test -B -Dtest=MiscContextTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dalfresco-pdf-renderer.url=http://localhost:8090/ -Djodconverter.url=http://localhost:8090/ -Dimg.url=http://localhost:8090/ -Dtika.url=http://localhost:8090/ -Dtransform.misc.url=http://localhost:8090/ - - name: "MySQL tests" - before_install: - - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mysql:5.7.23 --transaction-isolation='READ-COMMITTED' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - script: travis_wait 20 mvn test -B -Dtest=AllDBTestsTestSuite -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "PostgreSQL 10 tests" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.9 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - script: travis_wait 20 mvn test -B -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "PostgreSQL 11 tests" - before_install: - - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - script: travis_wait 20 mvn test -B -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - - name: "MariaDB tests" - before_install: - - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.2.18 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci - - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 - script: travis_wait 20 mvn test -B -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver - - stage: release - name: "Push to Nexus" - if: fork = false AND (branch = master OR branch =~ /support\/.*/) AND type != pull_request AND commit_message !~ /\[no-release\]/ - before_install: - - "cp .travis.settings.xml $HOME/.m2/settings.xml" - script: - # Use full history for release - - git checkout -B "${TRAVIS_BRANCH}" - # Add email to link commits to user - - git config user.email "${GIT_EMAIL}" - # Skip building of release commits - - mvn --batch-mode -q -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform diff --git a/repository/.whitesource b/repository/.whitesource deleted file mode 100644 index f0569521415..00000000000 --- a/repository/.whitesource +++ /dev/null @@ -1,8 +0,0 @@ -{ - "generalSettings": { - "shouldScanRepo": true - }, - "checkRunSettings": { - "vulnerableCheckRunConclusionLevel": "failure" - } -} \ No newline at end of file diff --git a/repository/.wss-unified-agent.config b/repository/.wss-unified-agent.config deleted file mode 100644 index 9ad2a439eef..00000000000 --- a/repository/.wss-unified-agent.config +++ /dev/null @@ -1,228 +0,0 @@ -#################################################################### -# WhiteSource Unified-Agent configuration file -#################################################################### -########################################## -# GENERAL SCAN MODE: Files and Package Managers -########################################## - -checkPolicies=true -forceCheckAllDependencies=true -forceUpdate=true -forceUpdate.failBuildOnPolicyViolation=true -offline=false -#ignoreSourceFiles=true -#scanComment= -#updateInventory=false -#resolveAllDependencies=false -#failErrorLevel=ALL -#requireKnownSha1=false -#generateScanReport=true -#scanReportTimeoutMinutes=10 -#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model - -#projectPerFolder=true -#projectPerFolderIncludes= -#projectPerFolderExcludes= - -#wss.connectionTimeoutMinutes=60 -# Change the below URL to your WhiteSource server. -# Use the 'WhiteSource Server URL' which can be retrieved -# from your 'Profile' page on the 'Server URLs' panel. -# Then, add the '/agent' path to it. -wss.url=https://saas.whitesourcesoftware.com/agent - -#npm.resolveDependencies=false -#npm.ignoreSourceFiles=false -#npm.includeDevDependencies=true -#npm.runPreStep=true -#npm.ignoreNpmLsErrors=true -#npm.ignoreScripts=true -#npm.yarnProject=true -#npm.accessToken= -#npm.identifyByNameAndVersion=true - -#bower.resolveDependencies=false -#bower.ignoreSourceFiles=true -#bower.runPreStep=true - -#nuget.resolvePackagesConfigFiles=false -#nuget.resolveCsProjFiles=false -#nuget.resolveDependencies=false -#nuget.restoreDependencies=true -#nuget.ignoreSourceFiles=true -#nuget.runPreStep=true -#nuget.resolveNuspecFiles=false - -#python.resolveDependencies=false -#python.ignoreSourceFiles=false -#python.ignorePipInstallErrors=true -#python.installVirtualenv=true -#python.resolveHierarchyTree=false -#python.requirementsFileIncludes=requirements.txt -#python.resolveSetupPyFiles=true -#python.runPipenvPreStep=true -#python.pipenvDevDependencies=true -#python.IgnorePipenvInstallErrors=true - -#maven.ignoredScopes=test provided -maven.resolveDependencies=true -#maven.ignoreSourceFiles=true -#maven.aggregateModules=true -maven.ignorePomModules=false -#maven.runPreStep=true -#maven.ignoreMvnTreeErrors=true -#maven.environmentPath= -#maven.m2RepositoryPath= - -#gradle.ignoredScopes= -#gradle.resolveDependencies=false -#gradle.runAssembleCommand=false -#gradle.runPreStep=true -#gradle.ignoreSourceFiles=true -#gradle.aggregateModules=true -#gradle.preferredEnvironment=wrapper -#gradle.localRepositoryPath= - -#paket.resolveDependencies=false -#paket.ignoredGroups= -#paket.ignoreSourceFiles=false -#paket.runPreStep=true -#paket.exePath= - -#go.resolveDependencies=false -#go.collectDependenciesAtRuntime=true -#go.dependencyManager= -#go.ignoreSourceFiles=true -#go.glide.ignoreTestPackages=false -#go.gogradle.enableTaskAlias=true - -#ruby.resolveDependencies = false -#ruby.ignoreSourceFiles = false -#ruby.installMissingGems = true -#ruby.runBundleInstall = true -#ruby.overwriteGemFile = true - -#sbt.resolveDependencies=false -#sbt.ignoreSourceFiles=true -#sbt.aggregateModules=true -#sbt.runPreStep=true -#sbt.targetFolder= - -#php.resolveDependencies=false -#php.runPreStep=true -#php.includeDevDependencies=true - -#html.resolveDependencies=false - -#cocoapods.resolveDependencies=false -#cocoapods.runPreStep=true -#cocoapods.ignoreSourceFiles=false - -#hex.resolveDependencies=false -#hex.runPreStep=true -#hex.ignoreSourceFiles=false -#hex.aggregateModules=true - -################################## -# Organization tokens: -################################## -apiKey= - -#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option -#userKey= - -projectName=alfresco-repository -projectVersion= -projectToken= - -productName=ACS Community -productVersion= -productToken= -#updateType=APPEND -#requesterEmail=user@provider.com - -######################################################################################### -# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE -######################################################################################### -#includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx - -#includes=**/*.m **/*.mm **/*.js **/*.php -includes=**/*.jar -#includes=**/*.gem **/*.rb -#includes=**/*.dll **/*.cs **/*.nupkg -#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2 -#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py - -## Exclude file extensions or specific directories by adding **/*. or **/** -excludes=**/*sources.jar **/*javadoc.jar - -case.sensitive.glob=false -followSymbolicLinks=true - -################################## -# Archive properties -################################## -#archiveExtractionDepth=2 -#archiveIncludes=**/*.war **/*.ear -#archiveExcludes=**/*sources.jar - -################################## -# Proxy settings -################################## -#proxy.host= -#proxy.port= -#proxy.user= -#proxy.pass= - -################################## -# SCM settings -################################## -#scm.type= -#scm.user= -#scm.pass= -#scm.ppk= -#scm.url= -#scm.branch= -#scm.tag= -#scm.npmInstall= -#scm.npmInstallTimeoutMinutes= -#scm.repositoriesFile= - -############################################## -# SCAN MODE: Linux package manager settings -############################################## -#scanPackageManager=true - -################################## -# SCAN MODE: Docker images -################################## -#docker.scanImages=true -#docker.includes=.*.* -#docker.excludes= -#docker.pull.enable=true -#docker.pull.images=.*.* -#docker.pull.maxImages=10 -#docker.pull.tags=.*.* -#docker.pull.digest= -#docker.delete.force=true -#docker.login.sudo=false - -#docker.aws.enable=true -#docker.aws.registryIds= - -################################## -# SCAN MODE: Docker containers -################################## -#docker.scanContainers=true -#docker.containerIncludes=.*.* -#docker.containerExcludes= - -################################ -# Serverless settings -################################ -#serverless.provider= -#serverless.scanFunctions=true -#serverless.includes= -#serverless.excludes= -#serverless.region= -#serverless.maxFunctions=10 diff --git a/repository/CONTRIBUTING.md b/repository/CONTRIBUTING.md deleted file mode 100644 index 8d059e27ca0..00000000000 --- a/repository/CONTRIBUTING.md +++ /dev/null @@ -1,16 +0,0 @@ -### Contributing -Thanks for your interest in contributing to this project! - -The following is a set of guidelines for contributing to this library. Most of them will make the life of the reviewer easier and therefore decrease the time required for the patch be included in the next version. - -Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](http://community.alfresco.com/community/ecm) where they can be referenced from multiple projects. - -Read an [overview on how this project is goverened](https://community.alfresco.com/docs/DOC-6385-project-overview-repository). - -You can report an issue in the ALF project of the [Alfresco issue tracker](http://issues.alfresco.com). - -Read [instructions for a good issue report](https://community.alfresco.com/docs/DOC-6263-reporting-an-issue). - -Read [instructions for making a contribution](https://community.alfresco.com/docs/DOC-6269-submitting-contributions). - -Please follow [the coding standards](https://community.alfresco.com/docs/DOC-4658-coding-standards). diff --git a/repository/LICENSE b/repository/LICENSE deleted file mode 100644 index 65c5ca88a67..00000000000 --- a/repository/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/repository/pom.xml b/repository/pom.xml index 29fad8fbea8..a9f4442c817 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -2,13 +2,13 @@ 4.0.0 alfresco-repository Alfresco Repository - 8.249-SNAPSHOT jar + org.alfresco - alfresco-super-pom - 12 - + alfresco-community-repo + 8.300-SNAPSHOT + scm:git:https://github.com/Alfresco/alfresco-repository.git @@ -34,132 +34,28 @@ ${project.build.directory}/alf_data convert - 11 - - 8.136 - 8.38 - 6.2 6.2 - 7.1 - 1.1 1.0.12 1.0.2.10 - 5.2.6.RELEASE 5.2.1.RELEASE 4.5.10 7.7.10 4.1.2 1.4 - 8.5 - 1.0.0 5.23.0 5.23.0 - 42.2.14 - 8.0.21 - 2.6.1 - 3.5.2 11.0.0-alfresco-001 3.4.1.Final 2.24.2 5.15.12 - 2.0.20 - 3.3.7 - 2.11.1 - 2.10.2 1.2.5 0.0.8 4.0.3 - - - - org.apache.commons - commons-email - 1.5 - - - - com.github.junrar - junrar - 4.0.0 - - - - org.jsoup - jsoup - 1.13.1 - - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-rs-client - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${dependency.cxf.version} - - - org.apache.cxf - cxf-rt-ws-policy - ${dependency.cxf.version} - - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${dependency.jackson.version} - - - - com.fasterxml.jackson.core - jackson-core - ${dependency.jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${dependency.jackson.version} - - - org.apache.httpcomponents - httpclient - 4.5.12 - - - org.apache.httpcomponents - httpcore - 4.4.13 - - - org.apache.commons - commons-csv - 1.8 - - - - org.springframework - spring-jms - ${dependency.spring.version} - - - - org.alfresco @@ -180,7 +76,6 @@ org.alfresco alfresco-core - ${dependency.alfresco-core.version} @@ -231,17 +126,14 @@ commons-dbcp commons-dbcp - 1.4-DBCP330 commons-fileupload commons-fileupload - 1.4 org.apache.commons commons-compress - 1.19 org.apache.commons @@ -251,22 +143,18 @@ commons-codec commons-codec - 1.14 commons-beanutils commons-beanutils - 1.9.4 commons-collections commons-collections - 3.2.2 commons-io commons-io - 2.7 commons-pool @@ -281,7 +169,6 @@ org.json json - 20090211 com.ibm.icu @@ -307,7 +194,6 @@ org.springframework spring-core - ${dependency.spring.version} @@ -320,7 +206,6 @@ org.springframework spring-orm - ${dependency.spring.version} @@ -333,17 +218,14 @@ org.springframework spring-context - ${dependency.spring.version} org.springframework spring-context-support - ${dependency.spring.version} org.springframework spring-web - ${dependency.spring.version} org.subethamail @@ -369,7 +251,6 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 de.schlichtherle.truezip @@ -412,17 +293,14 @@ org.slf4j slf4j-log4j12 - 1.7.30 xerces xercesImpl - 2.12.0-alfresco-patched-20191004 xalan xalan - 2.7.2-alfresco xml-apis @@ -442,7 +320,6 @@ org.apache.xmlbeans xmlbeans - 3.1.0 org.apache.pdfbox @@ -463,7 +340,6 @@ org.bouncycastle bcprov-jdk15on - 1.66 net.sf @@ -511,7 +387,6 @@ joda-time joda-time - 2.10.6 jaxen @@ -548,27 +423,23 @@ javax.servlet javax.servlet-api - 3.0.1 provided jakarta.transaction jakarta.transaction-api - 1.3.3 com.fasterxml.jackson.core jackson-databind - ${dependency.jackson-databind.version} org.alfresco.surf spring-surf-core-configservice - ${dependency.webscripts.version} org.alfresco.surf @@ -596,7 +467,6 @@ org.alfresco.surf spring-webscripts-api - ${dependency.webscripts.version} @@ -634,7 +504,6 @@ com.google.guava guava - 28.2-jre org.springframework.security @@ -650,7 +519,6 @@ org.quartz-scheduler quartz - 2.3.2 com.mchange @@ -1042,19 +910,16 @@ org.mockito mockito-core - 3.4.4 test org.springframework spring-test - ${dependency.spring.version} test junit junit - 4.13 test @@ -1067,7 +932,6 @@ org.alfresco alfresco-core - ${dependency.alfresco-core.version} tests test @@ -1086,7 +950,6 @@ org.alfresco alfresco-data-model - ${dependency.alfresco-data-model.version} tests test @@ -1105,7 +968,6 @@ org.alfresco alfresco-data-model - ${dependency.alfresco-data-model.version} @@ -1139,20 +1001,17 @@ org.postgresql postgresql - ${dependency.postgresql.version} test mysql mysql-connector-java - ${dependency.mysql.version} test org.mariadb.jdbc mariadb-java-client - ${dependency.mariadb.version} - test + test xmlunit @@ -1163,13 +1022,11 @@ org.antlr gunit - ${dependency.antlr.version} test org.alfresco.surf spring-webscripts - ${dependency.webscripts.version} tests test diff --git a/trigger-travis.sh b/trigger-travis.sh new file mode 100755 index 00000000000..c57e13014eb --- /dev/null +++ b/trigger-travis.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +USER=${1} +REPO=${2} +BRANCH=${3} + +body="{ +\"request\": { + \"branch\":\"${BRANCH}\" +}}" + +curl -s -X POST \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -H "Travis-API-Version: 3" \ + -H "Authorization: token ${TRAVIS_ACCESS_TOKEN}" \ + -d "${body}" \ + https://api.travis-ci.com/repo/${USER}%2F${REPO}/requests \ + | tee /tmp/travis-request-output.txt + +if grep -q '"@type": "error"' /tmp/travis-request-output.txt; then + exit 1 +fi +if grep -q 'access denied' /tmp/travis-request-output.txt; then + exit 1 +fi \ No newline at end of file