You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/10/29 20:28:06 UTC

[isis] 11/23: ISIS-2094: debugging of simple app build

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit d29f57ab295a0732a27cdb24e3a989b0a41e5de1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 28 17:45:50 2019 +0000

    ISIS-2094: debugging of simple app build
---
 build-example-apps.sh | 10 +++++++---
 examples/pom.xml      | 34 +++++++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/build-example-apps.sh b/build-example-apps.sh
index 808c157..3f37676 100644
--- a/build-example-apps.sh
+++ b/build-example-apps.sh
@@ -16,10 +16,11 @@ echo ""
 echo ""
 echo ""
 
-cd examples/apps/$APP_NAME
+cd examples
 
-mvn -s ../../../.m2/settings.xml \
+mvn -s ../.m2/settings.xml \
     --batch-mode \
+    -Dexample-apps \
     clean deploy \
     -Dgcpappenginerepo-deploy \
     -Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL \
@@ -28,6 +29,9 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
+cd ..
+cd examples/apps/$APP_NAME
+
 mvn --batch-mode \
     install \
     -Drevision=$REVISION \
@@ -55,5 +59,5 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-cd ..
+cd ../../..
 
diff --git a/examples/pom.xml b/examples/pom.xml
index c19e227..10a9931 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -52,6 +52,33 @@
 	<profiles>
 
 		<profile>
+			<id>default-apps</id>
+			<activation>
+				<property>
+					<name>!example-apps</name>
+				</property>
+			</activation>
+			<modules>
+				<module>apps/helloworld</module>
+				<module>apps/simpleapp</module>
+				<module>apps/demo</module>
+				<module>smoketests</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>example-apps</id>
+			<activation>
+				<property>
+					<name>example-apps</name>
+				</property>
+			</activation>
+			<modules>
+				<module>apps/helloworld</module>
+				<module>apps/simpleapp</module>
+			</modules>
+		</profile>
+
+		<profile>
 			<id>jdk11</id>
 			<activation>
 				<jdk>[11,)</jdk>
@@ -273,16 +300,9 @@
 				<type>pom</type>
 			</dependency>
 
-
 		</dependencies>
 	</dependencyManagement>
 
-	<modules>
-		<module>apps/helloworld</module>
-		<module>apps/simpleapp</module>
-		<module>apps/demo</module>
-		<module>smoketests</module>
-	</modules>
 
 </project>