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
The following commit(s) were added to refs/heads/master by this push:
new 2a59ade Working on SLING-8075 - Adding support for upgrading using
the Sling feature archive
2a59ade is described below
commit 2a59adee2c90c91a3670bb06a22b6a003806b299
Author: Dan Klco <[email protected]>
AuthorDate: Wed Feb 3 16:36:25 2021 -0500
Working on SLING-8075 - Adding support for upgrading using the Sling
feature archive
---
feature/pom.xml | 12 ++
feature/src/main/features/boot.json | 16 +--
feature/src/main/features/cms/feature.json | 28 +++++
.../{boot.json => framework-properties.json} | 130 ---------------------
4 files changed, 41 insertions(+), 145 deletions(-)
diff --git a/feature/pom.xml b/feature/pom.xml
index 42fd519..d3877e5 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -109,6 +109,14 @@
<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>
@@ -132,6 +140,10 @@
<classifier>slingcms_standalone_far</classifier>
<includeClassifier>slingcms-standalone</includeClassifier>
</archive>
+ <archive>
+ <classifier>slingcms_upgrade_far</classifier>
+
<includeClassifier>slingcms-upgrade</includeClassifier>
+ </archive>
</archives>
</configuration>
<executions>
diff --git a/feature/src/main/features/boot.json
b/feature/src/main/features/boot.json
index 0671ec3..eccfb4b 100644
--- a/feature/src/main/features/boot.json
+++ b/feature/src/main/features/boot.json
@@ -1,7 +1,4 @@
{
- "variables": {
- "sling.home": null
- },
"bundles": [
{
"id": "org.apache.felix:org.apache.felix.cm.json:1.0.2",
@@ -131,16 +128,5 @@
"id": "org.apache.felix:org.apache.felix.scr:2.1.24",
"start-order": "1"
}
- ],
- "framework-properties": {
- "localIndexDir": "${sling.home}/repository/index",
- "repository.home": "${sling.home}/repository",
- "sling.jre.java.xml":
",javax.xml;version=\"2.1.0\",javax.xml.datatype;uses:=\"javax.xml.namespace\";version=\"2.1.0\",javax.xml.namespace;version=\"2.1.0\",javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=\"2.1.0\",javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=\"1.0.0\",javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=\"1.0.
[...]
- "felix.systempackages.calculate.uses": "true",
- "org.osgi.framework.system.packages":
"org.osgi.framework;version=\"1.9\",org.osgi.framework.dto;version=\"1.8\";uses:=\"org.osgi.dto\",org.osgi.framework.hooks.bundle;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.resolver;version=\"1.0\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.hooks.service;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.weaving;version=\"1.1\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.lau
[...]
- "felix.systempackages.substitution": "true",
- "sling.jre-jpms":
"{dollar}{felix.jpms.java.base}{dollar}{felix.jpms.java.compiler}{dollar}{felix.jpms.java.datatransfer}{dollar}{felix.jpms.java.desktop}{dollar}{felix.jpms.java.instrument}{dollar}{felix.jpms.java.logging}{dollar}{felix.jpms.java.management}{dollar}{felix.jpms.java.management.rmi}{dollar}{felix.jpms.java.naming}{dollar}{felix.jpms.java.net.http}{dollar}{felix.jpms.java.prefs}{dollar}{felix.jpms.java.rmi}{dollar}{felix.jpms.java.scripting}{dollar}{felix.jpms.java
[...]
- "sling.jpms.java.xml":
"{dollar}{sling.jre.java.xml},javax.xml.catalog;uses:=\"javax.xml.namespace\";version=\"1.0.0\"",
- "sling.jre-1.8":
",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{doll
[...]
- }
+ ]
}
\ No newline at end of file
diff --git a/feature/src/main/features/cms/feature.json
b/feature/src/main/features/cms/feature.json
new file mode 100644
index 0000000..3a2eae8
--- /dev/null
+++ b/feature/src/main/features/cms/feature.json
@@ -0,0 +1,28 @@
+{
+ "bundles": [
+ {
+ "id": "org.apache.sling:org.apache.sling.feature:1.2.18",
+ "start-order": "20"
+ },
+ {
+ "id": "org.apache.sling:org.apache.sling.feature.io:1.3.0",
+ "start-order": "20"
+ },
+ {
+ "id": "org.apache.sling:org.apache.sling.feature.r2f:0.0.2",
+ "start-order": "20"
+ },
+ {
+ "id": "org.apache.sling:org.apache.sling.feature.diff:0.0.6",
+ "start-order": "20"
+ },
+ {
+ "id":
"org.apache.sling:org.apache.sling.feature.inventoryprinter:1.0.2",
+ "start-order": "20"
+ },
+ {
+ "id":
"org.apache.sling:org.apache.sling.installer.factory.feature:0.5.0",
+ "start-order": "20"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/feature/src/main/features/boot.json
b/feature/src/main/features/framework-properties.json
similarity index 82%
copy from feature/src/main/features/boot.json
copy to feature/src/main/features/framework-properties.json
index 0671ec3..c19657b 100644
--- a/feature/src/main/features/boot.json
+++ b/feature/src/main/features/framework-properties.json
@@ -2,136 +2,6 @@
"variables": {
"sling.home": null
},
- "bundles": [
- {
- "id": "org.apache.felix:org.apache.felix.cm.json:1.0.2",
- "start-order": "1"
- },
- {
- "id": "org.apache.aries:org.apache.aries.util:1.1.3",
- "start-order": "1"
- },
- {
- "id": "org.apache.commons:commons-lang3:${commons-lang3-version}",
- "start-order": "1"
- },
- {
- "id": "org.apache.felix:org.apache.felix.configadmin:1.9.18",
- "start-order": "1"
- },
- {
- "id": "org.apache.felix:org.apache.felix.converter:1.0.14",
- "start-order": "1"
- },
- {
- "id": "org.apache.felix:org.apache.felix.eventadmin:1.5.0",
- "start-order": "1"
- },
- {
- "id": "org.apache.geronimo.specs:geronimo-annotation_1.3_spec:1.3",
- "start-order": "1"
- },
- {
- "id":
"org.apache.geronimo.specs:geronimo-atinject_1.0_spec:${geronimo-atinject_1-0_spec-version}",
- "start-order": "1"
- },
- {
- "id":
"org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:1.1.3",
- "start-order": "1"
- },
- {
- "id":
"org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl:2.2.11_1",
- "start-order": "1"
- },
- {
- "id":
"org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl:1.5.1_1",
- "start-order": "1"
- },
- {
- "id":
"org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2:2.9.0",
- "start-order": "1"
- },
- {
- "id":
"org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2:2.9.0",
- "start-order": "1"
- },
- {
- "id":
"org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3:2.9.0",
- "start-order": "1"
- },
- {
- "id":
"org.apache.sling:org.apache.sling.commons.johnzon:${org-apache-sling-commons-johnzon-version}",
- "start-order": "1"
- },
- {
- "id": "org.apache.sling:org.apache.sling.commons.log:5.1.12",
- "start-order": "1"
- },
- {
- "id": "org.apache.sling:org.apache.sling.commons.logservice:1.1.0",
- "start-order": "1"
- },
- {
- "id": "org.apache.sling:org.apache.sling.commons.osgi:2.4.2",
- "start-order": "1"
- },
- {
- "id": "org.apache.sling:org.apache.sling.installer.core:3.11.4",
- "start-order": "1"
- },
- {
- "id":
"org.apache.sling:org.apache.sling.installer.factory.configuration:1.3.2",
- "start-order": "1"
- },
- {
- "id":
"org.apache.sling:org.apache.sling.installer.provider.file:1.3.0",
- "start-order": "1"
- },
- {
- "id": "org.apache.sling:org.apache.sling.javax.activation:0.2.0",
- "start-order": "1"
- },
- {
- "id": "org.apache.sling:org.apache.sling.settings:1.4.2",
- "start-order": "1"
- },
- {
- "id": "org.jvnet.staxex:stax-ex:1.8.3",
- "start-order": "1"
- },
- {
- "id": "org.osgi:org.osgi.service.log:1.4.0",
- "start-order": "1"
- },
- {
- "id": "org.osgi:org.osgi.util.function:1.1.0",
- "start-order": "1"
- },
- {
- "id": "org.osgi:org.osgi.util.promise:1.1.1",
- "start-order": "1"
- },
- {
- "id": "org.osgi:org.osgi.util.pushstream:1.0.1",
- "start-order": "1"
- },
- {
- "id": "org.slf4j:jcl-over-slf4j:${slf4j-version}",
- "start-order": "1"
- },
- {
- "id": "org.slf4j:log4j-over-slf4j:${slf4j-version}",
- "start-order": "1"
- },
- {
- "id": "org.slf4j:slf4j-api:${slf4j-version}",
- "start-order": "1"
- },
- {
- "id": "org.apache.felix:org.apache.felix.scr:2.1.24",
- "start-order": "1"
- }
- ],
"framework-properties": {
"localIndexDir": "${sling.home}/repository/index",
"repository.home": "${sling.home}/repository",
