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-18 12:38:01 -04:00
parent 155ef084e9 d13678e9e0
commit dea15ab95d
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,7 +225,7 @@
<!-- install the AMP -->
<execution>
<id>install-amp</id>
<phase>install</phase>
<phase>${amp.install.phase}</phase>
<goals><goal>install-file</goal></goals>
<configuration>
<groupId>${project.groupId}</groupId>
@@ -233,7 +233,6 @@
<version>${project.version}</version>
<packaging>amp</packaging>
<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
<skip>${beedk.jar.notest.empty}</skip>
</configuration>
</execution>
</executions>
@@ -246,7 +245,7 @@
<!-- deploy the AMP -->
<execution>
<id>deploy-amp</id>
<phase>deploy</phase>
<phase>${amp.deploy.phase}</phase>
<goals><goal>deploy-file</goal></goals>
<configuration>
<groupId>${project.groupId}</groupId>
@@ -254,7 +253,6 @@
<version>${project.version}</version>
<packaging>amp</packaging>
<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
<skip>${beedk.jar.notest.empty}</skip>
</configuration>
</execution>
</executions>

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

@@ -56,7 +56,7 @@
<plugin>
<groupId>com.inteligr8</groupId>
<artifactId>regex-maven-plugin</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<executions>
<execution>
<id>string-2-boolean-1</id>
@@ -112,6 +112,39 @@
</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>