From 9aba0cd4a44ea63e3c7a3c9afc63067633756f98 Mon Sep 17 00:00:00 2001 From: Bogdan Gabor Date: Tue, 9 Feb 2021 16:25:14 +0200 Subject: [PATCH 1/3] APPS-694: Added submodules that creates ACS image with Share Services. --- _ci/build.sh | 9 +- _ci/deploy_k8s.sh | 31 +- packaging/distribution/pom.xml | 39 +- .../.maven-dockerignore | 1 + .../community/Dockerfile | 39 ++ .../community/pom.xml | 19 + .../enterprise/Dockerfile | 39 ++ .../enterprise/pom.xml | 19 + packaging/docker-acs-share-services/pom.xml | 120 ++++++ packaging/docker-aws/pom.xml | 11 +- packaging/docker/Dockerfile | 6 +- packaging/docker/pom.xml | 48 +-- packaging/pom.xml | 23 +- pom.xml | 372 +++++++++--------- share/pom.xml | 15 +- 15 files changed, 517 insertions(+), 274 deletions(-) create mode 100644 packaging/docker-acs-share-services/.maven-dockerignore create mode 100644 packaging/docker-acs-share-services/community/Dockerfile create mode 100644 packaging/docker-acs-share-services/community/pom.xml create mode 100644 packaging/docker-acs-share-services/enterprise/Dockerfile create mode 100644 packaging/docker-acs-share-services/enterprise/pom.xml create mode 100644 packaging/docker-acs-share-services/pom.xml diff --git a/_ci/build.sh b/_ci/build.sh index f1b6d10b02..1eb5b3a87a 100755 --- a/_ci/build.sh +++ b/_ci/build.sh @@ -17,10 +17,17 @@ mvn -B -q install \ #build image -cd packaging/docker +cd ${TRAVIS_BUILD_DIR}/packaging/docker mvn install -Plocal mvn fabric8:push +if [ $TRAVIS_BRANCH != "master" ]; then + #build enterprise repo with share services image + cd ${TRAVIS_BUILD_DIR}/packaging/docker-acs-share-services/enterprise + mvn install -Plocal + mvn fabric8:push +fi + popd set +vex echo "=========================== Finishing Build&Test Script ==========================" diff --git a/_ci/deploy_k8s.sh b/_ci/deploy_k8s.sh index e7c225dabf..17bf487947 100755 --- a/_ci/deploy_k8s.sh +++ b/_ci/deploy_k8s.sh @@ -9,7 +9,12 @@ source _ci/init_tag.sh export HOST="${NAMESPACE}.${HOSTED_ZONE}" export RELEASE_NAME=$NAMESPACE export RELEASE_INGRESS_NAME="${NAMESPACE}-ingress" -export ALFRESCO_REPO_IMAGE="alfresco-content-repository" +if [ $TRAVIS_BRANCH != "master" ]; then + export ALFRESCO_REPO_IMAGE="alfresco-content-repository-share-services" + export REPO_TAG_NAME="latest" +else + export ALFRESCO_REPO_IMAGE="alfresco-content-repository" +fi export ALFRESCO_SHARE_IMAGE="alfresco-share" # @@ -49,7 +54,7 @@ function updateDevelopEnv() { # repository.replicaCount=1 - this is a temporary fix until issues on clusterd environments are fixed. helm upgrade --install $RELEASE_NAME alfresco-incubator/alfresco-content-services --version 5.0.0-M1 \ - --set repository.replicaCount=1 \ + --set repository.replicaCount=1 \ --set externalPort="443" \ --set externalProtocol="https" \ --set externalHost=$HOST \ @@ -75,7 +80,7 @@ function updateDevelopEnv() { # Can take one argument that specifies the action: "CREATE", "DELETE", "UPSERT"; if none # specified, it defaults to "CREATE" # -function get_route53_json { +function getRoute53Json { local out local action local path="_ci/route53.json" @@ -96,7 +101,7 @@ function get_route53_json { # # Creates the environment # -function createEnv { +function createDevelopEnv { echo "=========================== Creating the environment ===========================" # create k8s namespace @@ -168,13 +173,13 @@ function createEnv { export HOSTED_ZONE_ID=$(aws route53 list-hosted-zones-by-name --dns-name $HOSTED_ZONE | jq -r '.HostedZones | .[] | .Id') # create Route53 entry - aws route53 change-resource-record-sets --hosted-zone-id $HOSTED_ZONE_ID --change-batch "$(get_route53_json "UPSERT")" + aws route53 change-resource-record-sets --hosted-zone-id $HOSTED_ZONE_ID --change-batch "$(getRoute53Json "UPSERT")" } # # Before running the tests make sure that all pods are green # -function wait_for_pods { +function waitForPods { # counters PODS_COUNTER=0 # counters limit @@ -222,20 +227,20 @@ if $(isBranchDevelop); then if $(isDevelopUp); then echo "Update develop environment" updateDevelopEnv - wait_for_pods $NAMESPACE + waitForPods $NAMESPACE else echo "Create develop environment" - createEnv - wait_for_pods $NAMESPACE + createDevelopEnv + waitForPods $NAMESPACE fi else echo "Create PR env environment" - createEnv - wait_for_pods $NAMESPACE + createDevelopEnv + waitForPods $NAMESPACE fi else echo "On development branch" SHARE_TAG_NAME=$TAG_NAME - createEnv - wait_for_pods $NAMESPACE + createDevelopEnv + waitForPods $NAMESPACE fi diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 004ae8ebf6..080d53ac82 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -1,13 +1,17 @@ - + + 4.0.0 + alfresco-content-services-share-distribution + Distribution of Alfresco Share + pom + org.alfresco alfresco-share-packaging 7.0.0-SNAPSHOT - alfresco-content-services-share-distribution - Distribution of Alfresco Share - pom @@ -42,6 +46,7 @@ src/main/resources true + ${project.build.directory}/dependency/bitrock/bitrock/alfresco/shared/web-extension ${project.build.outputDirectory}/web-extension-samples @@ -67,6 +72,7 @@ false + copy-resources process-resources @@ -108,27 +114,6 @@ - fetch-resources @@ -141,7 +126,7 @@ org.alfresco alfresco-mmt - 6.0 + ${dependency.alfresco-mmt.version} ${project.build.outputDirectory}/bin @@ -153,7 +138,7 @@ maven-assembly-plugin - + package-share package diff --git a/packaging/docker-acs-share-services/.maven-dockerignore b/packaging/docker-acs-share-services/.maven-dockerignore new file mode 100644 index 0000000000..112bd18249 --- /dev/null +++ b/packaging/docker-acs-share-services/.maven-dockerignore @@ -0,0 +1 @@ +target/docker/ \ No newline at end of file diff --git a/packaging/docker-acs-share-services/community/Dockerfile b/packaging/docker-acs-share-services/community/Dockerfile new file mode 100644 index 0000000000..6d718966c6 --- /dev/null +++ b/packaging/docker-acs-share-services/community/Dockerfile @@ -0,0 +1,39 @@ +# Fetch image of ACS Community Edition +FROM alfresco/alfresco-community-repo-base:latest + +USER root + +# Set default Docker context +ARG RESOURCE_PATH=target + +# Set default environment args +ARG GROUPNAME=Alfresco +ARG IMAGEUSERNAME=alfresco +ARG TOMCAT_DIR=/usr/local/tomcat + +# Clean previous amps +RUN rm ${TOMCAT_DIR}/amps/* + +# Copy the amps from build context to the appropriate location for your application server +COPY ${RESOURCE_PATH}/amps ${TOMCAT_DIR}/amps + +RUN chgrp -R ${GROUPNAME} ${TOMCAT_DIR}/amps && \ + chmod 664 ${TOMCAT_DIR}/amps/alfresco-share-services-*.amp + +# Remove installed amps +RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar uninstall \ + org.alfresco.integrations.google.docs \ + ${TOMCAT_DIR}/webapps/alfresco +RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar uninstall \ + alfresco-aos-module \ + ${TOMCAT_DIR}/webapps/alfresco + +# Apply Share Services amp +RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \ + ${TOMCAT_DIR}/amps \ + ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup -force + +EXPOSE 8000 + +USER ${IMAGEUSERNAME} + diff --git a/packaging/docker-acs-share-services/community/pom.xml b/packaging/docker-acs-share-services/community/pom.xml new file mode 100644 index 0000000000..6c35001348 --- /dev/null +++ b/packaging/docker-acs-share-services/community/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + acs-community-docker-share-services + Alfresco Content Services (Community) Docker With Share Services image builder + pom + + + org.alfresco + acs-docker-share-services + 7.0.0-SNAPSHOT + + + + alfresco/alfresco-content-repository-share-services-community + + \ No newline at end of file diff --git a/packaging/docker-acs-share-services/enterprise/Dockerfile b/packaging/docker-acs-share-services/enterprise/Dockerfile new file mode 100644 index 0000000000..7299eb6965 --- /dev/null +++ b/packaging/docker-acs-share-services/enterprise/Dockerfile @@ -0,0 +1,39 @@ +# Fetch image of ACS Enterprise Edition +FROM quay.io/alfresco/alfresco-enterprise-repo-base:latest + +USER root + +# Set default Docker context +ARG RESOURCE_PATH=target + +# Set default environment args +ARG GROUPNAME=Alfresco +ARG IMAGEUSERNAME=alfresco +ARG TOMCAT_DIR=/usr/local/tomcat + +# Clean previous amps +RUN rm ${TOMCAT_DIR}/amps/* + +# Copy the amps from build context to the appropriate location for your application server +COPY ${RESOURCE_PATH}/amps ${TOMCAT_DIR}/amps + +RUN chgrp -R ${GROUPNAME} ${TOMCAT_DIR}/amps && \ + chmod 664 ${TOMCAT_DIR}/amps/alfresco-share-services-*.amp + +# Remove installed amps +RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar uninstall \ + org.alfresco.integrations.google.docs \ + ${TOMCAT_DIR}/webapps/alfresco +RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar uninstall \ + alfresco-aos-module \ + ${TOMCAT_DIR}/webapps/alfresco + +# Apply Share Services amp +RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \ + ${TOMCAT_DIR}/amps \ + ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup -force + +EXPOSE 8000 + +USER ${IMAGEUSERNAME} + diff --git a/packaging/docker-acs-share-services/enterprise/pom.xml b/packaging/docker-acs-share-services/enterprise/pom.xml new file mode 100644 index 0000000000..6f21fa9975 --- /dev/null +++ b/packaging/docker-acs-share-services/enterprise/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + acs-enterprise-docker-share-services + Alfresco Content Services (Enterprise) Docker With Share Services image builder + pom + + + org.alfresco + acs-docker-share-services + 7.0.0-SNAPSHOT + + + + alfresco/alfresco-content-repository-share-services + + \ No newline at end of file diff --git a/packaging/docker-acs-share-services/pom.xml b/packaging/docker-acs-share-services/pom.xml new file mode 100644 index 0000000000..e7551fb1e5 --- /dev/null +++ b/packaging/docker-acs-share-services/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + acs-docker-share-services + Alfresco Content Services Docker With Share Services image builder + pom + + + org.alfresco + alfresco-share-packaging + 7.0.0-SNAPSHOT + + + + quay.io + latest + + 3.4.0-M5 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.2 + + + copy-resources + process-resources + + copy + + + + + org.alfresco + alfresco-share-services + ${project.version} + amp + true + ${project.build.directory}/amps + + + true + + + + copy-amps + process-resources + + copy + + + + + org.alfresco.services.sync + alfresco-device-sync-repo + ${alfresco.desktop-sync.version} + amp + false + ${project.build.directory}/amps + + + + + + + + + + + + io.fabric8 + fabric8-maven-plugin + 4.4.0 + + true + false + + + ${image.name}:${image.tag} + ${image.registry} + + ${project.basedir} + + + + + + + + + + + + + local + + + + io.fabric8 + fabric8-maven-plugin + + + build-image + install + + build + + + + + + + + + \ No newline at end of file diff --git a/packaging/docker-aws/pom.xml b/packaging/docker-aws/pom.xml index 6a3ed079e4..298cd9853c 100644 --- a/packaging/docker-aws/pom.xml +++ b/packaging/docker-aws/pom.xml @@ -1,4 +1,7 @@ - + + 4.0.0 share-docker-aws Alfresco Share Docker AWS image builder @@ -15,7 +18,7 @@ alfresco/alfresco-share-aws latest - + org.alfresco @@ -24,7 +27,7 @@ amp - + @@ -42,7 +45,7 @@ - + diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 8c0a9fca7a..b0f555d779 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,12 +1,12 @@ FROM alfresco/alfresco-base-tomcat:8.5.43-java-11-openjdk-centos-7 RUN mkdir -p /usr/local/tomcat/shared/classes/alfresco/web-extension -RUN mkdir -p /usr/local/tomcat/amps_share +RUN mkdir -p /usr/local/tomcat/amps/share RUN mkdir /licenses COPY target/war /usr/local/tomcat/webapps COPY target/alfresco-mmt/* /usr/local/tomcat/alfresco-mmt/ -COPY target/amps_share /usr/local/tomcat/amps_share +COPY target/amps/share /usr/local/tomcat/amps/share COPY target/classes/web-extension-samples/share-config-custom.xml /usr/local/tomcat/shared/classes/alfresco/web-extension COPY target/classes/web-extension-samples/custom-slingshot-application-context.xml.sample /usr/local/tomcat/shared/classes/alfresco/web-extension @@ -22,7 +22,7 @@ RUN chmod +x /usr/local/tomcat/shared/classes/alfresco/substituter.sh # apply amps RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \ - /usr/local/tomcat/amps_share /usr/local/tomcat/webapps/share -directory -nobackup -force + /usr/local/tomcat/amps/share /usr/local/tomcat/webapps/share -directory -nobackup -force ENTRYPOINT ["/usr/local/tomcat/shared/classes/alfresco/substituter.sh", "catalina.sh run"] diff --git a/packaging/docker/pom.xml b/packaging/docker/pom.xml index a3e69b07e9..7f23a1e985 100644 --- a/packaging/docker/pom.xml +++ b/packaging/docker/pom.xml @@ -1,4 +1,7 @@ - + + 4.0.0 share-docker Alfresco Share Docker image builder @@ -11,9 +14,8 @@ - 6.0 - 3.2.0 + 3.2.0 quay.io alfresco/alfresco-share @@ -29,15 +31,17 @@ ${project.version} war + org.alfresco alfresco-mmt ${dependency.alfresco-mmt.version} + org.alfresco.integrations alfresco-googledrive-share - ${alfresco.googledocs.version} + ${dependency.alfresco-googledrive-share.version} amp @@ -46,9 +50,9 @@ src/main/resources - false + maven-resources-plugin @@ -59,6 +63,7 @@ resources + copy-resources process-resources @@ -103,6 +108,7 @@ + copy-resources process-resources @@ -122,10 +128,10 @@ org.alfresco.integrations alfresco-googledrive-share - ${alfresco.googledocs.version} + ${dependency.alfresco-googledrive-share.version} amp false - ${project.build.directory}/amps_share + ${project.build.directory}/amps/share @@ -159,28 +165,14 @@ + local - io.fabric8 fabric8-maven-plugin - - true - false - - - - ${image.name}:${image.tag} - ${image.registry} - - ${project.basedir} - - - - build-image @@ -195,9 +187,9 @@ + internal - @@ -218,9 +210,9 @@ + release - @@ -230,6 +222,13 @@ true false + + ${image.name}:${project.version} + + ${project.basedir} + + + ${image.name}:${project.version} ${image.registry} @@ -239,6 +238,7 @@ + build-push-image diff --git a/packaging/pom.xml b/packaging/pom.xml index da23466fdb..ef8d386db8 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -1,13 +1,17 @@ - + + 4.0.0 + alfresco-share-packaging + Packaging Alfresco Share + pom + org.alfresco alfresco-share-parent 7.0.0-SNAPSHOT - alfresco-share-packaging - Packaging Alfresco Share - pom ${basedir}/../../.. @@ -26,8 +30,12 @@ ${project.version} + + 6.0 + + ${project.parent.parent.parent.basedir} - + @@ -44,8 +52,9 @@ distribution webeditor wcmqs - docker + docker docker-aws + docker-acs-share-services - + diff --git a/pom.xml b/pom.xml index ad4d04d834..2c3f0387e0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,12 @@ - + + 4.0.0 + alfresco-share-parent + Alfresco Share Parent + pom + 7.0.0-SNAPSHOT org.alfresco @@ -7,11 +14,6 @@ 12 - alfresco-share-parent - 7.0.0-SNAPSHOT - pom - Alfresco Share Parent - share-services share @@ -29,12 +31,8 @@ 0 0 - - 7.0.0-A3 - 7.0.0-A16 - - 8.345 + 8.346 1.8 @@ -42,7 +40,8 @@ 1.8 - https://artifacts.alfresco.com/nexus/content/repositories/snapshots + https://artifacts.alfresco.com/nexus/content/repositories/snapshots + -Xmx2G -Duser.language=en -Dcom.sun.management.jmxremote 5.2.9.RELEASE @@ -70,7 +69,8 @@ ${runtime.parent.folder}/runtime ${runtime.parent.folder}/tomcat ${runtime.data.folder}/solr4-instance - ${runtime.tomcat.conf.folder}/shared/classes/alfresco-global.properties + ${runtime.tomcat.conf.folder}/shared/classes/alfresco-global.properties + ${runtime.data.folder}/alf_data @@ -87,17 +87,15 @@ ${project.build.directory} convert pdf2swf - 3.0 - ${maven.multiModuleProjectDirectory} - - scm:git:https://github.com/Alfresco/share.git/ - scm:git:https://github.com/Alfresco/share.git - https://github.com/Alfresco/share - alfresco-share-parent--A2 - + + scm:git:https://github.com/Alfresco/share.git/ + scm:git:https://github.com/Alfresco/share.git + https://github.com/Alfresco/share + alfresco-share-parent--A2 + @@ -109,8 +107,7 @@ alfresco-internal - - https://artifacts.alfresco.com/nexus/content/repositories/releases + https://artifacts.alfresco.com/nexus/content/repositories/releases alfresco-internal-snapshots @@ -120,15 +117,6 @@ - org.alfresco @@ -156,42 +144,42 @@ ${dependency.webscripts.version} - org.alfresco.surf - spring-surf - ${dependency.surf.version} - - + org.alfresco.surf + spring-surf + ${dependency.surf.version} + + com.asual.lesscss lesscss-engine - + - org.alfresco.surf - spring-surf-api - ${dependency.surf.version} + org.alfresco.surf + spring-surf-api + ${dependency.surf.version} - org.apache.httpcomponents - httpclient - ${dependency.httpcomponents.version} + org.apache.httpcomponents + httpclient + ${dependency.httpcomponents.version} - org.apache.httpcomponents - httpmime - ${dependency.httpcomponents.version} + org.apache.httpcomponents + httpmime + ${dependency.httpcomponents.version} - javax.servlet - javax.servlet-api - 4.0.1 - provided + javax.servlet + javax.servlet-api + 4.0.1 + provided - commons-lang - commons-lang - 2.6 + commons-lang + commons-lang + 2.6 commons-fileupload @@ -226,34 +214,34 @@ - org.keycloak - keycloak-servlet-filter-adapter - ${dependency.keycloak.version} + org.keycloak + keycloak-servlet-filter-adapter + ${dependency.keycloak.version} - org.keycloak - keycloak-authz-client - ${dependency.keycloak.version} + org.keycloak + keycloak-authz-client + ${dependency.keycloak.version} - org.keycloak - keycloak-core - ${dependency.keycloak.version} + org.keycloak + keycloak-core + ${dependency.keycloak.version} - org.keycloak - keycloak-adapter-core - ${dependency.keycloak.version} + org.keycloak + keycloak-adapter-core + ${dependency.keycloak.version} - org.keycloak - keycloak-adapter-spi - ${dependency.keycloak.version} + org.keycloak + keycloak-adapter-spi + ${dependency.keycloak.version} - org.keycloak - keycloak-servlet-adapter-spi - ${dependency.keycloak.version} + org.keycloak + keycloak-servlet-adapter-spi + ${dependency.keycloak.version} @@ -263,19 +251,19 @@ - org.apache.taglibs - taglibs-standard-spec - ${dependency.apache.taglibs.version} + org.apache.taglibs + taglibs-standard-spec + ${dependency.apache.taglibs.version} - org.apache.taglibs - taglibs-standard-impl - ${dependency.apache.taglibs.version} + org.apache.taglibs + taglibs-standard-impl + ${dependency.apache.taglibs.version} - org.apache.taglibs - taglibs-standard-jstlel - ${dependency.apache.taglibs.version} + org.apache.taglibs + taglibs-standard-jstlel + ${dependency.apache.taglibs.version} com.fasterxml.jackson.core @@ -297,8 +285,8 @@ - - com.mycila + + com.mycila license-maven-plugin ${license-maven-plugin.version} @@ -314,20 +302,22 @@ - - validate-license - validate - - check - - + + validate-license + validate + + check + + + org.alfresco.maven.plugin alfresco-maven-plugin ${dependency.alfresco-sdk.version} + org.apache.maven.plugins maven-enforcer-plugin @@ -353,7 +343,7 @@ org.codehaus.mojo properties-maven-plugin - + read-alfresco-global-properties initialize @@ -382,16 +372,16 @@ true - - - - - - - - - - + + + + + + + + + + @@ -447,7 +437,8 @@ - ${version.major}.${version.minor}.${version.revision} + ${version.major}.${version.minor}.${version.revision} + ${project.version} ${maven.build.timestamp} ${bamboo_planName} @@ -463,7 +454,8 @@ - ${version.major}.${version.minor}.${version.revision} + ${version.major}.${version.minor}.${version.revision} + ${project.version} ${maven.build.timestamp} ${bamboo_planName} @@ -475,7 +467,8 @@ Source-control - ${bamboo_custom_svn_lastchange_revision_number} + ${bamboo_custom_svn_lastchange_revision_number} + ${bamboo_repository_revision_number} ${bamboo_planRepository_repositoryUrl} @@ -529,36 +522,36 @@ - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - license-maven-plugin - - - [1.8,) - - - - check-file-header - - - - - - - - - - + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + license-maven-plugin + + + [1.8,) + + + + check-file-header + + + + + + + + + + @@ -592,56 +585,56 @@ - org.apache.maven.plugins - maven-dependency-plugin - - - - unpack-tomcat-config - generate-resources - - unpack - - - ${project.build.directory}/tomcat-conf - - - org.alfresco - alfresco-dev-tomcat - 5.2.3 - config - true - zip - - - - - - - - unpack-solr4-config - generate-resources - - unpack - - - ${project.build.directory}/solr4 - - - org.alfresco - alfresco-solr4 - 5.2.3 - - - - config - true - zip - - - - - + org.apache.maven.plugins + maven-dependency-plugin + + + + unpack-tomcat-config + generate-resources + + unpack + + + ${project.build.directory}/tomcat-conf + + + org.alfresco + alfresco-dev-tomcat + 5.2.3 + config + true + zip + + + + + + + + unpack-solr4-config + generate-resources + + unpack + + + ${project.build.directory}/solr4 + + + org.alfresco + alfresco-solr4 + 5.2.3 + + + + config + true + zip + + + + + @@ -706,16 +699,17 @@ generate-resources - + - + - + - + - + diff --git a/share/pom.xml b/share/pom.xml index 93d41e6671..958ad22df1 100644 --- a/share/pom.xml +++ b/share/pom.xml @@ -1,16 +1,19 @@ - + + 4.0.0 + share + Alfresco Share WAR + Alfresco Share + war + org.alfresco alfresco-share-parent 7.0.0-SNAPSHOT - share - war - Alfresco Share WAR - Alfresco Share - 7.0.86 /share From 92f4d3441e4643e6fb342a3fcb12c20cdaa905a7 Mon Sep 17 00:00:00 2001 From: Bogdan Ioan Gabor Date: Thu, 11 Feb 2021 17:28:33 +0200 Subject: [PATCH 2/3] APPS-694: Fixing license issues. --- packaging/docker-acs-share-services/community/pom.xml | 1 + packaging/docker-acs-share-services/enterprise/pom.xml | 1 + packaging/pom.xml | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/docker-acs-share-services/community/pom.xml b/packaging/docker-acs-share-services/community/pom.xml index 6c35001348..92629b7155 100644 --- a/packaging/docker-acs-share-services/community/pom.xml +++ b/packaging/docker-acs-share-services/community/pom.xml @@ -15,5 +15,6 @@ alfresco/alfresco-content-repository-share-services-community + ${project.parent.parent.parent.basedir} \ No newline at end of file diff --git a/packaging/docker-acs-share-services/enterprise/pom.xml b/packaging/docker-acs-share-services/enterprise/pom.xml index 6f21fa9975..770b366fbb 100644 --- a/packaging/docker-acs-share-services/enterprise/pom.xml +++ b/packaging/docker-acs-share-services/enterprise/pom.xml @@ -15,5 +15,6 @@ alfresco/alfresco-content-repository-share-services + ${project.parent.parent.parent.basedir} \ No newline at end of file diff --git a/packaging/pom.xml b/packaging/pom.xml index ef8d386db8..4301253960 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -32,8 +32,6 @@ 6.0 - - ${project.parent.parent.parent.basedir} From 5eb8f18f1e858c653eb4845e411393537fe3fec5 Mon Sep 17 00:00:00 2001 From: Bogdan Ioan Gabor Date: Thu, 11 Feb 2021 17:43:04 +0200 Subject: [PATCH 3/3] APPS-694: Align with develop branch. --- pom.xml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 2c3f0387e0..463c30259c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 0 - 8.346 + 8.345 1.8 @@ -40,8 +40,7 @@ 1.8 - https://artifacts.alfresco.com/nexus/content/repositories/snapshots - + https://artifacts.alfresco.com/nexus/content/repositories/snapshots -Xmx2G -Duser.language=en -Dcom.sun.management.jmxremote 5.2.9.RELEASE @@ -69,8 +68,7 @@ ${runtime.parent.folder}/runtime ${runtime.parent.folder}/tomcat ${runtime.data.folder}/solr4-instance - ${runtime.tomcat.conf.folder}/shared/classes/alfresco-global.properties - + ${runtime.tomcat.conf.folder}/shared/classes/alfresco-global.properties ${runtime.data.folder}/alf_data @@ -87,7 +85,9 @@ ${project.build.directory} convert pdf2swf + 3.0 + ${maven.multiModuleProjectDirectory} @@ -437,8 +437,7 @@ - ${version.major}.${version.minor}.${version.revision} - + ${version.major}.${version.minor}.${version.revision} ${project.version} ${maven.build.timestamp} ${bamboo_planName} @@ -454,8 +453,7 @@ - ${version.major}.${version.minor}.${version.revision} - + ${version.major}.${version.minor}.${version.revision} ${project.version} ${maven.build.timestamp} ${bamboo_planName} @@ -467,8 +465,7 @@ Source-control - ${bamboo_custom_svn_lastchange_revision_number} - + ${bamboo_custom_svn_lastchange_revision_number} ${bamboo_repository_revision_number} ${bamboo_planRepository_repositoryUrl}