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
2021-05-19 16:16:57 -04:00
parent 1a7c70792c a889607c48
commit 7c833c2093
2 changed files with 17 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,7 +203,7 @@
<plugin>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>amp-plugin</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<executions>
<execution>
<id>build-amp-file</id>
@@ -217,42 +217,26 @@
</execution>
</executions>
</plugin>
<!-- This plugin amends the default install and includes the built AMP. -->
<!-- This plugin enables/disables the AMP file during the install/deploy phases -->
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<executions>
<!-- install the AMP -->
<execution>
<id>install-amp</id>
<phase>${amp.install.phase}</phase>
<goals><goal>install-file</goal></goals>
<id>attach-amp</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>amp</packaging>
<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
</configuration>
</execution>
</executions>
</plugin>
<!-- This plugin amends the default deploy and includes the built AMP. -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<executions>
<!-- deploy the AMP -->
<execution>
<id>deploy-amp</id>
<phase>${amp.deploy.phase}</phase>
<goals><goal>deploy-file</goal></goals>
<configuration>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>amp</packaging>
<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
<artifacts>
<artifact>
<type>amp</type>
<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
</artifact>
</artifacts>
<skipAttach>${beedk.jar.notest.empty}</skipAttach>
</configuration>
</execution>
</executions>

33
beedk-amp-check-tile/tile.xml
View File

@@ -112,39 +112,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.inteligr8</groupId>
<artifactId>conditional-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<id>amp-install-phase</id>
<phase>initialize</phase>
<goals>
<goal>boolean-property</goal>
</goals>
<configuration>
<booleanProperty>beedk.jar.notest.empty</booleanProperty>
<trueValue>none</trueValue>
<falseValue>install</falseValue>
<newProperty>amp.install.phase</newProperty>
</configuration>
</execution>
<execution>
<id>amp-deploy-phase</id>
<phase>initialize</phase>
<goals>
<goal>boolean-property</goal>
</goals>
<configuration>
<booleanProperty>beedk.jar.notest.empty</booleanProperty>
<trueValue>none</trueValue>
<falseValue>deploy</falseValue>
<newProperty>amp.deploy.phase</newProperty>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>