re-enabled integration tests for xtend-archetype

LorenzoBettini · Dec 4, 2024 · 1b2f12f · 1b2f12f
1 parent 9361743
commit 1b2f12f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/full-build.sh b/full-build.sh
@@ -2,7 +2,6 @@
 
 MVN_ARGS=(\
   -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-  -Dit-archetype-tests-skip=true \
 )
 
 # args parsing inspired by https://gist.github.com/jehiah/855086
@@ -22,7 +21,7 @@ while [ "$1" != "" ]; do
       exit
       ;;
     --no-tests)
-      MVN_ARGS+=(-DskipTests=true)
+      MVN_ARGS+=(-DskipTests=true -Dit-archetype-tests-skip=true)
       ;;
     --local-repository)
       MVN_ARGS+=" -Dmaven.repo.local=$VALUE"

diff --git a/org.eclipse.xtend.maven.archetype/pom.xml b/org.eclipse.xtend.maven.archetype/pom.xml
@@ -12,7 +12,8 @@
 
 	<properties>
 		<root-dir>${basedir}/..</root-dir>
-		<it-archetype-tests-skip>true</it-archetype-tests-skip>
+		<it-archetype-tests-skip>false</it-archetype-tests-skip>
+		<it-archetype-tests-debug>false</it-archetype-tests-debug>
 	</properties>
 
 	<build>
@@ -53,14 +54,16 @@
 				<artifactId>maven-archetype-plugin</artifactId>
 				<configuration>
 					<skip>${it-archetype-tests-skip}</skip>
-					<debug>true</debug>
+					<debug>${it-archetype-tests-debug}</debug>
 				</configuration>
 				<executions>
 					<execution>
 						<goals>
 							<goal>integration-test</goal>
 						</goals>
-						<configuration><debug>true</debug></configuration>
+						<configuration>
+							<debug>${it-archetype-tests-debug}</debug>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -84,7 +87,7 @@
 				</file>
 			</activation>
 			<properties>
-				<it-tests-skip>true</it-tests-skip>
+				<it-archetype-tests-skip>true</it-archetype-tests-skip>
 			</properties>
 		</profile>
 	</profiles>

diff --git a/org.eclipse.xtend.maven.archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/org.eclipse.xtend.maven.archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -9,7 +9,7 @@
 			<defaultValue>UTF-8</defaultValue>
 		</requiredProperty>
 		<requiredProperty key="javaVersion">
-			<defaultValue>1.8</defaultValue>
+			<defaultValue>17</defaultValue>
 		</requiredProperty>
 	</requiredProperties>
 	<fileSets>

diff --git a/org.eclipse.xtend.maven.archetype/src/test/resources/projects/first/archetype.properties b/org.eclipse.xtend.maven.archetype/src/test/resources/projects/first/archetype.properties
@@ -2,5 +2,6 @@ sourceEncoding=UTF-8
 groupId=integrationtest.group
 artifactId=integrationtest.artifactId
 version=1.0.0-SNAPSHOT
+javaVersion=17
 package=org.eclipse.xtend.xtend.archetype.integrationtest
 packageInPathFormat=org/eclipse/xtend/xtend-archetype/integrationtest