diff options
| author | rsivaram <rsivaram@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-03 12:59:48 +0000 |
|---|---|---|
| committer | rsivaram <rsivaram@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-03 12:59:48 +0000 |
| commit | 668696fac17058aeab5ca6fef79490ca5c8874a0 (patch) | |
| tree | 82e4e963464f1f10bb9cb3518f9ee668fc62f271 /java/sca/itest/osgi-implementation | |
| parent | af13b17fdca8f3936596a8dffc6c7ef9a197267a (diff) | |
Fixes for itest/osgi-tuscany and Felix versions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@673669 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/itest/osgi-implementation')
| -rw-r--r-- | java/sca/itest/osgi-implementation/pom.xml | 12 | ||||
| -rw-r--r-- | java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties | 10 |
2 files changed, 8 insertions, 14 deletions
diff --git a/java/sca/itest/osgi-implementation/pom.xml b/java/sca/itest/osgi-implementation/pom.xml index 85b1becc7f..71d5240a21 100644 --- a/java/sca/itest/osgi-implementation/pom.xml +++ b/java/sca/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/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties index 5aa83f15eb..8399991503 100644 --- a/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties +++ b/java/sca/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 |