Skip to content

Commit

Permalink
SLING-12559 Update to parent 52
Browse files Browse the repository at this point in the history
  • Loading branch information
@stefanseifert
stefanseifert committed Dec 12, 2024
1 parent 0c9a6f1 commit 0d0e3c2
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 64 deletions.
5 changes: 5 additions & 0 deletions .sling-module.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"jenkins": {
"jdks": [11]
}
}
83 changes: 19 additions & 64 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
<version>48</version>
<version>52</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -53,7 +53,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
<executions>
<execution>
<id>prepare-agent</id>
Expand All @@ -76,68 +75,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<argLine>${jacoco.command} -Xmx2048m</argLine>
<excludedGroups>${sling.excluded.surefire.groups}</excludedGroups>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>set-bundle-required-execution-environment</id>
<phase>initialize</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
<!-- apply fix as suggested in this comment:
https://issues.apache.org/jira/browse/MANTRUN-200?focusedCommentId=17016706&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-17016706 -->
<property name="plugin_classpath" refid="maven.plugin.classpath" />
<script language="javascript" classpath="${plugin_classpath}">var System = java.lang.System;
var bree = "JavaSE-1.6";
var animalSnifferSignaturesVersion = "6";
var slingJavaVersion = System.getProperty("sling.java.version");
if (!slingJavaVersion) {
slingJavaVersion = project.getProperty("sling.java.version");
}
if (slingJavaVersion == "7") {
animalSnifferSignaturesVersion = "7";
bree = "JavaSE-1.7";
System.out.println("Setting Bundle-RequiredExecutionEnvironment=" + bree + " from sling.java.version=" + slingJavaVersion);
} else if ( slingJavaVersion == "8") {
animalSnifferSignaturesVersion = "8";
bree = "JavaSE-1.8";
System.out.println("Setting Bundle-RequiredExecutionEnvironment=" + bree + " from sling.java.version=" + slingJavaVersion);
} else if (slingJavaVersion != "6") {
System.out.println("Unsupported sling.java.version=" + slingJavaVersion + "; must be 6, 7 or 8.");
throw "sling.java.version must be 6, 7 or 8";
}
project.setProperty("sling.bree", bree);
project.setProperty("sling.animalSignatures.version", animalSnifferSignaturesVersion);</script>
</target>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-regexp</artifactId>
<version>1.7.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>jakarta-regexp</groupId>
<artifactId>jakarta-regexp</artifactId>
<version>1.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<profiles>
Expand All @@ -159,7 +102,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<artifactId>org.osgi.framework</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -286,6 +234,18 @@
<version>3.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.healthcheck.api</artifactId>
<version>2.0.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Testing -->
<dependency>
Expand Down Expand Up @@ -395,11 +355,6 @@
<version>${oak.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.healthcheck.api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.johnzon</artifactId>
Expand Down

0 comments on commit 0d0e3c2

Please sign in to comment.