summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
Diffstat (limited to 'branches')
-rw-r--r--branches/sca-java-1.3/itest/osgi-contribution/contribution-classes-v2/pom.xml2
-rw-r--r--branches/sca-java-1.3/itest/osgi-contribution/contribution-classes/pom.xml2
-rw-r--r--branches/sca-java-1.3/itest/osgi-contribution/contribution-test/pom.xml12
-rw-r--r--branches/sca-java-1.3/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties10
-rw-r--r--branches/sca-java-1.3/itest/osgi-implementation/pom.xml12
-rw-r--r--branches/sca-java-1.3/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties10
-rw-r--r--branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/pom.xml12
-rw-r--r--branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties10
-rw-r--r--branches/sca-java-1.3/itest/osgi-tuscany/sca-api/pom.xml2
-rw-r--r--branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/pom.xml2
-rw-r--r--branches/sca-java-1.3/itest/osgi-tuscany/tuscany-3rdparty/pom.xml2
-rw-r--r--branches/sca-java-1.3/itest/osgi-tuscany/tuscany-extensions/pom.xml2
-rw-r--r--branches/sca-java-1.3/itest/osgi-tuscany/tuscany-runtime/pom.xml2
-rw-r--r--branches/sca-java-1.3/itest/osgi-tuscany/tuscany-spi/pom.xml2
-rw-r--r--branches/sca-java-1.3/modules/contribution-osgi/pom.xml2
-rw-r--r--branches/sca-java-1.3/modules/implementation-osgi/pom.xml2
-rw-r--r--branches/sca-java-1.3/modules/osgi-runtime/pom.xml2
-rw-r--r--branches/sca-java-1.3/samples/osgi-supplychain/pom.xml2
18 files changed, 36 insertions, 54 deletions
diff --git a/branches/sca-java-1.3/itest/osgi-contribution/contribution-classes-v2/pom.xml b/branches/sca-java-1.3/itest/osgi-contribution/contribution-classes-v2/pom.xml
index ad5b1aac2c..6e711aff2a 100644
--- a/branches/sca-java-1.3/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-contribution/contribution-classes-v2/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</dependency>
diff --git a/branches/sca-java-1.3/itest/osgi-contribution/contribution-classes/pom.xml b/branches/sca-java-1.3/itest/osgi-contribution/contribution-classes/pom.xml
index adcfdff6f4..1f3a1c53ce 100644
--- a/branches/sca-java-1.3/itest/osgi-contribution/contribution-classes/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-contribution/contribution-classes/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
diff --git a/branches/sca-java-1.3/itest/osgi-contribution/contribution-test/pom.xml b/branches/sca-java-1.3/itest/osgi-contribution/contribution-test/pom.xml
index e6d4c92589..e43a909c66 100644
--- a/branches/sca-java-1.3/itest/osgi-contribution/contribution-test/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-contribution/contribution-test/pom.xml
@@ -65,25 +65,19 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
</dependency>
diff --git a/branches/sca-java-1.3/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/branches/sca-java-1.3/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
index 154176f54e..ea8d272a0c 100644
--- a/branches/sca-java-1.3/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
+++ b/branches/sca-java-1.3/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
@@ -27,12 +27,12 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
felix.auto.start.1= \
- "file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar" \
- "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar"
+ "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \
+ "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar"
-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \
felix.startlevel.framework=1
felix.startlevel.bundle=1
diff --git a/branches/sca-java-1.3/itest/osgi-implementation/pom.xml b/branches/sca-java-1.3/itest/osgi-implementation/pom.xml
index 59f7c73a35..1cd86002a8 100644
--- a/branches/sca-java-1.3/itest/osgi-implementation/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-implementation/pom.xml
@@ -33,19 +33,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
<!-- Exclude the javax.servlet to avoid conflict -->
<exclusions>
<exclusion>
@@ -58,7 +52,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
diff --git a/branches/sca-java-1.3/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/branches/sca-java-1.3/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
index 5aa83f15eb..8399991503 100644
--- a/branches/sca-java-1.3/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ b/branches/sca-java-1.3/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
@@ -27,13 +27,13 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
felix.auto.start.1= \
- "file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar" \
- "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar"
+ "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \
+ "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar"
-# "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \
felix.startlevel.framework=1
felix.startlevel.bundle=1
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
index 8ce710a26f..c056c249b0 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
@@ -42,19 +42,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
@@ -66,7 +60,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
</dependency>
End Felix dependencies -->
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
index 286bbb1229..6a38f48c4a 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
@@ -27,12 +27,12 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
felix.auto.start.1= \
- "file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar"
+ "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar"
-# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar"
-# "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar"
+# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \
+# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \
felix.startlevel.framework=1
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/sca-api/pom.xml b/branches/sca-java-1.3/itest/osgi-tuscany/sca-api/pom.xml
index bcf47cb7cb..e8436ccb3c 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/sca-api/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/sca-api/pom.xml
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/pom.xml b/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/pom.xml
index 9dc4644438..6a376e30d7 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.4</version>
</dependency>
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-3rdparty/pom.xml b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
index de2b517e2f..d78949be0e 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
@@ -291,7 +291,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-extensions/pom.xml b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-extensions/pom.xml
index 435405f9b1..315dd882ca 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-extensions/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-extensions/pom.xml
@@ -324,7 +324,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-runtime/pom.xml b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-runtime/pom.xml
index 07fd6df500..0b21c3d957 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-runtime/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-runtime/pom.xml
@@ -153,7 +153,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-spi/pom.xml b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-spi/pom.xml
index fd2fa81bd8..30d10bfcb4 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-spi/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-spi/pom.xml
@@ -98,7 +98,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/branches/sca-java-1.3/modules/contribution-osgi/pom.xml b/branches/sca-java-1.3/modules/contribution-osgi/pom.xml
index 41459ca344..d231f5ef47 100644
--- a/branches/sca-java-1.3/modules/contribution-osgi/pom.xml
+++ b/branches/sca-java-1.3/modules/contribution-osgi/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.4</version>
</dependency>
diff --git a/branches/sca-java-1.3/modules/implementation-osgi/pom.xml b/branches/sca-java-1.3/modules/implementation-osgi/pom.xml
index f256dcd19a..795e47fc8c 100644
--- a/branches/sca-java-1.3/modules/implementation-osgi/pom.xml
+++ b/branches/sca-java-1.3/modules/implementation-osgi/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.4</version>
</dependency>
diff --git a/branches/sca-java-1.3/modules/osgi-runtime/pom.xml b/branches/sca-java-1.3/modules/osgi-runtime/pom.xml
index 313771ad5d..5b646ebf79 100644
--- a/branches/sca-java-1.3/modules/osgi-runtime/pom.xml
+++ b/branches/sca-java-1.3/modules/osgi-runtime/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.4</version>
</dependency>
diff --git a/branches/sca-java-1.3/samples/osgi-supplychain/pom.xml b/branches/sca-java-1.3/samples/osgi-supplychain/pom.xml
index f4da678078..b700e488a6 100644
--- a/branches/sca-java-1.3/samples/osgi-supplychain/pom.xml
+++ b/branches/sca-java-1.3/samples/osgi-supplychain/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.4</version>
</dependency>
<dependency>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 08:05:34 +0000