diff options
Diffstat (limited to 'branches/sca-java-1.3/itest/osgi-tuscany')
8 files changed, 14 insertions, 20 deletions
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> |