Commit 4a3cebe2 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 0931a2c5 48c5fb00
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@
			<plugin>
				<groupId>com.inteligr8.alfresco</groupId>
				<artifactId>amp-plugin</artifactId>
				<version>1.0.6</version>
				<version>1.0.7</version>
				<executions>
					<execution>
						<id>build-amp-file</id>
@@ -212,6 +212,7 @@
							<goal>amp</goal>
						</goals>
						<configuration>
							<classifier>${alfresco.module.classifier}</classifier>
							<skip>${beedk.jar.notest.empty}</skip>
						</configuration>
					</execution>
@@ -308,6 +309,7 @@
				<!-- configurable -->
				<project.build.packageDirectory>${project.build.directory}/package</project.build.packageDirectory>
				<alfresco.module.pathname>${project.groupId}.${project.artifactId}</alfresco.module.pathname>
				<alfresco.module.classifier></alfresco.module.classifier>

				<!-- output -->
				<alfresco.module.path>alfresco/module/${alfresco.module.pathname}</alfresco.module.path>
+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@
    	<ats.version>2.3.6</ats.version>
    	<spring-boot.version>2.3.5.RELEASE</spring-boot.version>
    	
        <ate.app.className>${package}.Applicatoin</ate.app.className>
        <docker.image.registry>${dockerRegistryHost}</docker.image.registry>
        <docker.image.name>${dockerImagePrefix}/${project.artifactId}</docker.image.name>
        <docker.image.tag>${project.version}</docker.image.tag>
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@
 * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
 * #L%
 */
package ${groupId};
package ${package};

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
 * 
 * Copyright (C) 2020 - 2021 Inteligr8
 */
package ${groupId};
package ${package};

import java.io.File;
import java.util.Map;
+1 −1
Original line number Diff line number Diff line
package ${groupId};
package ${package};

import java.io.File;
import java.util.Map;
Loading