diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index b6e690d7c8e7..06cdfdf939b9 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -9,140 +9,129 @@ definitions: &setEnv export MAVEN_OPTS="-Xmx4096M" && export MAVEN_ARGS="-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS" steps: + - step: &install + runs-on: self.hosted + name: Install + size: 1x + clone: + depth: 2 + caches: + - gradle + - gradlewrapper + - maven + script: + - *setEnv + - mvn install -T 1C -B -P-assembly,pipeline $MAVEN_ARGS + artifacts: + - target/local-repo/** + - dspace-server-webapp/target/** + - dspace-api/target/** + - dspace-services/target/** + - dspace-oai/target/** + - step: &unit-test-code-checks runs-on: self.hosted name: unit-test-code-checks - size: 4x + size: 2x caches: + - gradle + - gradlewrapper - maven script: - *setEnv - - mvn -T 1C install -B -P-assembly -Dtest.argLine=-Xmx4096M -Pcoverage-report -DskipUnitTests=false -Pdspace-rest $MAVEN_ARGS + - cp -rf target/local-repo/** ~/.m2/repository/ + - mvn -T 1C test -B -pl dspace-api,dspace-server-webapp,dspace-services,dspace-oai -P-assembly -nsu -Dmaven.main.skip -DuseIncrementalCompilation=false -Dtest.argLine=-Xmx4096M -DskipUnitTests=false $MAVEN_ARGS artifacts: - dspace-api/target/surefire-reports/*-output.txt - - dspace-iiif/target/surefire-reports/*-output.txt - - dspace-oai/target/surefire-reports/*-output.txt - - dspace-rdf/target/surefire-reports/*-output.txt - - dspace-rest/target/surefire-reports/*-output.txt - dspace-server-webapp/target/surefire-reports/*-output.txt - dspace-services/target/surefire-reports/*-output.txt - - dspace-sword/target/surefire-reports/*-output.txt - - dspace-swordv2/target/surefire-reports/*-output.txt + - dspace-oai/target/surefire-reports/*-output.txt - dspace-api/target/failsafe-reports/*-output.txt - - dspace-iiif/target/failsafe-reports/*-output.txt - - dspace-oai/target/failsafe-reports/*-output.txt - - dspace-rdf/target/failsafe-reports/*-output.txt - - dspace-rest/target/failsafe-reports/*-output.txt - dspace-server-webapp/target/failsafe-reports/*-output.txt - dspace-services/target/failsafe-reports/*-output.txt - - dspace-sword/target/failsafe-reports/*-output.txt - - dspace-swordv2/target/failsafe-reports/*-output.txt + - dspace-oai/target/failsafe-reports/*-output.txt - - step: &integration-tests + - step: &integration-tests-dspace-api runs-on: self.hosted - name: integration-tests - size: 4x + name: integration-tests-dspace-api + size: 1x caches: - gradle - gradlewrapper - maven script: - *setEnv - #- ./dspace-api/src/test/data/dspaceFolder/bin/install_grobid.sh - - mvn -T 1C clean install -Dmaven.test.skip=true -DskipUnitTests=true -Pdspace-rest -DskipITs=true -DskipIntegrationTests=true -P !assembly -B $MAVEN_ARGS - - mvn test -pl dspace-iiif,dspace-oai,dspace-rdf,dspace-rest,dspace-server-webapp,dspace-services,dspace-sword,dspace-swordv2 -Dmaven.test.skip=false -DskipUnitTests=false -Pdspace-rest -DskipITs=false -Pdspace-rest -DskipIntegrationTests=false -B -Dsurefire.rerunFailingTestsCount=2 -Dtest.argLine=-Xmx4096M -DfailIfNoTests=false -Dtest=*IT,!Abstract*,!ItemImportIT,!GenericAuthorizationFeatureIT,!ItemRestRepositoryIT,!LeftTiltedRelationshipRestRepositoryIT,!RelationshipRestRepositoryIT,!StatisticsRestRepositoryIT,!WorkspaceItemRestRepositoryIT,!DiscoveryRestControllerIT,!PatchMetadataIT,!RightTiltedRelationshipRestRepositoryIT $MAVEN_ARGS + - cp -rf target/local-repo/** ~/.m2/repository/ + - mvn verify -pl dspace-api -nsu -Dmaven.main.skip -DuseIncrementalCompilation=true -DskipUnitTests=true -DskipIntegrationTests=false -B -Dsurefire.rerunFailingTestsCount=2 -Dtest.argLine=-Xmx4096M $MAVEN_ARGS artifacts: - - dspace-iiif/target/surefire-reports/*-output.txt - - dspace-oai/target/surefire-reports/*-output.txt - - dspace-rdf/target/surefire-reports/*-output.txt - - dspace-rest/target/surefire-reports/*-output.txt - - dspace-server-webapp/target/surefire-reports/*-output.txt - - dspace-services/target/surefire-reports/*-output.txt - - dspace-sword/target/surefire-reports/*-output.txt - - dspace-swordv2/target/surefire-reports/*-output.txt - - dspace-iiif/target/failsafe-reports/*-output.txt - - dspace-oai/target/failsafe-reports/*-output.txt - - dspace-rdf/target/failsafe-reports/*-output.txt - - dspace-rest/target/failsafe-reports/*-output.txt - - dspace-server-webapp/target/failsafe-reports/*-output.txt - - dspace-services/target/failsafe-reports/*-output.txt - - dspace-sword/target/failsafe-reports/*-output.txt - - dspace-swordv2/target/failsafe-reports/*-output.txt + - dspace-api/target/surefire-reports/*-output.txt + - dspace-api/target/failsafe-reports/*-output.txt - - step: &integration-tests-slow + - step: &integration-tests-with-test-jars runs-on: self.hosted - name: integration-tests-slow - size: 4x + name: integration-tests-with-test-jars + size: 1x caches: - gradle - gradlewrapper - maven script: - *setEnv - #- ./dspace-api/src/test/data/dspaceFolder/bin/install_grobid.sh - - mvn -T 1C clean install -Dmaven.test.skip=true -DskipUnitTests=true -Pdspace-rest -DskipITs=true -DskipIntegrationTests=true -P !assembly -B $MAVEN_ARGS - - mvn test -Dmaven.test.skip=false -DskipUnitTests=false -Pdspace-rest -DskipITs=false -Pdspace-rest -DskipIntegrationTests=false -B -Dsurefire.rerunFailingTestsCount=2 -Dtest.argLine=-Xmx4096M -DfailIfNoTests=false -Dtest=ItemImportIT,GenericAuthorizationFeatureIT,ItemRestRepositoryIT,LeftTiltedRelationshipRestRepositoryIT,RelationshipRestRepositoryIT,StatisticsRestRepositoryIT,WorkspaceItemRestRepositoryIT,DiscoveryRestControllerIT,PatchMetadataIT,RightTiltedRelationshipRestRepositoryIT $MAVEN_ARGS + - cp -rf target/local-repo/** ~/.m2/repository/ + - mvn verify -pl dspace-server-webapp -nsu -Dmaven.main.skip -DuseIncrementalCompilation=true -Dit.test=*IT,\!GenericAuthorizationFeatureIT,\!WorkspaceItemRestRepositoryIT,\!ItemImportIT,\!ItemRestRepositoryIT,\!LeftTiltedRelationshipRestRepositoryIT,\!RelationshipRestRepositoryIT,\!StatisticsRestRepositoryIT,\!DiscoveryRestControllerIT,\!PatchMetadataIT,\!VersionRestRepositoryIT,\!CollectionRestRepositoryIT,\!DiscoveryScopeBasedRestControllerIT,\!BrowsesResourceControllerIT,\!BitstreamRestRepositoryIT,\!RightTiltedRelationshipRestRepositoryIT,\!ResearcherProfileRestRepositoryIT,\!StatisticsRestSearchByCategoryRepositoryIT,\!TaskRestRepositoriesIT -DskipUnitTests=true -DskipIntegrationTests=false -B -Dsurefire.rerunFailingTestsCount=2 -Dtest.argLine=-Xmx4096M $MAVEN_ARGS artifacts: - - dspace-iiif/target/surefire-reports/*-output.txt - - dspace-oai/target/surefire-reports/*-output.txt - - dspace-rdf/target/surefire-reports/*-output.txt - - dspace-rest/target/surefire-reports/*-output.txt - dspace-server-webapp/target/surefire-reports/*-output.txt - - dspace-services/target/surefire-reports/*-output.txt - - dspace-sword/target/surefire-reports/*-output.txt - - dspace-swordv2/target/surefire-reports/*-output.txt - - dspace-iiif/target/failsafe-reports/*-output.txt - - dspace-oai/target/failsafe-reports/*-output.txt - - dspace-rdf/target/failsafe-reports/*-output.txt - - dspace-rest/target/failsafe-reports/*-output.txt - dspace-server-webapp/target/failsafe-reports/*-output.txt - - dspace-services/target/failsafe-reports/*-output.txt - - dspace-sword/target/failsafe-reports/*-output.txt - - dspace-swordv2/target/failsafe-reports/*-output.txt - - step: &integration-tests-dspace-api + - step: &integration-tests-slow runs-on: self.hosted - name: integration-tests-dspace-api - size: 4x + name: integration-tests-slow + size: 1x caches: - gradle - gradlewrapper - maven script: - *setEnv - - mvn -T 1C clean install license:check -Dmaven.test.skip=true -Dmaven.test.skip=true -DskipUnitTests=true -Pdspace-rest -DskipITs=true -DskipIntegrationTests=true -P !assembly -B $MAVEN_ARGS - - mvn verify -pl dspace-api -Dmaven.test.skip=false -DskipUnitTests=true -Pdspace-rest -DskipITs=false -Pdspace-rest -DskipIntegrationTests=false -P !assembly -B -Dsurefire.rerunFailingTestsCount=2 -Dtest.argLine=-Xmx4096M $MAVEN_ARGS + - cp -rf target/local-repo/** ~/.m2/repository/ + - mvn verify -pl dspace-server-webapp -nsu -Dmaven.main.skip -Dit.test=GenericAuthorizationFeatureIT,WorkspaceItemRestRepositoryIT,ItemImportIT,ItemRestRepositoryIT,LeftTiltedRelationshipRestRepositoryIT,RelationshipRestRepositoryIT,StatisticsRestRepositoryIT,DiscoveryRestControllerIT,PatchMetadataIT,VersionRestRepositoryIT,CollectionRestRepositoryIT,DiscoveryScopeBasedRestControllerIT,BrowsesResourceControllerIT,BitstreamRestRepositoryIT,RightTiltedRelationshipRestRepositoryIT,ResearcherProfileRestRepositoryIT,StatisticsRestSearchByCategoryRepositoryIT,TaskRestRepositoriesIT -DskipUnitTests=true -DskipIntegrationTests=false -B -Dsurefire.rerunFailingTestsCount=2 -Dtest.argLine=-Xmx4096M $MAVEN_ARGS artifacts: - - dspace-api/target/surefire-reports/*-output.txt - - dspace-api/target/failsafe-reports/*-output.txt + - dspace-server-webapp/target/surefire-reports/*-output.txt + - dspace-server-webapp/target/failsafe-reports/*-output.txt pipelines: branches: 'dspace-cris-7': + - step: *install - parallel: ¶llel-pipeline - step: *unit-test-code-checks - - step: *integration-tests + - step: *integration-tests-with-test-jars - step: *integration-tests-slow - step: *integration-tests-dspace-api 'dspace-cris-2023_02_x': + - step: *install - parallel: *parallel-pipeline 'prod/**': + - step: *install - parallel: *parallel-pipeline pull-requests: '**': + - step: *install - parallel: - step: *unit-test-code-checks - - step: *integration-tests + - step: *integration-tests-with-test-jars - step: *integration-tests-slow - step: *integration-tests-dspace-api custom: - integration: - - step: *integration-tests - integration-slow: - - step: *integration-tests-slow + install: + - step: *install + integration-tests-with-test-jars: + - step: *integration-tests-with-test-jars integration-dspace-api: - step: *integration-tests-dspace-api + integration-tests-slow: + - step: *integration-tests-slow unit: - step: *unit-test-code-checks diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml index e570e0538ac3..f75de6f2125e 100644 --- a/dspace-api/pom.xml +++ b/dspace-api/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.dspace dspace-api DSpace Kernel :: API and Implementation DSpace core data model and service APIs. diff --git a/dspace-iiif/pom.xml b/dspace-iiif/pom.xml index 889d7e1eff43..b57e7d1a1815 100644 --- a/dspace-iiif/pom.xml +++ b/dspace-iiif/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.dspace dspace-iiif jar DSpace IIIF diff --git a/dspace-rdf/pom.xml b/dspace-rdf/pom.xml index 305acc88765e..f69d069662c3 100644 --- a/dspace-rdf/pom.xml +++ b/dspace-rdf/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.dspace dspace-rdf jar DSpace RDF diff --git a/dspace-rest/pom.xml b/dspace-rest/pom.xml index 32ae7b5cabcb..e90900d5441f 100644 --- a/dspace-rest/pom.xml +++ b/dspace-rest/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.dspace dspace-rest war cris-2023.02.07-SNAPSHOT diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml index 3b08831a2d3e..a03ccebefdae 100644 --- a/dspace-server-webapp/pom.xml +++ b/dspace-server-webapp/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.dspace dspace-server-webapp DSpace Server Webapp @@ -317,6 +316,26 @@ + + + addon-video + + + audiovideo.on + + + + + it.4science.dspace + addon-video-api + ${addon-video.version} + jar + + + + addon-document-viewer diff --git a/dspace-services/pom.xml b/dspace-services/pom.xml index 71c1338a0d06..4e1723e853f4 100644 --- a/dspace-services/pom.xml +++ b/dspace-services/pom.xml @@ -1,7 +1,6 @@ 4.0.0 - org.dspace dspace-services jar DSpace Services Framework :: API and Implementation diff --git a/dspace-sword/pom.xml b/dspace-sword/pom.xml index caee907cafe9..4b69378935d7 100644 --- a/dspace-sword/pom.xml +++ b/dspace-sword/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.dspace dspace-sword jar DSpace SWORD diff --git a/dspace-swordv2/pom.xml b/dspace-swordv2/pom.xml index e62542c3f0b8..ddc87215a1f4 100644 --- a/dspace-swordv2/pom.xml +++ b/dspace-swordv2/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.dspace dspace-swordv2 jar DSpace SWORD v2 diff --git a/dspace/modules/pom.xml b/dspace/modules/pom.xml index 279c292beb8d..3b26b38f0f0d 100644 --- a/dspace/modules/pom.xml +++ b/dspace/modules/pom.xml @@ -1,7 +1,6 @@ 4.0.0 - org.dspace modules pom diff --git a/dspace/modules/server-boot/pom.xml b/dspace/modules/server-boot/pom.xml index 80bd1a99da07..87968a992be5 100644 --- a/dspace/modules/server-boot/pom.xml +++ b/dspace/modules/server-boot/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - org.dspace server-boot DSpace Server Webapp:: Executable JAR diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml index 7320b49cb496..5a144b312e74 100644 --- a/dspace/modules/server/pom.xml +++ b/dspace/modules/server/pom.xml @@ -26,7 +26,7 @@ maven-dependency-plugin - unpack + unpack-additions prepare-package unpack-dependencies @@ -41,6 +41,20 @@ META-INF/** + + unpack-webapp + prepare-package + + unpack-dependencies + + + runtime + org.dspace + dspace-server-webapp + **/static/**,**/*.properties + ${project.build.directory}/additions + + @@ -67,26 +81,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - prepare-package - - unpack-dependencies - - - runtime - org.dspace - dspace-server-webapp - **/static/**,**/*.properties - ${project.build.directory}/additions - - - - - - + + + dspace-rest false @@ -1079,8 +1141,7 @@ - - + @@ -1423,12 +1483,6 @@ ${spring.version} - - org.springframework - spring-context-support - ${spring.version} - - org.springframework spring-test