diff options
Diffstat (limited to 'qpid/java/lib')
| -rw-r--r-- | qpid/java/lib/org.apache.felix.main-2.0.5.jar (renamed from qpid/java/lib/org.apache.felix.framework-2.0.5.jar) | bin | 391763 -> 391763 bytes | |||
| -rw-r--r-- | qpid/java/lib/poms/commons-digester-1.8.1.xml | 6 | ||||
| -rw-r--r-- | qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml (renamed from qpid/java/lib/poms/org.apache.felix.framework-2.0.5.xml) | 20 | ||||
| -rw-r--r-- | qpid/java/lib/poms/org.osgi.core-1.0.0.xml | 22 | ||||
| -rw-r--r-- | qpid/java/lib/poms/xalan-2.7.0.xml | 8 |
5 files changed, 33 insertions, 23 deletions
diff --git a/qpid/java/lib/org.apache.felix.framework-2.0.5.jar b/qpid/java/lib/org.apache.felix.main-2.0.5.jar Binary files differindex 71e5a84231..71e5a84231 100644 --- a/qpid/java/lib/org.apache.felix.framework-2.0.5.jar +++ b/qpid/java/lib/org.apache.felix.main-2.0.5.jar diff --git a/qpid/java/lib/poms/commons-digester-1.8.1.xml b/qpid/java/lib/poms/commons-digester-1.8.1.xml index 1edee7b5f0..56b38bf778 100644 --- a/qpid/java/lib/poms/commons-digester-1.8.1.xml +++ b/qpid/java/lib/poms/commons-digester-1.8.1.xml @@ -19,4 +19,10 @@ <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> <version>1.8.1</version> + <exclusions> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + </exclusions> </dep> diff --git a/qpid/java/lib/poms/org.apache.felix.framework-2.0.5.xml b/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml index cef17fe589..91718725dc 100644 --- a/qpid/java/lib/poms/org.apache.felix.framework-2.0.5.xml +++ b/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml @@ -17,6 +17,24 @@ --> <dep> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> + <artifactId>org.apache.felix.main</artifactId> <version>2.0.5</version> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.shell</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.shell.tui</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + </exclusion> + </exclusions> </dep> diff --git a/qpid/java/lib/poms/org.osgi.core-1.0.0.xml b/qpid/java/lib/poms/org.osgi.core-1.0.0.xml deleted file mode 100644 index 833cc91729..0000000000 --- a/qpid/java/lib/poms/org.osgi.core-1.0.0.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file 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. ---> -<dep> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>1.0.0</version> -</dep> diff --git a/qpid/java/lib/poms/xalan-2.7.0.xml b/qpid/java/lib/poms/xalan-2.7.0.xml index 73ea2df7e2..3fd89aacd8 100644 --- a/qpid/java/lib/poms/xalan-2.7.0.xml +++ b/qpid/java/lib/poms/xalan-2.7.0.xml @@ -19,4 +19,12 @@ <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.7.0</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dep> + + |