Added support for including APS license in the classpath (#39 , #40)

OpenPj · Mar 29, 2022 · a5d7ea4 · a5d7ea4
1 parent dd5732c
commit a5d7ea4
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 44 deletions.
diff --git 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 `<USER_HOME>/.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
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>activiti-app-integration-tests</artifactId>
 	<packaging>jar</packaging>
@@ -9,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.0.8</version>
+		<version>2.0.9</version>
 	</parent>
 
 	<properties>

diff --git a/...-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java b/...-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
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>activiti-app-overlay-docker</artifactId>
 	<packaging>jar</packaging>
@@ -9,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.0.8</version>
+		<version>2.0.9</version>
 	</parent>
 
 	<properties>
@@ -175,6 +173,26 @@
 							</resources>
 						</configuration>
 					</execution>
+					<execution>
+						<id>copy-license-for-containers-and-ITs</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.basedir}/src/main/docker/license</outputDirectory>
+							<overwrite>false</overwrite>
+							<resources>
+								<resource>
+									<directory>${project.parent.basedir}/license</directory>
+									<filtering>false</filtering>
+									<includes>
+										<include>*.lic</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -638,4 +656,4 @@
 		</profile>
 	</profiles>
 
-</project>
+</project>
diff --git a/activiti-app-overlay-war/pom.xml b/activiti-app-overlay-war/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>activiti-app-overlay-war</artifactId>
 	<packaging>war</packaging>
@@ -9,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.0.8</version>
+		<version>2.0.9</version>
 	</parent>
 
 	<dependencies>

diff --git a/activiti-app-swagger-client/pom.xml b/activiti-app-swagger-client/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>activiti-app-swagger-client</artifactId>
 	<packaging>jar</packaging>
@@ -9,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.0.8</version>
+		<version>2.0.9</version>
 	</parent>
 
 	<properties>

diff --git a/aps-extensions-jar/pom.xml b/aps-extensions-jar/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>aps-extensions-jar</artifactId>
 	<packaging>jar</packaging>
@@ -9,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.0.8</version>
+		<version>2.0.9</version>
 	</parent>
 
 	<dependencyManagement>
@@ -225,7 +223,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore />
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
@@ -278,11 +276,8 @@
 						<phase>generate-test-resources</phase>
 						<configuration>
 							<target>
-								<copy
-									todir="${project.basedir}/src/test/resources/activiti"
-									overwrite="true">
-									<file
-										file="${project.basedir}/src/test/resources/activiti/${aps.version}/version.properties" />
+								<copy todir="${project.basedir}/src/test/resources/activiti" overwrite="true">
+									<file file="${project.basedir}/src/test/resources/activiti/${aps.version}/version.properties" />
 								</copy>
 							</target>
 						</configuration>
@@ -292,7 +287,32 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-license-for-unit-tests</id>
+						<phase>generate-test-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.basedir}/src/test/resources</outputDirectory>
+							<overwrite>false</overwrite>
+							<resources>
+								<resource>
+									<directory>${project.parent.basedir}/license</directory>
+									<filtering>false</filtering>
+									<includes>
+										<include>*.lic</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
-</project>
+</project>
diff --git a/...-docker/src/main/docker/license/README.md → license/README.md b/...-docker/src/main/docker/license/README.md → 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_ ) 
diff --git 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.alfresco.activiti</groupId>
 	<artifactId>aps-project</artifactId>
-	<version>2.0.8</version>
+	<version>2.0.9</version>
 	<packaging>pom</packaging>
 	<name>APS - SDK Project</name>
 
@@ -28,10 +26,10 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
-		<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
 		<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-		<docker-maven-plugin.version>0.38.1</docker-maven-plugin.version>
-		<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
+		<docker-maven-plugin.version>0.39.1</docker-maven-plugin.version>
+		<maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
 		<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
 		<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
 		<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
@@ -135,7 +133,7 @@
 				<docker-maven-plugin.build.save>false</docker-maven-plugin.build.save>
 			</properties>
 		</profile>
-		
+
 		<profile>
 			<id>aps2.2.0</id>
 			<activation>
@@ -292,4 +290,4 @@
 		<module>activiti-app-integration-tests</module>
 	</modules>
 
-</project>
+</project>