Use profile to run functional-tests

spring-projects-experimental · Dec 13, 2023 · 553f7b7 · 553f7b7
1 parent 148155e
commit 553f7b7
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 37 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,15 +21,11 @@ jobs:
       - name: Maven Build
         run: ./mvnw --batch-mode --fail-at-end clean install
 
-      - name: Functional Tests
-        run: ./mvnw --batch-mode clean test
-        working-directory: ./spring-rewrite-commons-functional-tests
-
       - name: Deploy Snapshot
         env:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
           GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-        run: mvn --batch-mode deploy -Partifactory,delombok
+        run: mvn --batch-mode deploy -Partifactory,delombok,functional-tests
diff --git a/pom.xml b/pom.xml
@@ -476,6 +476,12 @@ limitations under the License.
         </plugins>
     </build>
     <profiles>
+        <profile>
+            <id>functional-tests</id>
+            <modules>
+                <module>spring-rewrite-commons-functional-tests</module>
+            </modules>
+        </profile>
         <profile>
             <id>delombok</id>
             <build>

diff --git a/spring-rewrite-commons-functional-tests/pom.xml b/spring-rewrite-commons-functional-tests/pom.xml
@@ -3,9 +3,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.springframework.rewrite</groupId>
+    <parent>
+        <groupId>org.springframework.rewrite</groupId>
+        <artifactId>spring-rewrite-commons</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>spring-rewrite-commons-functional-tests</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Functional tests for Spring Rewrite Commons</name>

diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.springframework.rewrite</groupId>
             <artifactId>spring-rewrite-commons-launcher</artifactId>
-            <classifier>tests</classifier>
+            <classifier>test</classifier>
             <type>test-jar</type>
             <version>0.1.0-SNAPSHOT</version>
             <scope>test</scope>

diff --git a/spring-rewrite-commons-launcher/pom.xml b/spring-rewrite-commons-launcher/pom.xml
@@ -21,39 +21,39 @@
         <url>https://spring.io</url>
     </organization>
 
-<!--    <properties>-->
-<!--        <maven.compiler.source>17</maven.compiler.source>-->
-<!--        <maven.compiler.target>17</maven.compiler.target>-->
-<!--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-<!--        &lt;!&ndash; prod dependencies &ndash;&gt;-->
-<!--        <spring-boot.version>3.1.3</spring-boot.version>-->
-<!--        <rewrite.version>8.5.1</rewrite.version>-->
-<!--        <rewrite-maven-plugin.version>5.3.2</rewrite-maven-plugin.version>-->
-<!--        <jaxb-api.version>2.3.1</jaxb-api.version>-->
+        <!-- prod dependencies -->
+        <spring-boot.version>3.1.3</spring-boot.version>
+        <rewrite.version>8.5.1</rewrite.version>
+        <rewrite-maven-plugin.version>5.3.2</rewrite-maven-plugin.version>
+        <jaxb-api.version>2.3.1</jaxb-api.version>
 
-<!--        &lt;!&ndash; testing dependencies &ndash;&gt;-->
-<!--        <maven.version>3.9.1</maven.version>-->
-<!--        <maven-resolver.version>1.9.13</maven-resolver.version>-->
-<!--        <maven-wagon-http.version>3.5.3</maven-wagon-http.version>-->
-<!--        <plexus-cypher.version>1.8</plexus-cypher.version>-->
-<!--        <maven-invoker.version>3.2.0</maven-invoker.version>-->
-<!--        <junit-pioneer.version>2.1.0</junit-pioneer.version>-->
+        <!-- testing dependencies -->
+        <maven.version>3.9.1</maven.version>
+        <maven-resolver.version>1.9.13</maven-resolver.version>
+        <maven-wagon-http.version>3.5.3</maven-wagon-http.version>
+        <plexus-cypher.version>1.8</plexus-cypher.version>
+        <maven-invoker.version>3.2.0</maven-invoker.version>
+        <junit-pioneer.version>2.1.0</junit-pioneer.version>
 
-<!--        &lt;!&ndash; plugins &ndash;&gt;-->
-<!--        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>-->
-<!--        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>-->
-<!--        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>-->
-<!--        <versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>-->
-<!--        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>-->
-<!--        <spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>-->
-<!--        <license-maven-plugin.version>4.1</license-maven-plugin.version>-->
-<!--        <lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>-->
-<!--        <artifactory-maven-plugin.version>3.6.1</artifactory-maven-plugin.version>-->
+        <!-- plugins -->
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
+        <versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
+        <license-maven-plugin.version>4.1</license-maven-plugin.version>
+        <lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
+        <artifactory-maven-plugin.version>3.6.1</artifactory-maven-plugin.version>
 
-<!--        &lt;!&ndash; Should be same as the Spring managed version &ndash;&gt;-->
-<!--        <lombok.version.annotationProcessorPath>1.18.28</lombok.version.annotationProcessorPath>-->
-<!--    </properties>-->
+        <!-- Should be same as the Spring managed version -->
+        <lombok.version.annotationProcessorPath>1.18.28</lombok.version.annotationProcessorPath>
+    </properties>
 
     <developers>
         <developer>