You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2022/01/07 06:51:09 UTC
[sling-slingfeature-maven-plugin] branch master updated: Change start-level to start-order in tests
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new bca48c8 Change start-level to start-order in tests
bca48c8 is described below
commit bca48c8c50cd83cceff62a513f9e262469b9a300
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jan 7 07:51:03 2022 +0100
Change start-level to start-order in tests
---
.../src/main/features/errorsDetected.json | 2 +-
.../analyzer-errors-detected/src/main/features/errorsDetected.json | 2 +-
.../apis-jar-wrapped-flattened-classes/src/main/features/main.json | 4 ++--
src/it/apis-jar-wrapper-bundle/src/main/features/main.json | 2 +-
src/it/apis-jar/src/main/features/main.json | 6 +++---
.../attach-metadata-from-pom/src/main/features/metadata-test.json | 2 +-
.../src/main/features/interpolated-variables.json | 2 +-
src/test/resources/aggregate-features/dir/test_y.json | 2 +-
src/test/resources/aggregate-features/dir2/test_y.json | 2 +-
src/test/resources/aggregate-features/dir3/test_y.json | 2 +-
.../aggregate-features/test-aggregated-feature-example-runtime.json | 4 ++--
src/test/resources/aggregate-features/test_x.json | 2 +-
src/test/resources/attach-resources/features/processed/test_a.json | 2 +-
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/it/analyzer-apiregions-errors-detected/src/main/features/errorsDetected.json b/src/it/analyzer-apiregions-errors-detected/src/main/features/errorsDetected.json
index aa755e9..e43f78e 100644
--- a/src/it/analyzer-apiregions-errors-detected/src/main/features/errorsDetected.json
+++ b/src/it/analyzer-apiregions-errors-detected/src/main/features/errorsDetected.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries.versioning:org.apache.aries.versioning.checker:0.3.1",
- "start-level":"20"
+ "start-order":"20"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/analyzer-errors-detected/src/main/features/errorsDetected.json b/src/it/analyzer-errors-detected/src/main/features/errorsDetected.json
index 1c4abee..bd584cf 100644
--- a/src/it/analyzer-errors-detected/src/main/features/errorsDetected.json
+++ b/src/it/analyzer-errors-detected/src/main/features/errorsDetected.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.osgi:org.osgi.framework:1.9.0",
- "start-level":"20"
+ "start-order":"20"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/apis-jar-wrapped-flattened-classes/src/main/features/main.json b/src/it/apis-jar-wrapped-flattened-classes/src/main/features/main.json
index 997ac88..cae7e8c 100644
--- a/src/it/apis-jar-wrapped-flattened-classes/src/main/features/main.json
+++ b/src/it/apis-jar-wrapped-flattened-classes/src/main/features/main.json
@@ -3,11 +3,11 @@
"bundles":[
{
"id":"org.apache.jackrabbit:oak-lucene:1.10.2",
- "start-level":"4"
+ "start-order":"4"
},
{
"id":"org.apache.jackrabbit:oak-solr-osgi:1.10.2",
- "start-level":"5"
+ "start-order":"5"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/apis-jar-wrapper-bundle/src/main/features/main.json b/src/it/apis-jar-wrapper-bundle/src/main/features/main.json
index b1315d4..7e76274 100644
--- a/src/it/apis-jar-wrapper-bundle/src/main/features/main.json
+++ b/src/it/apis-jar-wrapper-bundle/src/main/features/main.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"io.wcm.osgi.wrapper:io.wcm.osgi.wrapper.gson:2.8.4-0000",
- "start-level":"4"
+ "start-order":"4"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/apis-jar/src/main/features/main.json b/src/it/apis-jar/src/main/features/main.json
index 7bab2ab..9623b88 100644
--- a/src/it/apis-jar/src/main/features/main.json
+++ b/src/it/apis-jar/src/main/features/main.json
@@ -3,15 +3,15 @@
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.inventory:1.0.6",
- "start-level":"5"
+ "start-order":"5"
},
{
"id":"org.apache.felix:org.apache.felix.metatype:1.2.2",
- "start-level":"4"
+ "start-order":"4"
},
{
"id":"org.apache.felix:org.apache.felix.scr:2.1.14",
- "start-level":"4"
+ "start-order":"4"
}
],
"api-regions:JSON|false": [
diff --git a/src/it/attach-metadata-from-pom/src/main/features/metadata-test.json b/src/it/attach-metadata-from-pom/src/main/features/metadata-test.json
index 1e8554c..81e7208 100644
--- a/src/it/attach-metadata-from-pom/src/main/features/metadata-test.json
+++ b/src/it/attach-metadata-from-pom/src/main/features/metadata-test.json
@@ -4,7 +4,7 @@
"bundles":[
{
"id":"org.osgi:org.osgi.framework:${osgi.framework.version}",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/it/variables-interpolator/src/main/features/interpolated-variables.json b/src/it/variables-interpolator/src/main/features/interpolated-variables.json
index 46e2702..ee97116 100644
--- a/src/it/variables-interpolator/src/main/features/interpolated-variables.json
+++ b/src/it/variables-interpolator/src/main/features/interpolated-variables.json
@@ -15,7 +15,7 @@
"bundles":[
{
"id":"org.osgi:org.osgi.framework:${osgi.framework.version}",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/test/resources/aggregate-features/dir/test_y.json b/src/test/resources/aggregate-features/dir/test_y.json
index 54d37bd..192ca6b 100644
--- a/src/test/resources/aggregate-features/dir/test_y.json
+++ b/src/test/resources/aggregate-features/dir/test_y.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/test/resources/aggregate-features/dir2/test_y.json b/src/test/resources/aggregate-features/dir2/test_y.json
index 54d37bd..192ca6b 100644
--- a/src/test/resources/aggregate-features/dir2/test_y.json
+++ b/src/test/resources/aggregate-features/dir2/test_y.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/test/resources/aggregate-features/dir3/test_y.json b/src/test/resources/aggregate-features/dir3/test_y.json
index 88f690e..3aa8110 100644
--- a/src/test/resources/aggregate-features/dir3/test_y.json
+++ b/src/test/resources/aggregate-features/dir3/test_y.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
],
"extension1:JSON|false": [
diff --git a/src/test/resources/aggregate-features/test-aggregated-feature-example-runtime.json b/src/test/resources/aggregate-features/test-aggregated-feature-example-runtime.json
index 497cc18..1cf6273 100644
--- a/src/test/resources/aggregate-features/test-aggregated-feature-example-runtime.json
+++ b/src/test/resources/aggregate-features/test-aggregated-feature-example-runtime.json
@@ -7,7 +7,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"1"
+ "start-order":"1"
}
],
"framework-properties":{
@@ -22,4 +22,4 @@
"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=\"{dollar}{f [...]
}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/aggregate-features/test_x.json b/src/test/resources/aggregate-features/test_x.json
index 9edfa19..5f1bdfa 100644
--- a/src/test/resources/aggregate-features/test_x.json
+++ b/src/test/resources/aggregate-features/test_x.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"mygroup:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
]
}
diff --git a/src/test/resources/attach-resources/features/processed/test_a.json b/src/test/resources/attach-resources/features/processed/test_a.json
index c16ba64..b7f2ecf 100644
--- a/src/test/resources/attach-resources/features/processed/test_a.json
+++ b/src/test/resources/attach-resources/features/processed/test_a.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-level":"20"
+ "start-order":"20"
}
]
}