diff options
| -rw-r--r-- | branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml | 12 | ||||
| -rw-r--r-- | branches/sca-java-1.x/itest/osgi-implementation/pom.xml | 24 |
2 files changed, 24 insertions, 12 deletions
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml b/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml index 005877466d..9778c19e01 100644 --- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml +++ b/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml @@ -7,15 +7,15 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. --> <project> <modelVersion>4.0.0</modelVersion> @@ -66,6 +66,12 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.main</artifactId> <version>1.0.4</version> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.foundation</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/branches/sca-java-1.x/itest/osgi-implementation/pom.xml b/branches/sca-java-1.x/itest/osgi-implementation/pom.xml index 6833209101..97ed8c3e48 100644 --- a/branches/sca-java-1.x/itest/osgi-implementation/pom.xml +++ b/branches/sca-java-1.x/itest/osgi-implementation/pom.xml @@ -7,15 +7,15 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. --> <project> <modelVersion>4.0.0</modelVersion> @@ -34,6 +34,12 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.main</artifactId> <version>1.0.4</version> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.foundation</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -191,8 +197,8 @@ <artifactId>ant-trax</artifactId> <version>1.6.5</version> </dependency> - </dependencies> - + </dependencies> + <executions> <execution> <id>create-bundles</id> @@ -1152,7 +1158,7 @@ value="stockquote/StockQuote.class \ osgi/properties/ds/StockQuoteFactory.xml \ stockquote/OSGiStockQuoteComponentImpl.class" /> - + </ant> <ant antfile="./build-bundles.xml" target="create-bundles"> @@ -1172,7 +1178,7 @@ helloworld/sdo/getGreetings* \ helloworld/sdo/HelloworldFactory.class \ helloworld/sdo/HelloWorldServiceComponent.class" /> - + </ant> <ant antfile="./build-bundles.xml" target="create-bundles"> @@ -1189,7 +1195,7 @@ osgi/sdo/ds/HelloWorldClient.xml \ sdo/ds/helloworldsdo.composite \ helloworld/sdo/client/HelloWorldClientComponent.class" /> - + </ant> <ant antfile="./build-bundles.xml" target="update-bundle"> @@ -1207,7 +1213,7 @@ value="HelloWorldClient.componentType \ HelloWorldService.componentType \ META-INF/sca-contribution.xml" /> - + </ant> </tasks> |