This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-13050-integration-tests in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
commit 046bb7a30ea790450e20c1eaa6d93aab187809ef Author: Stefan Seifert <[email protected]> AuthorDate: Fri Jan 9 15:49:31 2026 +0100 align versions --- impl/pom.xml | 9 +-------- it/pom.xml | 31 +++++++------------------------ parent/pom.xml | 21 ++++++++++++--------- 3 files changed, 20 insertions(+), 41 deletions(-) diff --git a/impl/pom.xml b/impl/pom.xml index a5b3f73..2ca44be 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -32,13 +32,6 @@ <name>Apache Sling Models Implementation</name> <description>Apache Sling Models Implementation</description> - <scm> - <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git</connection> - <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git</developerConnection> - <tag>org.apache.sling.models.impl-1.7.2</tag> - <url>https://github.com/apache/sling-org-apache-sling-models-impl.git</url> - </scm> - <properties> <project.build.outputTimestamp>2025-08-27T03:14:05Z</project.build.outputTimestamp> <sling.java.version>17</sling.java.version> @@ -48,7 +41,6 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.models.api</artifactId> - <version>2.0.0</version> <scope>provided</scope> </dependency> <dependency> @@ -213,6 +205,7 @@ <scope>provided</scope> </dependency> </dependencies> + <build> <plugins> <plugin> diff --git a/it/pom.xml b/it/pom.xml index 7e209ec..319eade 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -35,9 +35,9 @@ remote test proxy that runs in the integration-tests phase.</description> <properties> - <sling.java.version>8</sling.java.version> - <!-- start with -DkeepITServerRunning=true to allow to rerun ITs or inspect the server after the ITs have been executed there --> - <keepITServerRunning>false</keepITServerRunning> + <sling.starter.version>14-SNAPSHOT</sling.starter.version> + <starter.min.bundles.count>200</starter.min.bundles.count> + <it.startTimeoutSeconds>60</it.startTimeoutSeconds> </properties> <dependencies> @@ -114,19 +114,18 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.models.api</artifactId> - <version>1.5.5-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.models.impl</artifactId> - <version>1.7.3-SNAPSHOT</version> + <version>2.0.1-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.models.jacksonexporter</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>2.0.1-SNAPSHOT</version> <scope>provided</scope> </dependency> @@ -144,13 +143,13 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> - <version>2.18.4</version> + <version>3.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.8.1</version> + <version>3.18.0</version> <scope>provided</scope> </dependency> <dependency> @@ -225,20 +224,4 @@ </plugin> </plugins> </build> - - <profiles> - <profile> - <id>debug-remote-process</id> - <properties> - <sling.vm.options>-Xmx512m -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=38080,suspend=n</sling.vm.options> - </properties> - </profile> - <profile> - <id>debug-remote-process-suspend</id> - <properties> - <sling.vm.options>-Xmx512m -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=38080,suspend=y</sling.vm.options> - </properties> - </profile> - </profiles> - </project> diff --git a/parent/pom.xml b/parent/pom.xml index b6c772b..5500b58 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -40,16 +40,19 @@ </scm> <properties> - <project.build.outputTimestamp>2025-08-27T03:14:05Z</project.build.outputTimestamp> <sling.java.version>17</sling.java.version> + <project.build.outputTimestamp>2025-08-27T03:14:05Z</project.build.outputTimestamp> + <models.api.version>2.0.0</models.api.version> </properties> - <dependencies> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.models.api</artifactId> - <version>2.0.0</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.models.api</artifactId> + <version>${models.api.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> </project>
