This is an automated email from the ASF dual-hosted git repository. jsedding pushed a commit to branch jsedding/SLING-12438-update-parent in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp.git
commit cc5bc3a16d30a8607ab34a9023fe3908856876e5 Author: Julian Sedding <[email protected]> AuthorDate: Fri Sep 20 11:00:23 2024 +0200 SLING-12438 - Update Sling Scripting JSP to parent version 60 - update to 60 - add .sling-module.json to build only on java 17+ --- .sling-module.json | 6 ++++++ bnd.bnd | 3 +++ pom.xml | 48 ++++++++++++++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/.sling-module.json b/.sling-module.json new file mode 100644 index 0000000..d32d0be --- /dev/null +++ b/.sling-module.json @@ -0,0 +1,6 @@ +{ + "jenkins": { + "jdks": [17, 21], + "operatingSystems": [ "linux", "linux-arm", "windows" ] + } +} diff --git a/bnd.bnd b/bnd.bnd index 9e1431b..56fd587 100644 --- a/bnd.bnd +++ b/bnd.bnd @@ -2,3 +2,6 @@ ScriptEngine-Name:${project.name} ScriptEngine-Version:${project.version} Import-Package: * -conditionalpackage: org.apache.el.* +# note: -fixupmessage also overwrites the directive inherited from the parent +-fixupmessages: "Export org.apache.sling.scripting.jsp.jasper.runtime, has 2, private references"; \ + is:=ignore diff --git a/pom.xml b/pom.xml index e973bfb..f0f296e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling-bundle-parent</artifactId> - <version>35</version> + <version>60</version> <relativePath /> </parent> @@ -36,45 +36,39 @@ <scm> <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp.git</developerConnection> + <tag>HEAD</tag> <url>https://github.com/apache/sling-org-apache-sling-scripting-jsp.git</url> - <tag>HEAD</tag> - </scm> + </scm> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <!-- No javadocs --> - <excludePackageNames> - org.apache.sling.scripting,org.apache.juli.logging - </excludePackageNames> - </configuration> - </plugin> - </plugins> - </build> + <properties> + <sling.java.version>11</sling.java.version> + </properties> <dependencies> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.framework</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.versioning</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.component.annotations</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.metatype.annotations</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.bundle</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -132,6 +126,7 @@ <groupId>org.apache.tomcat</groupId> <artifactId>jasper-el</artifactId> <version>6.0.30</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -151,4 +146,17 @@ <scope>test</scope> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <!-- No javadocs --> + <excludePackageNames>org.apache.sling.scripting,org.apache.juli.logging</excludePackageNames> + </configuration> + </plugin> + </plugins> + </build> </project>
