From 0b4588a841d32d16cb3d903c4b04de9ae8328270 Mon Sep 17 00:00:00 2001 From: gfertuso Date: Thu, 14 Jan 2021 15:54:12 +0000 Subject: [PATCH 1/9] migration to ACS and Share 7 --- pom.xml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 86140bb7..66bf6529 100644 --- a/pom.xml +++ b/pom.xml @@ -135,8 +135,8 @@ */*-enterprise*/* acs-community-packaging - 6.2.0-ea - 6.2.0 + 7.0.0-A20 + 7.0.0-M3 alfresco/alfresco-content-repository-community alfresco/alfresco-share @@ -364,6 +364,30 @@ + + + + community-70-tests + + acs-community-packaging + 7.0.0-A20 + 7.0.0-M3 + alfresco/alfresco-content-repository-community + alfresco/alfresco-share + + + + + enterprise-70-tests + + acs-packaging + 7.0.0-A20 + 7.0.0-M3 + alfresco/alfresco-content-repository + alfresco/alfresco-share + + + sdk-release From 610d373896605fd86982019e2c4ee7490c139dba Mon Sep 17 00:00:00 2001 From: gfertuso Date: Thu, 21 Jan 2021 16:21:24 +0000 Subject: [PATCH 2/9] fix version 4.2.0-SNAPSHOT --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-platform-jar-archetype/pom.xml | 2 +- archetypes/alfresco-share-jar-archetype/pom.xml | 2 +- archetypes/archetypes-it/pom.xml | 2 +- docs/getting-started.md | 5 +++-- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 6 +++--- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index b377024a..f03b12e1 100644 --- a/archetypes/alfresco-allinone-archetype/pom.xml +++ b/archetypes/alfresco-allinone-archetype/pom.xml @@ -11,7 +11,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-platform-jar-archetype/pom.xml b/archetypes/alfresco-platform-jar-archetype/pom.xml index 36f43b70..9319398f 100644 --- a/archetypes/alfresco-platform-jar-archetype/pom.xml +++ b/archetypes/alfresco-platform-jar-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-share-jar-archetype/pom.xml b/archetypes/alfresco-share-jar-archetype/pom.xml index cccb1984..ddb981d7 100644 --- a/archetypes/alfresco-share-jar-archetype/pom.xml +++ b/archetypes/alfresco-share-jar-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/archetypes-it/pom.xml b/archetypes/archetypes-it/pom.xml index cabb92ca..0f7be0b6 100644 --- a/archetypes/archetypes-it/pom.xml +++ b/archetypes/archetypes-it/pom.xml @@ -17,7 +17,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/docs/getting-started.md b/docs/getting-started.md index e1bf8cee..e8fcbf82 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -118,7 +118,7 @@ Choose archetype: * `org.alfresco.maven.archetype:alfresco-platform-jar-archetype` * `org.alfresco.maven.archetype:alfresco-share-jar-archetype` -3. Choose the latest version, such as 4.1.0. +3. Choose the latest version, such as 4.2.0. ``` Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version: @@ -134,6 +134,7 @@ Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version: 10: 3.0.1 11: 4.0.0 12: 4.1.0 +13: 4.2.0 ``` 4. Next you will be prompted for additional values, like groupId, artifactId, and package, as shown below: @@ -162,7 +163,7 @@ If everything has been configured correctly, you should see something similar to ``` [INFO] ---------------------------------------------------------------------------- -[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.1.0-SNAPSHOT +[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.2.0-SNAPSHOT [INFO] ---------------------------------------------------------------------------- [INFO] Parameter: groupId, Value: com.acme [INFO] Parameter: artifactId, Value: my-all-in-one diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index bf44c08d..f8a9fca0 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -10,7 +10,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 27fb2fee..da71dba3 100644 --- a/plugins/alfresco-maven-plugin/pom.xml +++ b/plugins/alfresco-maven-plugin/pom.xml @@ -8,7 +8,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 66bf6529..cadf9869 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT Alfresco SDK This aggregator Project builds all modules required for the Alfresco SDK pom @@ -30,7 +30,7 @@ scm:git:${scm.url.base}.git scm:git:${scm.url.base} ${scm.url.base} - alfresco-sdk-aggregator-4.1.0-SNAPSHOT + alfresco-sdk-aggregator-4.2.0-SNAPSHOT @@ -503,4 +503,4 @@ --> - + \ No newline at end of file From dd0056b7a0a79d0d1289c9ca1cd9a3494f43a95e Mon Sep 17 00:00:00 2001 From: gfertuso Date: Fri, 22 Jan 2021 12:37:41 +0000 Subject: [PATCH 3/9] updated documentation to refer to version 4.2 --- README.md | 2 +- .../resources/archetype-resources/README.md | 4 ++-- .../pom.xml | 2 +- .../__rootArtifactId__-platform/pom.xml | 2 +- .../__rootArtifactId__-share/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 4 ++-- .../resources/archetype-resources/README.md | 4 ++-- .../resources/archetype-resources/README.md | 4 ++-- docs/README.md | 14 ++++++------ docs/advanced-topics/amps.md | 6 ++--- docs/advanced-topics/debugging/README.md | 2 +- .../debugging/debug-eclipse.md | 4 ++-- .../debugging/debug-intellij.md | 4 ++-- .../hot-reloading/hotswap-agent.md | 6 ++--- docs/advanced-topics/hot-reloading/jrebel.md | 2 +- .../integration-testing/README.md | 4 ++-- .../integration-testing/it-running.md | 2 +- .../integration-testing/it-working.md | 2 +- docs/advanced-topics/switching-versions.md | 4 ++-- docs/advanced-topics/upgrading.md | 16 +++++++------- docs/getting-started.md | 22 ++++++++++--------- docs/mvn-archetypes.md | 12 +++++----- .../dev-env-eclipse.md | 2 +- .../dev-env-intellij.md | 2 +- docs/troubleshooting.md | 2 +- .../working-with-generated-projects/README.md | 8 +++---- .../working-with-aio.md | 4 ++-- 27 files changed, 72 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index c21f7533..0c416ed1 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ If you are an Enterprise customer check the [Support](#alfresco-enterprise-custo ## User Getting Started ### Latest Documentation -To get started with **Alfresco SDK 4.1.x** (latest) visit the [Alfresco Documentation](docs/README.md). +To get started with **Alfresco SDK 4.2.x** (latest) visit the [Alfresco Documentation](docs/README.md). #### Documentation about Previous Versions | SDK Version | Alfresco Enterprise Version | Alfresco Community Version | Documentation | diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md index e8b66faf..739d1416 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md @@ -1,6 +1,6 @@ -# Alfresco AIO Project - SDK 4.0 +# Alfresco AIO Project - SDK 4.2 -This is an All-In-One (AIO) project for Alfresco SDK 4.0. +This is an All-In-One (AIO) project for Alfresco SDK 4.2. Run with `./run.sh build_start` or `./run.bat build_start` and verify that it diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml index 78ecd3e9..715fbc35 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ${artifactId} Integration Tests Module - Integration Tests module for in-container integration testing - part of AIO - SDK 4.0 + Integration Tests module for in-container integration testing - part of AIO - SDK 4.2 jar diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml index fe6e5537..ae7b530e 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ${artifactId} Alfresco Platform/Repository JAR Module - Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.0 + Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.2 jar diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/pom.xml index a95f3678..cd172b45 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/pom.xml @@ -5,7 +5,7 @@ ${artifactId} Alfresco Share JAR Module jar - Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.0 + Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.2 ${groupId} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml index be571e5a..19fa760f 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml @@ -5,8 +5,8 @@ ${groupId} ${artifactId} ${version} - AIO - SDK 4.0 - All-In-One (AIO) project for SDK 4.0 + AIO - SDK 4.2 + All-In-One (AIO) project for SDK 4.2 pom diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md index cbe72942..4c18c5dd 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md @@ -1,6 +1,6 @@ -# Alfresco ACS JAR Module - SDK 4.0 +# Alfresco ACS JAR Module - SDK 4.2 -This is an ACS project for Alfresco SDK 4.0. +This is an ACS project for Alfresco SDK 4.2. Run with `./run.sh build_start` or `./run.bat build_start` and verify that it diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md index 3894c8ab..00f5452c 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md @@ -1,6 +1,6 @@ -# Alfresco Share JAR Module - SDK 4.0 +# Alfresco Share JAR Module - SDK 4.2 -This is a Share project for Alfresco SDK 4.0. +This is a Share project for Alfresco SDK 4.2. Run with `./run.sh build_start` or `./run.bat build_start` and verify that it diff --git a/docs/README.md b/docs/README.md index 0b5ba58d..fb0730c7 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,11 +1,11 @@ --- -Title: Alfresco SDK 4.1 +Title: Alfresco SDK 4.2 Added: v3.0.0 Last reviewed: 2019-10-18 --- -# Alfresco SDK 4.1 +# Alfresco SDK 4.2 -Alfresco SDK 4.1 is a Maven based development kit that provides an easy to use approach to developing applications and extensions for Alfresco. With this +Alfresco SDK 4.2 is a Maven based development kit that provides an easy to use approach to developing applications and extensions for Alfresco. With this SDK you can develop, package, test, run, document and release your Alfresco extension project. For earlier releases of the Alfresco SDK, see the Previous versions of [http://docs.alfresco.com](http://docs.alfresco.com). @@ -14,22 +14,22 @@ The Alfresco Software Development Kit (Alfresco SDK) is a fundamental tool provi the Alfresco Digital Business Platform. It is based on [Apache Maven](http://maven.apache.org/) and [Docker](https://www.docker.com/) and is compatible with major IDEs. This enables Rapid Application Development (RAD) and Test Driven Development (TDD). -Alfresco SDK 4.1 is released under [Apache License version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) and supports Alfresco Content Services both +Alfresco SDK 4.2 is released under [Apache License version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) and supports Alfresco Content Services both in Community Edition and Enterprise Edition. If you're an Enterprise customer, please check the [Alfresco SDK Support status](https://www.alfresco.com/alfresco-product-support-status) for the version you're using. If your version is in Limited or Full Support and you need help, contact our Support team [http://support.alfresco.com](http://support.alfresco.com/). -Alfresco SDK 4.1 is a minor update to the SDK and provides support for Alfresco 6.2.x. +Alfresco SDK 4.2 is a minor update to the SDK and provides support for Alfresco 7.0.x. The 4.0 release takes advantage of Semantic Versioning ([SEMVER](http://semver.org/)), which means that this new release is not directly compatible with the previous releases of the SDK. -If you have existing projects that you wish to upgrade to SDK 4.1.x, the recommended approach is to generate a new project from our archetypes and move your +If you have existing projects that you wish to upgrade to SDK 4.2.x, the recommended approach is to generate a new project from our archetypes and move your code into place. ## Documentation Content * [What's new?](whats-new.md) -* [Getting started with Alfresco SDK 4.1](getting-started.md) +* [Getting started with Alfresco SDK 4.2](getting-started.md) * [Alfresco SDK Maven archetypes](mvn-archetypes.md) * [Working with generated projects](working-with-generated-projects/README.md) * [All-In-One project structure](working-with-generated-projects/structure-aio.md) diff --git a/docs/advanced-topics/amps.md b/docs/advanced-topics/amps.md index 5cdd3b1c..2548af34 100644 --- a/docs/advanced-topics/amps.md +++ b/docs/advanced-topics/amps.md @@ -5,7 +5,7 @@ Last reviewed: 2019-10-18 --- # Working with AMPs -Since the early days of the Alfresco SDK, the Alfresco Module Packages (AMP) have been the way customizations were packaged. In Alfresco SDK 4.1 everything +Since the early days of the Alfresco SDK, the Alfresco Module Packages (AMP) have been the way customizations were packaged. In Alfresco SDK 4.2 everything is packaged as a JAR by default, while the AMPs are still available as an optional assembly. This gives you much more control over packaging, and simple modules can easily be deployed as JARs. @@ -55,7 +55,7 @@ to your needs. ## Installing AMPs with the SDK -The projects created from the Alfresco SDK 4.1 archetypes are configured to deploy either JARs or AMPs to the ACS / Share docker container. The only thing to +The projects created from the Alfresco SDK 4.2 archetypes are configured to deploy either JARs or AMPs to the ACS / Share docker container. The only thing to do is modify the `pom.xml` file of the corresponding docker module / project in order to properly configure the dependencies and the Maven dependency plugin. ### All-In-One project @@ -237,7 +237,7 @@ include *.amp in the copy-and-filter-docker-resources-non-filtered ## Controlling the order AMPs are applied Under some specific circumstances it is necessary to apply different AMPs in a development project in a precise order. The default configuration of the -projects generated using the Alfresco SDK 4.1 archetypes doesn't specify any concrete order applying the AMPs to the ACS/Share installation. +projects generated using the Alfresco SDK 4.2 archetypes doesn't specify any concrete order applying the AMPs to the ACS/Share installation. Anyway, that order can be controlled modifying slightly the configuration of the custom Docker images in the project. For instance, let's say we have three third party AMPs that we want to apply in the next order `third-party-amp-01.amp -> third-party-amp-02.amp -> third-party-amp-03.amp`. In this example, we're diff --git a/docs/advanced-topics/debugging/README.md b/docs/advanced-topics/debugging/README.md index 4f7191da..d889fcea 100644 --- a/docs/advanced-topics/debugging/README.md +++ b/docs/advanced-topics/debugging/README.md @@ -10,4 +10,4 @@ application server. This section outlines the steps needed to configure Alfresco and to troubleshoot issues by stepping through the code line by line. Here we assume you have already generated an Alfresco project using the Alfresco SDK. If you don't have a project already, follow the steps in -[Getting started with Alfresco SDK 4.1](../../getting-started.md) to learn how to generate it in a few easy steps. +[Getting started with Alfresco SDK 4.2](../../getting-started.md) to learn how to generate it in a few easy steps. diff --git a/docs/advanced-topics/debugging/debug-eclipse.md b/docs/advanced-topics/debugging/debug-eclipse.md index b18053cd..7053db18 100644 --- a/docs/advanced-topics/debugging/debug-eclipse.md +++ b/docs/advanced-topics/debugging/debug-eclipse.md @@ -5,7 +5,7 @@ Last reviewed: 2019-10-18 --- # Remote debugging using Eclipse -All the projects generated using the Alfresco SDK 4.1 are pre-configured to listen for remote debug connections. Depending on the selected archetypes you'll +All the projects generated using the Alfresco SDK 4.2 are pre-configured to listen for remote debug connections. Depending on the selected archetypes you'll have a port for remotely debugging ACS, share or both of them. By default, the remote debug port for ACS is **8888** and for share is **9898**. This configuration can be changed through the maven properties `acs.debug.port` @@ -79,7 +79,7 @@ application. In our case, we are going to test the behaviour of debugging by run 8. Open your browser and type `http://localhost:8080/alfresco/s/sample/helloworld`. -This is a sample webscript generated in every project created using SDK 4.1 and the platform artifact. +This is a sample webscript generated in every project created using SDK 4.2 and the platform artifact. ![Alt text](../../docassets/images/sdk-hellofromjava.png "Hello World webscript original result") diff --git a/docs/advanced-topics/debugging/debug-intellij.md b/docs/advanced-topics/debugging/debug-intellij.md index 647ca54e..d44c39dd 100644 --- a/docs/advanced-topics/debugging/debug-intellij.md +++ b/docs/advanced-topics/debugging/debug-intellij.md @@ -5,7 +5,7 @@ Last reviewed: 2019-10-18 --- # Remote debugging using IntelliJ -All the projects generated using the Alfresco SDK 4.1 are pre-configured to listen for remote debug connections. Depending on the selected archetypes you'll +All the projects generated using the Alfresco SDK 4.2 are pre-configured to listen for remote debug connections. Depending on the selected archetypes you'll have a port for remotely debugging ACS, share or both of them. By default, the remote debug port for ACS is **8888** and for share is **9898**. This configuration can be changed through the maven properties `acs.debug.port` @@ -77,7 +77,7 @@ application. In our case, we are going to test the behaviour of debugging by run 7. Open your browser and type `http://localhost:8080/alfresco/s/sample/helloworld`. -This is a sample webscript generated in every project created using SDK 4.1 and the platform artifact. +This is a sample webscript generated in every project created using SDK 4.2 and the platform artifact. ![Alt text](../../docassets/images/sdk-hellofromjava.png "Hello World webscript original result") diff --git a/docs/advanced-topics/hot-reloading/hotswap-agent.md b/docs/advanced-topics/hot-reloading/hotswap-agent.md index abc504c5..f024630d 100644 --- a/docs/advanced-topics/hot-reloading/hotswap-agent.md +++ b/docs/advanced-topics/hot-reloading/hotswap-agent.md @@ -8,7 +8,7 @@ Last reviewed: 2019-10-18 [HotSwapAgent](http://hotswapagent.org/index.html) is the agent that enables you to do hot reloading. This allows you to modify the application code, and view the changes without having to restart Alfresco Tomcat (or the ACS Docker container). -A prerequisite for this tutorial is to have a project created with the Alfresco SDK 4.1, using the All-In-One archetype or the Platform JAR archetype. It's +A prerequisite for this tutorial is to have a project created with the Alfresco SDK 4.2, using the All-In-One archetype or the Platform JAR archetype. It's worth noting that hot reloading is only supported on the platform, and not in Alfresco Share. As an alternative to the HotSwapAgent you can also try out JRebel. It has more features but isn't free. @@ -112,7 +112,7 @@ For more information about HotSwapAgent configuration for Java 8, please check t Using Java 11 and HotSwapAgent, it isn't necessary to configure the java agent and the alternative JVM as in previous versions. Instead, it is required to use an alternative pre-built JDK distribution. That JDK is based on OpenJDK and includes all the required modifications to run the HotSwapAgent properly. -In the context of the Alfresco SDK 4.1, this change is an issue because the JDK installation is inherited from the [Alfresco java docker image](https://github.com/Alfresco/alfresco-docker-base-java). +In the context of the Alfresco SDK 4.2, this change is an issue because the JDK installation is inherited from the [Alfresco java docker image](https://github.com/Alfresco/alfresco-docker-base-java). It is necessary to modify the project ACS docker image to change the default java installation of the container's OS to the one provided by HotSwapAgent. A way to implement the required modifications would be: @@ -250,7 +250,7 @@ You'll recognize HotSwapAgent is working when you see similar log messages: 2. Before making any changes, let's run the sample webscript by opening your browser and typing `http://localhost:8080/alfresco/s/sample/helloworld`. -This is a sample webscript generated in every project created using SDK 4.1 and the platform artifact. +This is a sample webscript generated in every project created using SDK 4.2 and the platform artifact. ![Alt text](../../docassets/images/sdk-hellofromjava.png "Hello World webscript original result") diff --git a/docs/advanced-topics/hot-reloading/jrebel.md b/docs/advanced-topics/hot-reloading/jrebel.md index 03fc1eb4..57187e4c 100644 --- a/docs/advanced-topics/hot-reloading/jrebel.md +++ b/docs/advanced-topics/hot-reloading/jrebel.md @@ -8,7 +8,7 @@ Last reviewed: 2019-10-18 [JRebel](https://zeroturnaround.com/software/jrebel/) is the agent that enables you to do hot reloading. This allows you to modify the application code, and view the changes without having to restart Alfresco Tomcat (or the ACS Docker container). -A prerequisite to this tutorial is having an Alfresco project created with Alfresco SDK 4.1, using the All-In-One archetype, or the Platform JAR archetype. +A prerequisite to this tutorial is having an Alfresco project created with Alfresco SDK 4.2, using the All-In-One archetype, or the Platform JAR archetype. It's worth noting that hot reloading is only supported on the platform, and not in Alfresco Share. An open source and free of charge alternative to JRebel is HotSwapAgent. For more details, see the [HotSwapAgent website](http://hotswapagent.org/index.html). diff --git a/docs/advanced-topics/integration-testing/README.md b/docs/advanced-topics/integration-testing/README.md index 7ca3c716..f9b390b3 100644 --- a/docs/advanced-topics/integration-testing/README.md +++ b/docs/advanced-topics/integration-testing/README.md @@ -11,11 +11,11 @@ in an integration test plan to those aggregates, and delivers as its output the Even if the definition of integration testing is a general description, the concept is also valid for Alfresco projects. -The Alfresco SDK 4.1 keeps the same general idea of integration testing provided by SDK 3.0, but this new version reshapes it slightly to leverage on a +The Alfresco SDK 4.2 keeps the same general idea of integration testing provided by SDK 3.0, but this new version reshapes it slightly to leverage on a Docker-oriented environment. Here are the basics to understanding and using integration testing in the context of projects created with the SDK, from a technical perspective: -* SDK 4.1 develops integration tests for the platform only. Currently, the integration tests that the SDK is able to manage by default is related to +* SDK 4.2 develops integration tests for the platform only. Currently, the integration tests that the SDK is able to manage by default is related to Alfresco Content Services (ACS) only. * Integration tests require an ACS instance to be up and running. You will see that all the scripts and commands are designed to easily manage this requirement, but the prerequisite for the SDK is that an ACS instance is available. diff --git a/docs/advanced-topics/integration-testing/it-running.md b/docs/advanced-topics/integration-testing/it-running.md index 45d6c29d..0a9a2b37 100644 --- a/docs/advanced-topics/integration-testing/it-running.md +++ b/docs/advanced-topics/integration-testing/it-running.md @@ -5,7 +5,7 @@ Last reviewed: 2019-10-18 --- # How to run SDK's integration tests -Running the integration tests of a project generated from the Alfresco SDK 4.1 archetypes is pretty easy. Let's distinguish different cases of executing the +Running the integration tests of a project generated from the Alfresco SDK 4.2 archetypes is pretty easy. Let's distinguish different cases of executing the integration tests. ## Command line diff --git a/docs/advanced-topics/integration-testing/it-working.md b/docs/advanced-topics/integration-testing/it-working.md index 29ad4e4f..358018d4 100644 --- a/docs/advanced-topics/integration-testing/it-working.md +++ b/docs/advanced-topics/integration-testing/it-working.md @@ -36,7 +36,7 @@ or set the Java system property `acs.endpoint.path`. ## Integration tests configuration in the All-In-One project -So, taking into account the previous section, let's see how the integration tests are configured in a project generated from the SDK 4.1 All-In-One archetype. +So, taking into account the previous section, let's see how the integration tests are configured in a project generated from the SDK 4.2 All-In-One archetype. * The maven dependencies required to execute the integration tests are deployed to the ACS Docker image in the `PROJECT_ARTEFACTID-platform-docker` maven module using the `maven-dependency-plugin`. The configuration is done in the file `PROJECT_ARTEFACTID-platform-docker/pom.xml`: diff --git a/docs/advanced-topics/switching-versions.md b/docs/advanced-topics/switching-versions.md index d48a3fef..5e6973b0 100644 --- a/docs/advanced-topics/switching-versions.md +++ b/docs/advanced-topics/switching-versions.md @@ -28,7 +28,7 @@ The supported versions are explained in the next sections of this article. ## Switch to Alfresco version 6.0.x -Starting from a newly created Alfresco SDK 4.1 project (All-In-One, Platform JAR, or Share JAR), let’s replace the two properties with the following ones. +Starting from a newly created Alfresco SDK 4.2 project (All-In-One, Platform JAR, or Share JAR), let’s replace the two properties with the following ones. 1. Open the pom.xml in your generated project. @@ -60,7 +60,7 @@ about wrong JDK versions. ## Switch to Alfresco version 6.1.x -Starting from a newly created Alfresco SDK 4.1 project (All-In-One, Platform JAR, or Share JAR), let’s replace the two properties with the following ones. +Starting from a newly created Alfresco SDK 4.2 project (All-In-One, Platform JAR, or Share JAR), let’s replace the two properties with the following ones. 1. Open the pom.xml in your generated project. diff --git a/docs/advanced-topics/upgrading.md b/docs/advanced-topics/upgrading.md index 5be8ccb6..05271998 100644 --- a/docs/advanced-topics/upgrading.md +++ b/docs/advanced-topics/upgrading.md @@ -3,13 +3,13 @@ Title: Upgrading Added: v4.0.0 Last reviewed: 2019-01-29 --- -# Upgrading an SDK 3.0 project to SDK 4.1 +# Upgrading an SDK 3.0 project to SDK 4.2 -In these instructions, "base" refers to a freshly instantiated SDK 4.1 and "target" refers to the SDK 3.0.1 project that is being upgraded. +In these instructions, "base" refers to a freshly instantiated SDK 4.2 and "target" refers to the SDK 3.0.1 project that is being upgraded. ## Download a base -Download or instantiate an SDK 4.1 project to use as a base for copying files. +Download or instantiate an SDK 4.2 project to use as a base for copying files. For example, you might create a new project called `test-aio-400` to use as a base from which to copy files into the target project that is to be upgraded. @@ -65,7 +65,7 @@ Similar to previous step, the directory should follow the same pattern as the ex Need to smartly do this merge so that target project maintains its dependencies, name, version, description, etc. -1. Copy the entire `` element from the base 4.1 pom.xml into the target 3.0 pom.xml, replacing the existing one completely. +1. Copy the entire `` element from the base 4.2 pom.xml into the target 3.0 pom.xml, replacing the existing one completely. 2. Change the `acs.host` property to match the target project name. @@ -220,7 +220,7 @@ Then that would need to be moved into the share docker module's pom.xml file in ## Changes to the integration-tests module -1. Completely replace the pom.xml file with the pom.xml file from the 4.1 pom.xml file under integration-tests. +1. Completely replace the pom.xml file with the pom.xml file from the 4.2 pom.xml file under integration-tests. 2. Edit the integration-tests pom.xml to replace references to the base project name with references to the target project name. @@ -230,7 +230,7 @@ Then that would need to be moved into the share docker module's pom.xml file in ## Changes to the platform-jar module -Smartly merge the pom.xml file from the 4.1 platform-jar module into the existing platform-jar module pom.xml file. +Smartly merge the pom.xml file from the 4.2 platform-jar module into the existing platform-jar module pom.xml file. Maintain the dependencies from the 3.0 platform-jar module pom.xml. @@ -238,13 +238,13 @@ Any old "platformModule" dependencies, which are typically AMPs or JARs that nee ## Changes to the share-jar module -Smartly merge the pom.xml file from the 4.1 share-jar module into the existing share-jar module pom.xml file. +Smartly merge the pom.xml file from the 4.2 share-jar module into the existing share-jar module pom.xml file. Maintain the dependencies from the 3.0 share-jar module pom.xml. Any old "shareModule" dependencies, which are typically AMPs or JARs that need to be installed in the Share tier need to be copied into this pom.xml's depdencies. -Remove the spring-surf-api dependency from the 4.1 share-jar module. Remove: +Remove the spring-surf-api dependency from the 4.2 share-jar module. Remove: ``` diff --git a/docs/getting-started.md b/docs/getting-started.md index e8fcbf82..f4e73ecb 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -1,15 +1,15 @@ --- -Title: Getting started with Alfresco SDK 4.1 +Title: Getting started with Alfresco SDK 4.2 Added: v2.1.1 Last reviewed: 2019-10-18 --- -# Getting started with Alfresco SDK 4.1 +# Getting started with Alfresco SDK 4.2 -Use these instructions to get started with using Alfresco SDK 4.1. +Use these instructions to get started with using Alfresco SDK 4.2. ## Prerequisites -There are a number of software requirements for using Alfresco SDK 4.1. +There are a number of software requirements for using Alfresco SDK 4.2. * Java Development Kit (JDK) - Version 11 * Maven - Version 3.3 * Docker - Latest stable version @@ -46,7 +46,7 @@ JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-11.0.1.jdk/Contents/Home Alfresco recommends that you keep up-to-date with all the Maven releases. Linux distributions and package managers tend to bundle older releases and this is the most common pitfall. -Alfresco SDK 4.1 requires Maven 3.3.0+, but you are recommended to download the latest version. +Alfresco SDK 4.2 requires Maven 3.3.0+, but you are recommended to download the latest version. 1. Download and install [Apache Maven](https://maven.apache.org/download.cgi) and make sure it is configured correctly on your path. @@ -95,7 +95,7 @@ mvn archetype:generate -Dfilter=org.alfresco: ``` You'll be prompted to select the archetype you want. The previously available archetypes, alfresco-amp-archetype and share-amp-archetype will still show up -as an option, however these archetypes are not part of Alfresco SDK 4.1. +as an option, however these archetypes are not part of Alfresco SDK 4.2. Attention: You'll need double quotes around the filter part if you are using Windows Powershell: mvn archetype:generate "-Dfilter=org.alfresco:". @@ -132,9 +132,11 @@ Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version: 8: 2.2.0 9: 3.0.0 10: 3.0.1 -11: 4.0.0 -12: 4.1.0 -13: 4.2.0 +11: 3.1.0 +12: 4.0.0-beta-1 +13: 4.0.0 +14: 4.1.0 +15: 4.2.0 ``` 4. Next you will be prompted for additional values, like groupId, artifactId, and package, as shown below: @@ -190,7 +192,7 @@ If everything has been configured correctly, you should see something similar to [INFO] ------------------------------------------------------------------------ ``` -7. You have successfully generated your first SDK 4.1 project. +7. You have successfully generated your first SDK 4.2 project. Inside the project, you will find the `run.bat` and `run.sh` scripts. These are convenience scripts for you to quickly compile / test / run your project. diff --git a/docs/mvn-archetypes.md b/docs/mvn-archetypes.md index dab32358..200b9cef 100644 --- a/docs/mvn-archetypes.md +++ b/docs/mvn-archetypes.md @@ -5,17 +5,17 @@ Last reviewed: 2019-10-18 --- # Alfresco SDK Maven archetypes -The Alfresco SDK 4.1 comes with a number of Maven archetypes that can be used to generate Alfresco extension projects. +The Alfresco SDK 4.2 comes with a number of Maven archetypes that can be used to generate Alfresco extension projects. -For more details, see [Getting started with Alfresco SDK 4.1](getting-started.md). +For more details, see [Getting started with Alfresco SDK 4.2](getting-started.md). These archetypes are available during the creation of a brand new project. In short, a [Maven archetype](https://maven.apache.org/guides/introduction/introduction-to-archetypes.html) is a project templating toolkit. It's defined as an original pattern or model from which all other things of the same kind are made. Using archetypes provides a great way to enable developers to quickly follow best practice in a consistent way. This is valid for every project built with Apache Maven and -it's valid in particular when using Alfresco SDK 4.1. +it's valid in particular when using Alfresco SDK 4.2. -In this section we are going to introduce all the available archetypes in Alfresco SDK 4.1, with a brief description of their purpose and main use. -After reading this information, you should be able to understand the various possibilities that Alfresco SDK 4.1 can offer to developers, in terms of +In this section we are going to introduce all the available archetypes in Alfresco SDK 4.2, with a brief description of their purpose and main use. +After reading this information, you should be able to understand the various possibilities that Alfresco SDK 4.2 can offer to developers, in terms of projects. When generating your project, you'll be prompted to select the Maven archetype you want to use through an interactive menu, similar to what you can see below. @@ -55,7 +55,7 @@ Please note that the numbering is not sequential and some numbers may be skipped ### org.alfresco.maven.archetype:alfresco-allinone-archetype This archetype allows a developer to implement the All-In-One project on Alfresco Content Services. The All-In-One project (also called AIO) is provided in -this and previous versions of Alfresco SDK, but in SDK 4.1 it has been reshaped to leverage on Docker. +this and previous versions of Alfresco SDK, but in SDK 4.2 it has been reshaped to leverage on Docker. The All-In-One archetype allows a developer to create a multi-module project on Alfresco Content Services. The All-In-One project mainly includes a module for the core repository in ACS and a module for the Share client. This includes: diff --git a/docs/setting-up-your-development-environment/dev-env-eclipse.md b/docs/setting-up-your-development-environment/dev-env-eclipse.md index 31e88aaa..8cd85889 100644 --- a/docs/setting-up-your-development-environment/dev-env-eclipse.md +++ b/docs/setting-up-your-development-environment/dev-env-eclipse.md @@ -9,7 +9,7 @@ The Maven Alfresco SDK is designed to work well with Eclipse. This support inclu Alfresco SDK. Here we assume you already have an Eclipse installation up and running, together with an available Alfresco project created using the Alfresco SDK. If you -don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.1](../getting-started.md) to learn how to quickly generate it in a few +don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.2](../getting-started.md) to learn how to quickly generate it in a few easy steps. ## Importing the Alfresco project into Eclipse diff --git a/docs/setting-up-your-development-environment/dev-env-intellij.md b/docs/setting-up-your-development-environment/dev-env-intellij.md index 83a69c87..9dde6ac7 100644 --- a/docs/setting-up-your-development-environment/dev-env-intellij.md +++ b/docs/setting-up-your-development-environment/dev-env-intellij.md @@ -9,7 +9,7 @@ The Maven Alfresco SDK is designed to work well with Eclipse. This support inclu Alfresco SDK. Here we assume you already have an Eclipse installation up and running, together with an available Alfresco project created using the Alfresco SDK. If you -don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.1](../getting-started.md) to learn how to quickly generate it in a few +don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.2](../getting-started.md) to learn how to quickly generate it in a few easy steps. ## Importing the Alfresco project into Intellij IDEA diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 983f5c6a..6b5e2a7e 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -5,7 +5,7 @@ Last reviewed: 2019-10-18 --- # Troubleshooting -This article describes a list of common issues with the projects generated from the Alfresco SDK 4.1 archetypes and the way to troubleshoot them. +This article describes a list of common issues with the projects generated from the Alfresco SDK 4.2 archetypes and the way to troubleshoot them. * [Incorrect JDK version](#incorrect-jdk-version) * [Containers synchronization](#containers-synchronization) diff --git a/docs/working-with-generated-projects/README.md b/docs/working-with-generated-projects/README.md index 3bc5d44d..68569cf0 100644 --- a/docs/working-with-generated-projects/README.md +++ b/docs/working-with-generated-projects/README.md @@ -5,10 +5,10 @@ Last reviewed: 2019-10-18 --- # Working with generated projects -After generating a project using one of the Alfresco SDK 4.1 Maven archetypes, it is important to know how to build / run / test these projects. +After generating a project using one of the Alfresco SDK 4.2 Maven archetypes, it is important to know how to build / run / test these projects. The Alfresco Platform 6 deployment architecture is highly based on container technologies, specifically in [Docker](http://docs.alfresco.com/6.0/concepts/master-deploy.html). -Due to that, the projects generated using the Alfresco SDK 4.1 archetypes set up their local environment making an intensive use of Docker and Docker compose +Due to that, the projects generated using the Alfresco SDK 4.2 archetypes set up their local environment making an intensive use of Docker and Docker compose technologies. If you're not familiar with these technologies, it is highly recommended visiting the [Docker documentation website](https://docs.docker.com). This site offers @@ -21,7 +21,7 @@ a great quantity of training resources about [Docker](https://docs.docker.com/ge ## Project structures After generating your project, using one of the Maven archetypes, review the project structure. The directory structure and content of each folder and file -can help you to understand how to start developing with the Alfresco SDK 4.1. Before continuing, make sure that you have read and completed the tasks in the +can help you to understand how to start developing with the Alfresco SDK 4.2. Before continuing, make sure that you have read and completed the tasks in the [Getting started](../getting-started.md) tutorial. The structure of the project and the purpose of the files it contains vary according to the [Maven archetype](../mvn-archetypes.md) used to generate the project @@ -33,7 +33,7 @@ itself. The following links provide detailed descriptions of the different proje ## Run script -All the projects generated using the Alfresco SDK 4.1 archetypes provide a utility script to work with the project. This script is `run.sh` for Unix systems +All the projects generated using the Alfresco SDK 4.2 archetypes provide a utility script to work with the project. This script is `run.sh` for Unix systems and `run.bat` for Windows systems. The execution of this script must be followed by a parameter that dictates the task to be executed in the project. The list of available tasks is: diff --git a/docs/working-with-generated-projects/working-with-aio.md b/docs/working-with-generated-projects/working-with-aio.md index ee288e30..36552d41 100644 --- a/docs/working-with-generated-projects/working-with-aio.md +++ b/docs/working-with-generated-projects/working-with-aio.md @@ -78,7 +78,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] -[INFO] AIO - SDK 4.1 +[INFO] AIO - SDK 4.2 [INFO] Alfresco Platform/Repository JAR Module [INFO] Alfresco Share JAR Module [INFO] Integration Tests Module @@ -88,7 +88,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] -[INFO] AIO - SDK 4.1 ...................................... SUCCESS [ 0.680 s] +[INFO] AIO - SDK 4.2 ...................................... SUCCESS [ 0.680 s] [INFO] Alfresco Platform/Repository JAR Module ............ SUCCESS [ 5.461 s] [INFO] Alfresco Share JAR Module .......................... SUCCESS [ 0.557 s] [INFO] Integration Tests Module ........................... SUCCESS [ 0.900 s] From c69d51a495a6d3444b13c96ccbc01d448fed254c Mon Sep 17 00:00:00 2001 From: gfertuso Date: Mon, 25 Jan 2021 17:46:01 +0000 Subject: [PATCH 4/9] fix SDK version in mvn-archetypes.md --- docs/mvn-archetypes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/mvn-archetypes.md b/docs/mvn-archetypes.md index 200b9cef..06891e82 100644 --- a/docs/mvn-archetypes.md +++ b/docs/mvn-archetypes.md @@ -55,7 +55,7 @@ Please note that the numbering is not sequential and some numbers may be skipped ### org.alfresco.maven.archetype:alfresco-allinone-archetype This archetype allows a developer to implement the All-In-One project on Alfresco Content Services. The All-In-One project (also called AIO) is provided in -this and previous versions of Alfresco SDK, but in SDK 4.2 it has been reshaped to leverage on Docker. +this and previous versions of Alfresco SDK, but in SDK 4.1 it has been reshaped to leverage on Docker. The All-In-One archetype allows a developer to create a multi-module project on Alfresco Content Services. The All-In-One project mainly includes a module for the core repository in ACS and a module for the Share client. This includes: From a93af82a2bb4f20f760006fa95480443afe5704c Mon Sep 17 00:00:00 2001 From: Andrea Ligios <11974750+andrea-ligios@users.noreply.github.com> Date: Tue, 2 Feb 2021 19:05:55 +0100 Subject: [PATCH 5/9] travis migration (#607) * Migrated to Travis Co-authored-by: gfertuso --- .pre-commit-config.yaml | 10 ++++++++ .travis.yml | 52 +++++++++++++++++++++++++++++++++++++++++ pom.xml | 14 +++++++++++ settings.xml | 42 +++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+) create mode 100644 .pre-commit-config.yaml create mode 100644 .travis.yml create mode 100644 settings.xml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 00000000..0da5a3c5 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,10 @@ +default_language_version: + # force all unspecified python hooks to run python3 + python: python3 + +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.4.0 + hooks: + - id: check-yaml + args: [--allow-multiple-documents] \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..b88dfb9e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,52 @@ +import: + - source: Alfresco/alfresco-build-tools:.travis.java.yml@v1.0.1 + +dist: focal + +git: + depth: false + quiet: true + +branches: + only: + - master + - /feature\/.*/ + - /fix\/.*/ + +stages: + - name: test + if: commit_message !~ /\[skip tests\]/ + - name: release + if: commit_message ~= /\[release\]/ AND branch = master AND type != push AND type != pull_request AND fork = false + +env: + global: + - MAVEN_INSTALL_CMD="mvn clean install -B" + +jobs: + include: + + - name: "default version" + stage: test + script: + - ${MAVEN_INSTALL_CMD} + + - name: "6.2 Enterprise" + stage: test + script: + - ${MAVEN_INSTALL_CMD} -Penterprise-62-tests + + - name: "6.2 Community" + stage: test + script: + - ${MAVEN_INSTALL_CMD} -Pcommunity-62-tests + + - name: "6.1 Enterprise" + stage: test + script: + - ${MAVEN_INSTALL_CMD} -Penterprise-61-tests + + - name: "6.1 Community" + stage: test + script: + - ${MAVEN_INSTALL_CMD} -Pcommunity-61-tests diff --git a/pom.xml b/pom.xml index cadf9869..10ce20bd 100644 --- a/pom.xml +++ b/pom.xml @@ -241,6 +241,15 @@ + + central + Central Repository + https://repo.maven.apache.org/maven2 + default + + false + + alfresco-public https://artifacts.alfresco.com/nexus/content/groups/public @@ -254,6 +263,11 @@ true + + alfresco-private-repository + https://artifacts.alfresco.com/nexus/content/groups/private + + activiti-private-repository diff --git a/settings.xml b/settings.xml new file mode 100644 index 00000000..14c9a005 --- /dev/null +++ b/settings.xml @@ -0,0 +1,42 @@ + + + + + + alfresco-private-repository + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + + + activiti-private-repository + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + + + alfresco-public-snapshots + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + + + alfresco-public + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + + + alfresco-plugin-public + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + + + alfresco-plugin-public-snapshots + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + + + alfresco-internal-snapshots + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + + + From 51d053a7f873748a327897e2b71012ecfcf62c29 Mon Sep 17 00:00:00 2001 From: Andrea Ligios <11974750+andrea-ligios@users.noreply.github.com> Date: Tue, 2 Feb 2021 19:25:01 +0100 Subject: [PATCH 6/9] Added sdk-4.2 branch under Travis control --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b88dfb9e..eaca166b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ branches: - master - /feature\/.*/ - /fix\/.*/ + - sdk-4.2 stages: - name: test From 447ff43b75075e06df28da411495722a1afdbcbd Mon Sep 17 00:00:00 2001 From: Andrea Ligios <11974750+andrea-ligios@users.noreply.github.com> Date: Thu, 4 Feb 2021 11:05:56 +0100 Subject: [PATCH 7/9] Dev/sdk 4.2 keystore (#608) * Keystore Test (should fix 7 and break 6) * Enterprise images pulled from quay.io --- .travis.yml | 15 ++++++++++++++- .../archetype-resources/docker/docker-compose.yml | 11 ++++++++++- .../archetype-resources/docker/docker-compose.yml | 11 ++++++++++- pom.xml | 14 +++++++------- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index eaca166b..2b9d3f9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ import: + - source: Alfresco/alfresco-build-tools:.travis.docker_login.yml@v1.0.1 - source: Alfresco/alfresco-build-tools:.travis.java.yml@v1.0.1 + - source: Alfresco/alfresco-build-tools:.travis.pre-commit.yml@v1.0.1 dist: focal @@ -13,6 +15,7 @@ branches: - /feature\/.*/ - /fix\/.*/ - sdk-4.2 + - /dev\/sdk-4.2-keystore/ stages: - name: test @@ -23,7 +26,7 @@ stages: env: global: - MAVEN_INSTALL_CMD="mvn clean install -B" - + jobs: include: @@ -32,6 +35,16 @@ jobs: script: - ${MAVEN_INSTALL_CMD} + - name: "7.0 Enterprise" + stage: test + script: + - ${MAVEN_INSTALL_CMD} -Penterprise-70-tests + + - name: "7.0 Community" + stage: test + script: + - ${MAVEN_INSTALL_CMD} -Pcommunity-70-tests + - name: "6.2 Enterprise" stage: test script: diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index e771e082..7e0dffe9 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -19,6 +19,15 @@ services: dockerfile: ./Dockerfile context: ../../../${rootArtifactId}-platform-docker/target environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=AES + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=AES" CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888" ports: - "${symbol_dollar}{acs.port}:8080" @@ -57,4 +66,4 @@ volumes: ${rootArtifactId}-db-volume: external: true ${rootArtifactId}-ass-volume: - external: true \ No newline at end of file + external: true diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index 7ac0fe2d..fd7bacc5 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -15,6 +15,15 @@ services: dockerfile: ./Dockerfile context: ../../../target environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=AES + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=AES" CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888" ports: - "${symbol_dollar}{acs.port}:8080" @@ -53,4 +62,4 @@ volumes: ${rootArtifactId}-db-volume: external: true ${rootArtifactId}-ass-volume: - external: true \ No newline at end of file + external: true diff --git a/pom.xml b/pom.xml index 10ce20bd..57600384 100644 --- a/pom.xml +++ b/pom.xml @@ -349,8 +349,8 @@ acs-packaging 6.1.0 6.1.0 - alfresco/alfresco-content-repository - alfresco/alfresco-share + quay.io/alfresco/alfresco-content-repository + quay.io/alfresco/alfresco-share @@ -373,8 +373,8 @@ acs-packaging 6.2.0 6.2.0 - alfresco/alfresco-content-repository - alfresco/alfresco-share + quay.io/alfresco/alfresco-content-repository + quay.io/alfresco/alfresco-share @@ -397,8 +397,8 @@ acs-packaging 7.0.0-A20 7.0.0-M3 - alfresco/alfresco-content-repository - alfresco/alfresco-share + quay.io/alfresco/alfresco-content-repository + quay.io/alfresco/alfresco-share @@ -517,4 +517,4 @@ --> - \ No newline at end of file + From 6a68bb9946ad3b3e05a6e07f55dac29624f37e17 Mon Sep 17 00:00:00 2001 From: Andrea Ligios Date: Thu, 4 Feb 2021 13:07:08 +0100 Subject: [PATCH 8/9] Dynamic Keystore settings + APL2 License fix --- .../docker/docker-compose.yml | 10 +- .../resources/archetype-resources/pom.xml | 2 + .../docker/docker-compose.yml | 10 +- .../resources/archetype-resources/pom.xml | 4 +- .../docker/docker-compose.yml | 3 +- .../resources/archetype-resources/pom.xml | 2 + pom.xml | 182 ++++++++++-------- 7 files changed, 109 insertions(+), 104 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index 7e0dffe9..08be87f1 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -19,15 +19,7 @@ services: dockerfile: ./Dockerfile context: ../../../${rootArtifactId}-platform-docker/target environment: - JAVA_TOOL_OPTIONS: " - -Dencryption.keystore.type=JCEKS - -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding - -Dencryption.keyAlgorithm=AES - -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore - -Dmetadata-keystore.password=mp6yc0UD9e - -Dmetadata-keystore.aliases=metadata - -Dmetadata-keystore.metadata.password=oKIWzVdEdA - -Dmetadata-keystore.metadata.algorithm=AES" + JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}" CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888" ports: - "${symbol_dollar}{acs.port}:8080" diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml index 19fa760f..f39ddfe0 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml @@ -29,6 +29,8 @@ @@alfresco.platform.docker.image@@ @@alfresco.share.docker.image@@ + @@keystore.settings@@ + 1.1.8 diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index fd7bacc5..0178f58b 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -15,15 +15,7 @@ services: dockerfile: ./Dockerfile context: ../../../target environment: - JAVA_TOOL_OPTIONS: " - -Dencryption.keystore.type=JCEKS - -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding - -Dencryption.keyAlgorithm=AES - -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore - -Dmetadata-keystore.password=mp6yc0UD9e - -Dmetadata-keystore.aliases=metadata - -Dmetadata-keystore.metadata.password=oKIWzVdEdA - -Dmetadata-keystore.metadata.algorithm=AES" + JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}" CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888" ports: - "${symbol_dollar}{acs.port}:8080" diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml index f2c9fd80..08299042 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml @@ -25,6 +25,8 @@ @@alfresco.platform.docker.image@@ @@alfresco.share.docker.image@@ + @@keystore.settings@@ + 1.1.8 @@ -531,4 +533,4 @@ - \ No newline at end of file + diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index 05cfbe37..8ce05daf 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -32,6 +32,7 @@ services: # -Dtransform.service.enabled=false # -Dlocal.transform.service.enabled=false # -Dlegacy.transform.service.enabled=false +# ${symbol_dollar}{keystore.settings} # " # ports: # - "${symbol_dollar}{acs.port}:8080" @@ -69,4 +70,4 @@ services: # ${rootArtifactId}-db-volume: # external: true # ${rootArtifactId}-ass-volume: -# external: true \ No newline at end of file +# external: true diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml index 9054f355..cbc3655c 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml @@ -25,6 +25,8 @@ @@alfresco.platform.docker.image@@ @@alfresco.share.docker.image@@ + @@keystore.settings@@ + 1.1.8 diff --git a/pom.xml b/pom.xml index 57600384..8f850a11 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ - GNU Lesser General Public License v3.0 or later - http://www.gnu.org/licenses/lgpl-3.0-standalone.html + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 @@ -33,85 +33,6 @@ alfresco-sdk-aggregator-4.2.0-SNAPSHOT - - - - ohej - Ole Hejlskov - ole@phpfreak.dk - http://ohej.dk/ - Alfresco - http://www.alfresco.com - +1 - - Developer - - - - gravitonian - Martin Bergljung - martin.bergljung@alfresco.com - https://sites.google.com/site/gravitonian/ - Alfresco Software - http://www.alfresco.com - +0 - - Architect - Developer - - - - - - - Gabriele Columbro - gabriele.columbro@alfresco.com - http://mindthegab.com - Alfresco Software - http://www.alfresco.com - -5 - - - Maurizio Pillitu - maurizio.pillitu@alfresco.com - http://session.it - Alfresco Software - http://www.alfresco.com - +1 - - - Carlo Sciolla - carlo@backbase.com - Backbase - http://www.backbase.com - +1 - http://skuro.tk - - - Samuel Langlois - samuel.langlois@alfresco.com - Alfresco Software - http://www.alfresco.com - +0 - https://twitter.com/samuel_langlois - - - Ray Gauss II - ray.gauss@alfresco.com - Alfresco Software - http://www.alfresco.com - -5 - http://rgauss.com/ - - - Jose Luis Osorno Gil - joseluis.osorno@ixxus.com - Ixxus - http://www.ixxus.com - +1 - - - @@ -123,7 +44,6 @@ archetypes/alfresco-share-jar-archetype archetypes/alfresco-allinone-archetype archetypes/archetypes-it - @@ -139,8 +59,17 @@ 7.0.0-M3 alfresco/alfresco-content-repository-community alfresco/alfresco-share - - + + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=AES + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=AES + + https://github.com/Alfresco/alfresco-sdk @@ -316,6 +245,7 @@ 6.0.b alfresco/alfresco-content-repository-community alfresco/alfresco-share + @@ -327,6 +257,7 @@ 6.0 alfresco/alfresco-content-repository alfresco/alfresco-share + @@ -340,6 +271,7 @@ 6.1.0-RC3 alfresco/alfresco-content-repository-community alfresco/alfresco-share + @@ -351,6 +283,7 @@ 6.1.0 quay.io/alfresco/alfresco-content-repository quay.io/alfresco/alfresco-share + @@ -364,6 +297,7 @@ 6.2.0 alfresco/alfresco-content-repository-community alfresco/alfresco-share + @@ -375,6 +309,7 @@ 6.2.0 quay.io/alfresco/alfresco-content-repository quay.io/alfresco/alfresco-share + @@ -517,4 +452,83 @@ --> + + + + ohej + Ole Hejlskov + ole@phpfreak.dk + http://ohej.dk/ + Alfresco + http://www.alfresco.com + +1 + + Developer + + + + gravitonian + Martin Bergljung + martin.bergljung@alfresco.com + https://sites.google.com/site/gravitonian/ + Alfresco Software + http://www.alfresco.com + +0 + + Architect + Developer + + + + + + + Gabriele Columbro + gabriele.columbro@alfresco.com + http://mindthegab.com + Alfresco Software + http://www.alfresco.com + -5 + + + Maurizio Pillitu + maurizio.pillitu@alfresco.com + http://session.it + Alfresco Software + http://www.alfresco.com + +1 + + + Carlo Sciolla + carlo@backbase.com + Backbase + http://www.backbase.com + +1 + http://skuro.tk + + + Samuel Langlois + samuel.langlois@alfresco.com + Alfresco Software + http://www.alfresco.com + +0 + https://twitter.com/samuel_langlois + + + Ray Gauss II + ray.gauss@alfresco.com + Alfresco Software + http://www.alfresco.com + -5 + http://rgauss.com/ + + + Jose Luis Osorno Gil + joseluis.osorno@ixxus.com + Ixxus + http://www.ixxus.com + +1 + + + From 56080682aafbfb69b3a06c359f784be2f66e5220 Mon Sep 17 00:00:00 2001 From: Andrea Ligios Date: Thu, 4 Feb 2021 13:15:20 +0100 Subject: [PATCH 9/9] Clean-up, release info --- .travis.yml | 3 +-- README.md | 9 ++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b9d3f9f..22344723 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ branches: - /feature\/.*/ - /fix\/.*/ - sdk-4.2 - - /dev\/sdk-4.2-keystore/ stages: - name: test @@ -30,7 +29,7 @@ env: jobs: include: - - name: "default version" + - name: "current version" stage: test script: - ${MAVEN_INSTALL_CMD} diff --git a/README.md b/README.md index 0c416ed1..8d19f3e8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ # [![Alfresco SDK logo](https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg)](#features) Alfresco SDK + +[![Build Status](https://travis-ci.com/Alfresco/alfresco-sdk.svg?branch=master)](https://travis-ci.com/Alfresco/alfresco-sdk) +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) +![GitHub](https://img.shields.io/github/license/Alfresco/alfresco-sdk?color=brightgreen) + This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to build extensions for the Alfresco Digital Business Platform. It is based on [Apache Maven](http://maven.apache.org/), compatible with major IDEs and enables [Rapid Application Development (RAD)](https://en.wikipedia.org/wiki/Rapid_application_development) and [Test Driven Development (TDD)](https://en.wikipedia.org/wiki/Test-driven_development). @@ -10,6 +15,7 @@ If you are an Enterprise customer check the [Support](#alfresco-enterprise-custo ## News +- 2020-02: Alfresco SDK 4.2.0 released - 2019-10: Alfresco SDK 4.1.0 released - 2019-03: Alfresco SDK 4.0.0 released - 2019-03: Alfresco SDK 3.1.0 released @@ -31,7 +37,8 @@ To get started with **Alfresco SDK 4.2.x** (latest) visit the [Alfresco Document #### Documentation about Previous Versions | SDK Version | Alfresco Enterprise Version | Alfresco Community Version | Documentation | | ------------- |:-------------:| :-----:|:-----| -| SDK 4.1 | Alfresco 6.0.x / 6.1.x / 6.2.x | Alfresco 6.0.x / 6.1.x / 6.2.x | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md | +| SDK 4.2 | Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x | Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md | +| SDK 4.1 | Alfresco 6.0.x / 6.1.x / 6.2.x | Alfresco 6.0.x / 6.1.x / 6.2.x | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.1/docs/README.md | | SDK 4.0 | Alfresco 6.0.x / 6.1.x | Alfresco 6.0.x / 6.1.x | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.0/docs/README.md | | SDK 3.1 | Alfresco 5.2.x | Alfresco 5.2.x | http://docs.alfresco.com/5.2/concepts/sdk-intro.html | | SDK 3.0 | Alfresco 5.2.x | Alfresco 5.2.x | http://docs.alfresco.com/5.2/concepts/sdk-intro.html |