inteligr8/ootbee-beedk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into stable

Browse Source
This commit is contained in:
Brian Long 2022-04-04 17:55:39 -04:00
commit 4a3cebe283
9 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beedk-acs-module-tile/tile.xml
View File

@ -203,7 +203,7 @@
<plugin> <plugin>
<groupId>com.inteligr8.alfresco</groupId> <groupId>com.inteligr8.alfresco</groupId>
<artifactId>amp-plugin</artifactId> <artifactId>amp-plugin</artifactId>
<version>1.0.6</version> <version>1.0.7</version>
<executions> <executions>
<execution> <execution>
<id>build-amp-file</id> <id>build-amp-file</id>
@ -212,6 +212,7 @@
<goal>amp</goal> <goal>amp</goal>
</goals> </goals>
<configuration> <configuration>
<classifier>${alfresco.module.classifier}</classifier>
<skip>${beedk.jar.notest.empty}</skip> <skip>${beedk.jar.notest.empty}</skip>
</configuration> </configuration>
</execution> </execution>
@ -308,6 +309,7 @@
<!-- configurable --> <!-- configurable -->
<project.build.packageDirectory>${project.build.directory}/package</project.build.packageDirectory> <project.build.packageDirectory>${project.build.directory}/package</project.build.packageDirectory>
<alfresco.module.pathname>${project.groupId}.${project.artifactId}</alfresco.module.pathname> <alfresco.module.pathname>${project.groupId}.${project.artifactId}</alfresco.module.pathname>
<alfresco.module.classifier></alfresco.module.classifier>
<!-- output --> <!-- output -->
<alfresco.module.path>alfresco/module/${alfresco.module.pathname}</alfresco.module.path> <alfresco.module.path>alfresco/module/${alfresco.module.pathname}</alfresco.module.path>

1
beedk-ate-archetype/src/main/resources/archetype-resources/pom.xml
View File

@ -18,6 +18,7 @@
<ats.version>2.3.6</ats.version> <ats.version>2.3.6</ats.version>
<spring-boot.version>2.3.5.RELEASE</spring-boot.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.registry>${dockerRegistryHost}</docker.image.registry>
<docker.image.name>${dockerImagePrefix}/${project.artifactId}</docker.image.name> <docker.image.name>${dockerImagePrefix}/${project.artifactId}</docker.image.name>
<docker.image.tag>${project.version}</docker.image.tag> <docker.image.tag>${project.version}</docker.image.tag>

2
beedk-ate-archetype/src/main/resources/archetype-resources/src/main/java/Application.java
View File

@ -24,7 +24,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package ${groupId}; package ${package};
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
beedk-ate-archetype/src/main/resources/archetype-resources/src/main/java/TransformerController.java
View File

@ -26,7 +26,7 @@
* *
* Copyright (C) 2020 - 2021 Inteligr8 * Copyright (C) 2020 - 2021 Inteligr8
*/ */
package ${groupId}; package ${package};
import java.io.File; import java.io.File;
import java.util.Map; import java.util.Map;

2
beedk-ate-archetype/src/main/resources/archetype-resources/src/main/java/TransformerImpl.java
View File

@ -1,4 +1,4 @@
package ${groupId}; package ${package};
import java.io.File; import java.io.File;
import java.util.Map; import java.util.Map;

2
beedk-ate-archetype/src/main/resources/archetype-resources/src/main/resources/application-default.yaml
View File

@ -11,4 +11,4 @@ transform:
logging: logging:
level: level:
${groupId}: ${dollar}{LOG_LEVEL:info} ${package}: ${dollar}{LOG_LEVEL:info}

2
beedk-ate-archetype/src/main/resources/archetype-resources/src/test/java/HttpRequestIT.java
View File

@ -24,7 +24,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package ${groupId}; package ${package};
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

2
beedk-ate-archetype/src/main/resources/archetype-resources/src/test/java/TransformerControllerTest.java
View File

@ -1,4 +1,4 @@
package ${groupId}; package ${package};
import org.alfresco.transformer.AbstractTransformerController; import org.alfresco.transformer.AbstractTransformerController;
import org.junit.Ignore; import org.junit.Ignore;

6
beedk-springboot-docker-base-tile/tile.xml
View File

@ -38,7 +38,8 @@
<executions> <executions>
<execution> <execution>
<id>copy-jar</id> <id>copy-jar</id>
<phase>package</phase> <!-- want to use 'package', but needs to be after sprintboot repackage -->
<phase>pre-integration-test</phase>
<goals> <goals>
<goal>copy-resources</goal> <goal>copy-resources</goal>
</goals> </goals>
@ -81,7 +82,8 @@
<executions> <executions>
<execution> <execution>
<id>docker-build</id> <id>docker-build</id>
<phase>package</phase> <!-- want to use 'package', but needs to be after sprintboot repackage -->
<phase>pre-integration-test</phase>
<goals><goal>build</goal></goals> <goals><goal>build</goal></goals>
<configuration> <configuration>
<skipPush>true</skipPush> <skipPush>true</skipPush>