You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/11/20 16:16:19 UTC

[isis] 02/05: ISIS-2181: debugging build of helloworld app

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

danhaywood pushed a commit to branch ISIS-2181
in repository https://gitbox.apache.org/repos/asf/isis.git

View the commit online:
https://github.com/apache/isis/commit/6a1047ca837d2ae2f584cb44ac224557fecd09d5

commit 6a1047ca837d2ae2f584cb44ac224557fecd09d5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 20 11:07:55 2019 +0000

    ISIS-2181: debugging build of helloworld app
---
 core/pom.xml                     | 11 +-------
 examples/apps/helloworld/pom.xml |  8 ------
 starters/pom.xml                 | 56 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index b0c0aa9..bac220f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,15 +21,6 @@
 		<relativePath>../core-parent/pom.xml</relativePath>
 	</parent>
 
-<!--
-	<parent>
-		<groupId>org.apache</groupId>
-		<artifactId>apache</artifactId>
-		<version>21</version>
-		<relativePath/>
-	</parent>
--->
-
 	<groupId>org.apache.isis.core</groupId>
 	<artifactId>isis</artifactId>
 	<version>2.0.0-M3-SNAPSHOT</version>
@@ -662,7 +653,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-report-plugin</artifactId>
-					<version>[2.22,3)</version>
+					<version>2.22.2</version>
 					<!-- goal:report is a report so is configured in the reporting section; 
 						invokes phase:test before running itself -->
 				</plugin>
diff --git a/examples/apps/helloworld/pom.xml b/examples/apps/helloworld/pom.xml
index 125f735..eee2e97 100644
--- a/examples/apps/helloworld/pom.xml
+++ b/examples/apps/helloworld/pom.xml
@@ -130,14 +130,6 @@
 					<plugin>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
-						<version>${spring-boot.version}</version>
-						<executions>
-							<execution>
-								<goals>
-									<goal>repackage</goal>
-								</goals>
-							</execution>
-						</executions>
 					</plugin>
 				</plugins>
 			</build>
diff --git a/starters/pom.xml b/starters/pom.xml
index be932b8..03b3e49 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -26,6 +26,7 @@ under the License.
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>2.2.0.RELEASE</version>
+		<relativePath/>
 	</parent>
 
 	<groupId>org.apache.isis.app</groupId>
@@ -40,6 +41,31 @@ under the License.
 	</description>
 	<url>https://isis.apache.org</url>
 
+	<properties>
+		<spring-boot.version>2.2.0.RELEASE</spring-boot.version>
+		<approvaltests.version>4.0.2</approvaltests.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.isis.core</groupId>
+				<artifactId>isis</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+
+			<dependency>
+				<groupId>com.approvaltests</groupId>
+				<artifactId>approvaltests</artifactId>
+				<version>${approvaltests.version}</version>
+				<scope>test</scope>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+
 	<profiles>
 		<profile>
 			<id>isis-app-starter-datanucleusenhance</id>
@@ -262,6 +288,36 @@ under the License.
 			</build>
 		</profile>
 
+		<!-- running: mvn spring-boot:run -->
+		<profile>
+			<id>isis-app-starter-boot</id>
+			<activation>
+				<property>
+					<name>!skip.isis-app-starter-boot</name>
+				</property>
+			</activation>
+			<properties>
+			</properties>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.springframework.boot</groupId>
+							<artifactId>spring-boot-maven-plugin</artifactId>
+							<version>${spring-boot.version}</version>
+							<executions>
+								<execution>
+									<goals>
+										<goal>repackage</goal>
+									</goals>
+								</execution>
+							</executions>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
+		</profile>
+
 
 	</profiles>
 </project>