diff --git a/README.md b/README.md index 49810a2..6797556 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Alfresco Process Services SDK Project 2.0.8 +# Alfresco Process Services SDK Project 2.0.9 The project consists of the following Maven submodules: @@ -14,10 +14,9 @@ The project consists of the following Maven submodules: # Prerequisites * OpenJDK 11 - * Apache Maven 3.8.4 + * Apache Maven 3.8.5 * Docker (optional) - * For running unit tests: valid _activiti.lic_ and _Aspose.Total.Java.lic_ in `/.activiti/enterprise-license` - * For integration tests and building containers: valid _activiti.lic_ and _Aspose.Total.Java.lic_ in `activiti-app-overlay-docker/src/main/docker/license` + * Put valid _activiti.lic_ and _Aspose.Total.Java.lic_ in the `/license` folder for running unit / integration tests and for building containers: * Access to the Alfresco Nexus Repositories (credentials provided by Alfresco) * Configure your Maven servers settings.xml with credentials for these repositories: @@ -168,7 +167,6 @@ After the integration tests execution stop all the APS containers with: `mvn docker:stop` # Building your Docker container (optional) - * Put a valid _activiti.lic_ and _Aspose.Total.Java.lic_ in `/activiti-app-overlay-docker/src/main/docker/license` * Update if you need _logback.xml_ in `/activiti-app-overlay-war/src/main/webapp/WEB-INF/classes` * Update if you need your _activiti-app.properties_ in `/activiti-app-overlay-docker/src/main/docker/properties` diff --git a/activiti-app-integration-tests/pom.xml b/activiti-app-integration-tests/pom.xml index 2ff4b2f..405906a 100644 --- a/activiti-app-integration-tests/pom.xml +++ b/activiti-app-integration-tests/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 activiti-app-integration-tests jar @@ -9,7 +7,7 @@ org.alfresco.activiti aps-project - 2.0.8 + 2.0.9 diff --git a/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java b/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java index 5198663..50ca1aa 100644 --- a/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java +++ b/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java @@ -53,7 +53,7 @@ public class FourEyesAppIT { protected static final String BASE_PATH_HOSTNAME = "localhost"; protected static final int BASE_PATH_PORT = 8080; - protected static final String appZipFile = "aps-extensions-jar-2.0.8-App.zip"; + protected static final String appZipFile = "aps-extensions-jar-2.0.9-App.zip"; protected static final String ACTIVITI_APP_BASE_PATH = BASE_PATH_PROTOCOL + "://" + BASE_PATH_HOSTNAME + ":" + BASE_PATH_PORT; diff --git a/activiti-app-overlay-docker/pom.xml b/activiti-app-overlay-docker/pom.xml index defb917..0bb8dfe 100644 --- a/activiti-app-overlay-docker/pom.xml +++ b/activiti-app-overlay-docker/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 activiti-app-overlay-docker jar @@ -9,7 +7,7 @@ org.alfresco.activiti aps-project - 2.0.8 + 2.0.9 @@ -175,6 +173,26 @@ + + copy-license-for-containers-and-ITs + pre-integration-test + + copy-resources + + + ${project.basedir}/src/main/docker/license + false + + + ${project.parent.basedir}/license + false + + *.lic + + + + + @@ -638,4 +656,4 @@ - + \ No newline at end of file diff --git a/activiti-app-overlay-war/pom.xml b/activiti-app-overlay-war/pom.xml index 2d71d4d..a95547a 100644 --- a/activiti-app-overlay-war/pom.xml +++ b/activiti-app-overlay-war/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 activiti-app-overlay-war war @@ -9,7 +7,7 @@ org.alfresco.activiti aps-project - 2.0.8 + 2.0.9 diff --git a/activiti-app-swagger-client/pom.xml b/activiti-app-swagger-client/pom.xml index 7618503..bb6e9ed 100644 --- a/activiti-app-swagger-client/pom.xml +++ b/activiti-app-swagger-client/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 activiti-app-swagger-client jar @@ -9,7 +7,7 @@ org.alfresco.activiti aps-project - 2.0.8 + 2.0.9 diff --git a/aps-extensions-jar/pom.xml b/aps-extensions-jar/pom.xml index 3d332b9..33981ba 100644 --- a/aps-extensions-jar/pom.xml +++ b/aps-extensions-jar/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 aps-extensions-jar jar @@ -9,7 +7,7 @@ org.alfresco.activiti aps-project - 2.0.8 + 2.0.9 @@ -225,7 +223,7 @@ - + @@ -278,11 +276,8 @@ generate-test-resources - - + + @@ -292,7 +287,32 @@ + + maven-resources-plugin + + + copy-license-for-unit-tests + generate-test-resources + + copy-resources + + + ${project.basedir}/src/test/resources + false + + + ${project.parent.basedir}/license + false + + *.lic + + + + + + + - + \ No newline at end of file diff --git a/activiti-app-overlay-docker/src/main/docker/license/README.md b/license/README.md similarity index 70% rename from activiti-app-overlay-docker/src/main/docker/license/README.md rename to license/README.md index 333f1d6..1afb782 100644 --- a/activiti-app-overlay-docker/src/main/docker/license/README.md +++ b/license/README.md @@ -1,3 +1,3 @@ -# License +# Alfresco Process Services - License files Put here your APS license file ( _activiti.lic_ ) and the Aspose license file ( _Aspose.Total.Java.lic_ ) \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6f8fa57..01b5875 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,11 @@ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.alfresco.activiti aps-project - 2.0.8 + 2.0.9 pom APS - SDK Project @@ -28,10 +26,10 @@ UTF-8 11 11 - 3.9.0 + 3.10.1 3.3.2 - 0.38.1 - 3.2.0 + 0.39.1 + 3.3.0 3.2.0 3.3.0 3.0.0-M5 @@ -135,7 +133,7 @@ false - + aps2.2.0 @@ -292,4 +290,4 @@ activiti-app-integration-tests - + \ No newline at end of file