You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2022/03/28 12:22:37 UTC
[sling-org-apache-sling-app-cms] 01/04: SLING-11069 - Further dependency updates
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 93f3f6263c3a6d7707522386076b188a8c913094
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Tue Mar 22 20:38:01 2022 -0400
SLING-11069 - Further dependency updates
---
feature/pom.xml | 709 ++++++++++++------------
feature/src/main/features/base.json | 16 +-
feature/src/main/features/cms/dependencies.json | 4 +-
feature/src/main/features/discovery.json | 6 +-
feature/src/main/features/distribution.json | 4 +-
feature/src/main/features/event.json | 2 +-
feature/src/main/features/healthcheck.json | 2 +-
feature/src/main/features/oak/oak_base.json | 8 +-
feature/src/main/features/scripting.json | 8 +-
feature/src/main/features/thumbnails.json | 5 +-
pom.xml | 30 +-
rules.xml | 11 +
12 files changed, 407 insertions(+), 398 deletions(-)
diff --git a/feature/pom.xml b/feature/pom.xml
index f35b698..b3051e7 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -11,362 +11,363 @@
and limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.apache.sling.cms</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.apache.sling.cms</artifactId>
+ <groupId>org.apache.sling</groupId>
+ <version>1.1.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.sling.cms.feature</artifactId>
+ <name>Apache Sling - CMS Feature Model</name>
+ <properties>
+ <IT.expected.bundles.count>240</IT.expected.bundles.count>
+ <bnd.baseline.skip>true</bnd.baseline.skip>
+ <run.sling.smoke.test>true</run.sling.smoke.test>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>sling/**</include>
+ <include>coverage.ec</include>
+ <include>launcher/**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.sling</groupId>
- <version>1.1.1-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.sling.cms.feature</artifactId>
- <name>Apache Sling - CMS Feature Model</name>
- <properties>
- <IT.expected.bundles.count>240</IT.expected.bundles.count>
- <bnd.baseline.skip>true</bnd.baseline.skip>
- <run.sling.smoke.test>true</run.sling.smoke.test>
- </properties>
- <build>
+ <artifactId>slingfeature-maven-plugin</artifactId>
+ <version>1.4.24</version>
+ <extensions>true</extensions>
+ <configuration>
+ <framework>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>6.0.3</version>
+ </framework>
+ <aggregates>
+ <aggregate>
+ <classifier>slingcms-standalone</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-*.json</filesExclude>
+ <filesExclude>runmodes/author.json</filesExclude>
+ <filesExclude>runmodes/renderer.json</filesExclude>
+ <title>Sling CMS - Standalone</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-author</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-*.json</filesExclude>
+ <filesExclude>runmodes/standalone.json</filesExclude>
+ <filesExclude>runmodes/renderer.json</filesExclude>
+ <title>Sling CMS - Author</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-renderer</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-*.json</filesExclude>
+ <filesExclude>runmodes/standalone.json</filesExclude>
+ <filesExclude>runmodes/author.json</filesExclude>
+ <title>Sling CMS - Renderer</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-composite-seed</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-runtime.json</filesExclude>
+ <filesExclude>oak/node-store/segment.json</filesExclude>
+ <filesExclude>runmodes/*.json</filesExclude>
+ <title>Sling CMS - Composite Node Store Seed</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-composite-runtime</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-seed.json</filesExclude>
+ <filesExclude>oak/node-store/segment.json</filesExclude>
+ <filesExclude>runmodes/*.json</filesExclude>
+ <title>Sling CMS - Composite Node Store Runtime</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-upgrade</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>framework-properties.json</filesExclude>
+ <filesExclude>oak/node-store/*.json</filesExclude>
+ <filesExclude>runmodes/*.json</filesExclude>
+ <title>Sling CMS - Upgrade</title>
+ </aggregate>
+ </aggregates>
+ <scans>
+ <scan>
+ <includeClassifier>slingcms-composite-runtime</includeClassifier>
+ </scan>
+ <scan>
+ <includeClassifier>slingcms-composite-seed</includeClassifier>
+ </scan>
+ <scan>
+ <includeClassifier>slingcms-standalone</includeClassifier>
+ </scan>
+ <scan>
+ <includeClassifier>slingcms-author</includeClassifier>
+ </scan>
+ <scan>
+ <includeClassifier>slingcms-renderer</includeClassifier>
+ </scan>
+ </scans>
+ <archives>
+ <archive>
+ <classifier>slingcms_standalone_far</classifier>
+ <includeClassifier>slingcms-standalone</includeClassifier>
+ </archive>
+ <archive>
+ <classifier>slingcms_upgrade_far</classifier>
+ <includeClassifier>slingcms-upgrade</includeClassifier>
+ </archive>
+ </archives>
+ </configuration>
+ <executions>
+ <execution>
+ <id>aggregate-features</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>aggregate-features</goal>
+ <goal>analyse-features</goal>
+ <goal>attach-features</goal>
+ <goal>attach-featurearchives</goal>
+ </goals>
+ <configuration>
+ <replacePropertyVariables>asm-version,org-apache-sling-api-version,org-apache-sling-scripting-jsp-taglib-version,cms-version,composum-nodes-version,groovy-version,guava-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io-version,tika- [...]
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>org.apache.sling.cms-${project.version}</finalName>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.sling.cms.feature.Main</mainClass>
+ <classpathPrefix>lib/</classpathPrefix>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ <descriptors>
+ <descriptor>src/main/assembly/standalone.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <arguments>-Drun.sling.smoke.test=false</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Extend RAT configuration from parent pom -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <!-- Exclude sling instance -->
+ <exclude>sling/**</exclude>
+ <exclude>launcher/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <id>run-smoke-test</id>
+ <activation>
+ <property>
+ <name>run.sling.smoke.test</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <include>sling/**</include>
- <include>coverage.ec</include>
- <include>launcher/**</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>slingfeature-maven-plugin</artifactId>
- <version>1.4.24</version>
- <extensions>true</extensions>
- <configuration>
- <framework>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.3</version>
- </framework>
- <aggregates>
- <aggregate>
- <classifier>slingcms-standalone</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-*.json</filesExclude>
- <filesExclude>runmodes/author.json</filesExclude>
- <filesExclude>runmodes/renderer.json</filesExclude>
- <title>Sling CMS - Standalone</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-author</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-*.json</filesExclude>
- <filesExclude>runmodes/standalone.json</filesExclude>
- <filesExclude>runmodes/renderer.json</filesExclude>
- <title>Sling CMS - Author</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-renderer</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-*.json</filesExclude>
- <filesExclude>runmodes/standalone.json</filesExclude>
- <filesExclude>runmodes/author.json</filesExclude>
- <title>Sling CMS - Renderer</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-composite-seed</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-runtime.json</filesExclude>
- <filesExclude>oak/node-store/segment.json</filesExclude>
- <filesExclude>runmodes/*.json</filesExclude>
- <title>Sling CMS - Composite Node Store Seed</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-composite-runtime</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-seed.json</filesExclude>
- <filesExclude>oak/node-store/segment.json</filesExclude>
- <filesExclude>runmodes/*.json</filesExclude>
- <title>Sling CMS - Composite Node Store Runtime</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-upgrade</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>framework-properties.json</filesExclude>
- <filesExclude>oak/node-store/*.json</filesExclude>
- <filesExclude>runmodes/*.json</filesExclude>
- <title>Sling CMS - Upgrade</title>
- </aggregate>
- </aggregates>
- <scans>
- <scan>
- <includeClassifier>slingcms-composite-runtime</includeClassifier>
- </scan>
- <scan>
- <includeClassifier>slingcms-composite-seed</includeClassifier>
- </scan>
- <scan>
- <includeClassifier>slingcms-standalone</includeClassifier>
- </scan>
- <scan>
- <includeClassifier>slingcms-author</includeClassifier>
- </scan>
- <scan>
- <includeClassifier>slingcms-renderer</includeClassifier>
- </scan>
- </scans>
- <archives>
- <archive>
- <classifier>slingcms_standalone_far</classifier>
- <includeClassifier>slingcms-standalone</includeClassifier>
- </archive>
- <archive>
- <classifier>slingcms_upgrade_far</classifier>
- <includeClassifier>slingcms-upgrade</includeClassifier>
- </archive>
- </archives>
- </configuration>
- <executions>
- <execution>
- <id>aggregate-features</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>aggregate-features</goal>
- <goal>analyse-features</goal>
- <goal>attach-features</goal>
- <goal>attach-featurearchives</goal>
- </goals>
- <configuration>
- <replacePropertyVariables>asm-version,org-apache-sling-api-version,org-apache-sling-scripting-jsp-taglib-version,cms-version,composum-nodes-version,groovy-version,guava-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io [...]
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>org.apache.sling.cms-${project.version}</finalName>
- <archive>
- <manifest>
- <mainClass>org.apache.sling.cms.feature.Main</mainClass>
- <classpathPrefix>lib/</classpathPrefix>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- <descriptors>
- <descriptor>src/main/assembly/standalone.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
+ <!-- reserve a network port for the integration tests -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
<configuration>
- <arguments>-Drun.sling.smoke.test=false</arguments>
+ <portNames>
+ <portName>http.port</portName>
+ </portNames>
</configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Extend RAT configuration from parent pom -->
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <!-- Exclude sling instance -->
- <exclude>sling/**</exclude>
- <exclude>launcher/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <profiles>
- <profile>
- <id>run-smoke-test</id>
- <activation>
- <property>
- <name>run.sling.smoke.test</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <!-- reserve a network port for the integration tests -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <portNames>
- <portName>http.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>feature-launcher-maven-plugin</artifactId>
- <version>0.1.0</version>
- <configuration>
- <launches>
- <launch>
- <id>sling-cms</id>
- <feature>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>slingcms-standalone</classifier>
- <type>slingosgifeature</type>
- </feature>
- <launcherArguments>
- <frameworkProperties>
- <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
- </frameworkProperties>
- </launcherArguments>
- </launch>
- </launches>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>start</goal>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <systemPropertyVariables>
- <sling.http.port>${http.port}</sling.http.port>
- <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- <version>1.11.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.launcher</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.io</artifactId>
- <version>1.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.5.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.cm.json</artifactId>
- <version>1.0.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- <version>1.1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- <version>1.1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.converter</artifactId>
- <version>1.0.8</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+ <artifactId>feature-launcher-maven-plugin</artifactId>
+ <version>0.1.0</version>
+ <configuration>
+ <launches>
+ <launch>
+ <id>sling-cms</id>
+ <feature>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <classifier>slingcms-standalone</classifier>
+ <type>slingosgifeature</type>
+ </feature>
+ <launcherArguments>
+ <frameworkProperties>
+ <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
+ </frameworkProperties>
+ </launcherArguments>
+ </launch>
+ </launches>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemPropertyVariables>
+ <sling.http.port>${http.port}</sling.http.port>
+ <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <version>1.11.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.feature.launcher</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.feature.io</artifactId>
+ <version>1.3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.5.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.cm.json</artifactId>
+ <version>1.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ <version>1.1.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.json</artifactId>
+ <version>1.1.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.converter</artifactId>
+ <version>1.0.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.function</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
+
diff --git a/feature/src/main/features/base.json b/feature/src/main/features/base.json
index 9d9e69e..452ba00 100644
--- a/feature/src/main/features/base.json
+++ b/feature/src/main/features/base.json
@@ -9,11 +9,11 @@
"start-order":"15"
},
{
- "id":"jakarta.activation:jakarta.activation-api:2.0.1",
+ "id":"jakarta.activation:jakarta.activation-api:2.1.0",
"start-order":"15"
},
{
- "id":"jakarta.mail:jakarta.mail-api:2.0.1",
+ "id":"jakarta.mail:jakarta.mail-api:2.1.0",
"start-order":"20"
},
{
@@ -101,7 +101,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.resourceresolver:1.8.0",
+ "id":"org.apache.sling:org.apache.sling.resourceresolver:1.8.4",
"start-order":"20"
},
{
@@ -153,11 +153,11 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.http.jetty:4.1.14",
+ "id":"org.apache.felix:org.apache.felix.http.jetty:4.2.0",
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.http.servlet-api:1.1.4",
+ "id":"org.apache.felix:org.apache.felix.http.servlet-api:1.2.0",
"start-order":"5"
},
{
@@ -189,7 +189,7 @@
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.metrics:1.2.8",
+ "id":"org.apache.sling:org.apache.sling.commons.metrics:1.2.10",
"start-order":"5"
},
{
@@ -221,11 +221,11 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.10",
+ "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.14",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.36",
+ "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.38",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/cms/dependencies.json b/feature/src/main/features/cms/dependencies.json
index 94b29eb..7339721 100644
--- a/feature/src/main/features/cms/dependencies.json
+++ b/feature/src/main/features/cms/dependencies.json
@@ -89,7 +89,7 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.rewriter:1.3.0",
+ "id":"org.apache.sling:org.apache.sling.rewriter:1.3.2",
"start-order":"15"
},
{
@@ -101,7 +101,7 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.security:1.1.22",
+ "id":"org.apache.sling:org.apache.sling.security:1.1.24",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/discovery.json b/feature/src/main/features/discovery.json
index 2a4a0b1..d68bd38 100644
--- a/feature/src/main/features/discovery.json
+++ b/feature/src/main/features/discovery.json
@@ -5,15 +5,15 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.discovery.base:2.0.10",
+ "id":"org.apache.sling:org.apache.sling.discovery.base:2.0.12",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.discovery.commons:1.0.24",
+ "id":"org.apache.sling:org.apache.sling.discovery.commons:1.0.26",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.discovery.oak:1.2.34",
+ "id":"org.apache.sling:org.apache.sling.discovery.oak:1.2.36",
"start-order":"20"
},
{
diff --git a/feature/src/main/features/distribution.json b/feature/src/main/features/distribution.json
index 966d50f..d909b19 100644
--- a/feature/src/main/features/distribution.json
+++ b/feature/src/main/features/distribution.json
@@ -1,11 +1,11 @@
{
"bundles":[
{
- "id":"org.apache.sling:org.apache.sling.distribution.api:0.5.0",
+ "id":"org.apache.sling:org.apache.sling.distribution.api:0.6.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.distribution.core:0.4.8",
+ "id":"org.apache.sling:org.apache.sling.distribution.core:0.5.0",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/event.json b/feature/src/main/features/event.json
index 216140f..d01fa1b 100644
--- a/feature/src/main/features/event.json
+++ b/feature/src/main/features/event.json
@@ -5,7 +5,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.event:4.2.24",
+ "id":"org.apache.sling:org.apache.sling.event:4.3.0",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/healthcheck.json b/feature/src/main/features/healthcheck.json
index 4e0b860..48a460b 100644
--- a/feature/src/main/features/healthcheck.json
+++ b/feature/src/main/features/healthcheck.json
@@ -5,7 +5,7 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.healthcheck.core:2.0.12",
+ "id":"org.apache.felix:org.apache.felix.healthcheck.core:2.0.14",
"start-order":"5"
},
{
diff --git a/feature/src/main/features/oak/oak_base.json b/feature/src/main/features/oak/oak_base.json
index 3e9c340..9e98e25 100644
--- a/feature/src/main/features/oak/oak_base.json
+++ b/feature/src/main/features/oak/oak_base.json
@@ -125,7 +125,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.resource:3.1.0",
+ "id":"org.apache.sling:org.apache.sling.jcr.resource:3.2.0",
"start-order":"20"
},
{
@@ -133,11 +133,11 @@
"start-order":"20"
},
{
- "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.5.8",
+ "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.6.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.5.0",
+ "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.5.2",
"start-order":"20"
},
{
@@ -145,7 +145,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.16",
+ "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.18",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/scripting.json b/feature/src/main/features/scripting.json
index ac4a6fb..ff3d75d 100644
--- a/feature/src/main/features/scripting.json
+++ b/feature/src/main/features/scripting.json
@@ -5,7 +5,7 @@
"start-order":"20"
},
{
- "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino:1.7.13_1",
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino:1.7.14_2",
"start-order":"20"
},
{
@@ -17,7 +17,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.core:2.4.2",
+ "id":"org.apache.sling:org.apache.sling.scripting.core:2.4.4",
"start-order":"20"
},
{
@@ -61,7 +61,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.14-1.4.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.16-1.4.0",
"start-order":"20"
},
{
@@ -89,7 +89,7 @@
"start-order":"20"
},
{
- "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl:3.3.0_1",
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl:3.3.2_1",
"start-order":"20"
},
{
diff --git a/feature/src/main/features/thumbnails.json b/feature/src/main/features/thumbnails.json
index f346e4c..f41de8f 100644
--- a/feature/src/main/features/thumbnails.json
+++ b/feature/src/main/features/thumbnails.json
@@ -7,19 +7,16 @@
"id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.batik:1.14_1",
"start-order": "20"
},
-
{
"id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.bcel:5.2_4",
"start-order": "20"
},
-
{
"id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan:2.7.2_3",
"start-order": "20"
},
-
{
- "id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:2.12.1_1",
+ "id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:2.12.2_1",
"start-order": "20"
},
{
diff --git a/pom.xml b/pom.xml
index df1cc49..557fd85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,15 +37,15 @@
<commons-text-version>1.9</commons-text-version>
<composum-nodes-version>2.7.1</composum-nodes-version>
<geronimo-atinject_1-0_spec-version>1.2</geronimo-atinject_1-0_spec-version>
- <groovy-version>3.0.9</groovy-version>
+ <groovy-version>3.0.10</groovy-version>
<httpclient-version>4.5.13</httpclient-version>
- <jackrabbit-version>2.21.9</jackrabbit-version>
- <jackson-version>2.13.1</jackson-version>
+ <jackrabbit-version>2.21.10</jackrabbit-version>
+ <jackson-version>2.13.2</jackson-version>
<javax-annotation-api-version>1.3.2</javax-annotation-api-version>
<jsoup-version>1.14.3</jsoup-version>
<jsp-api-version>2.0</jsp-api-version>
<jstl-version>1.2_1</jstl-version>
- <mockito-core-version>4.2.0</mockito-core-version>
+ <mockito-core-version>4.4.0</mockito-core-version>
<oak-version>1.42.0</oak-version>
<org-apache-sling-api-version>2.24.0</org-apache-sling-api-version>
<org-apache-sling-caconfig-api-version>1.3.0</org-apache-sling-caconfig-api-version>
@@ -57,12 +57,12 @@
<org-apache-sling-scripting-jsp-taglib-version>2.4.0</org-apache-sling-scripting-jsp-taglib-version>
<org-apache-sling-testing-sling-mock-junit4-version>3.2.2</org-apache-sling-testing-sling-mock-junit4-version>
<org.apache.felix.webconsole-version>4.7.2</org.apache.felix.webconsole-version>
- <osgi-annotation-version>8.0.1</osgi-annotation-version>
+ <osgi-annotation-version>8.1.0</osgi-annotation-version>
<guava-version>15.0</guava-version>
<pdfbox-version>2.0.25</pdfbox-version>
<servlet-api-version>2.5</servlet-api-version>
- <slf4j-version>1.7.33</slf4j-version>
- <tika-version>1.28</tika-version>
+ <slf4j-version>1.7.36</slf4j-version>
+ <tika-version>1.28.1</tika-version>
</properties>
<modules>
<module>api</module>
@@ -183,7 +183,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.api</artifactId>
- <version>0.5.0</version>
+ <version>0.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -225,7 +225,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.rewriter</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -262,13 +262,13 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>2.0.1</version>
+ <version>2.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
+ <version>2.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -347,7 +347,7 @@
<dependency>
<groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId>
- <version>0.4.16</version>
+ <version>0.4.17</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -359,13 +359,13 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>5.2.0</version>
+ <version>5.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
- <version>5.2.0</version>
+ <version>5.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/rules.xml b/rules.xml
index e7c887c..a20b35f 100644
--- a/rules.xml
+++ b/rules.xml
@@ -10,6 +10,7 @@
<ignoreVersion type="regex">.*-beta.*</ignoreVersion>
<ignoreVersion type="regex">.*-RC.*</ignoreVersion>
<ignoreVersion type="regex">.*b.*</ignoreVersion>
+ <ignoreVersion type="regex">.*test.*</ignoreVersion>
</ignoreVersions>
<rules>
<rule groupId="com.google.guava" artifactId="guava" comparisonMethod="maven">
@@ -45,5 +46,15 @@
<ignoreVersion type="regex">2.*</ignoreVersion>
</ignoreVersions>
</rule>
+ <rule groupId="commons-codec" artifactId="commons-codec" comparisonMethod="maven">
+ <ignoreVersions>
+ <ignoreVersion type="regex">2004.*</ignoreVersion>
+ </ignoreVersions>
+ </rule>
+ <rule groupId="commons-io" artifactId="commons-io" comparisonMethod="maven">
+ <ignoreVersions>
+ <ignoreVersion type="regex">2003.*</ignoreVersion>
+ </ignoreVersions>
+ </rule>
</rules>
</ruleset>
\ No newline at end of file