You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/02/25 21:57:51 UTC
svn commit: r1293690 - in /qpid/trunk/qpid/java: ./ lib/ lib/poms/
Author: robbie
Date: Sat Feb 25 20:57:51 2012
New Revision: 1293690
URL: http://svn.apache.org/viewvc?rev=1293690&view=rev
Log:
NO-JIRA: rename the felix dep, we are using the 'main' bundle not the 'framework' one. Enable specifying dependency exclusions during POM generation, exclude deps we dont use in the build
Added:
qpid/trunk/qpid/java/lib/org.apache.felix.main-2.0.5.jar
- copied, changed from r1293428, qpid/trunk/qpid/java/lib/org.apache.felix.framework-2.0.5.jar
qpid/trunk/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml
Removed:
qpid/trunk/qpid/java/lib/org.apache.felix.framework-2.0.5.jar
qpid/trunk/qpid/java/lib/poms/org.apache.felix.framework-2.0.5.xml
qpid/trunk/qpid/java/lib/poms/org.osgi.core-1.0.0.xml
Modified:
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/genpom
qpid/trunk/qpid/java/lib/poms/commons-digester-1.8.1.xml
qpid/trunk/qpid/java/lib/poms/xalan-2.7.0.xml
Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1293690&r1=1293689&r2=1293690&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Sat Feb 25 20:57:51 2012
@@ -48,10 +48,9 @@ jetty-util=lib/jetty-util-6.1.14.jar
jetty-servlet-tester=lib/jetty-servlet-tester-6.1.14.jar
servlet-api=lib/servlet-api.jar
-osgi-core=lib/org.osgi.core-1.0.0.jar
-felix-framework=lib/org.apache.felix.framework-2.0.5.jar
+felix-main=lib/org.apache.felix.main-2.0.5.jar
-felix.libs=${osgi-core} ${felix-framework}
+felix.libs=${felix-main}
commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
Modified: qpid/trunk/qpid/java/genpom
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/genpom?rev=1293690&r1=1293689&r2=1293690&view=diff
==============================================================================
--- qpid/trunk/qpid/java/genpom (original)
+++ qpid/trunk/qpid/java/genpom Sat Feb 25 20:57:51 2012
@@ -73,13 +73,15 @@ if opts.name is None:
if opts.artifact is None:
opts.artifact = opts.name
-def lookup(dep, attr):
- nd = dep["dep"][attr]
+def lookup(doc, attr):
+ nd = doc[attr]
if nd is None:
- if nd is None:
- return None
+ return None
return nd.text()
+def lookupElement(doc, attr):
+ return doc[attr]
+
def search(path, file):
for d in path:
f = os.path.join(d, file)
@@ -120,6 +122,7 @@ for jar in jars:
continue
else:
die("unable to locate xml for %s" % jar)
+ dep = dep["dep"]
group = lookup(dep, "groupId")
artifactId = lookup(dep, "artifactId")
version = lookup(dep, "version")
@@ -128,11 +131,28 @@ for jar in jars:
<groupId>%s</groupId>
<artifactId>%s</artifactId>
<version>%s</version>
- <scope>%s</scope>
- </dependency>
-""" % (group, artifactId, version,
+ <scope>%s</scope>""" % (group, artifactId, version,
scopes.get(artifactId, "compile")))
+ exclusions = lookupElement(dep, "exclusions")
+ if exclusions is not None:
+ deps.append("""
+ <exclusions>""")
+ for exclusion in list(exclusions.query["exclusion"]):
+ group = lookup(exclusion, "groupId")
+ artifactId = lookup(exclusion, "artifactId")
+ deps.append("""
+ <exclusion>
+ <groupId>%s</groupId>
+ <artifactId>%s</artifactId>
+ </exclusion>""" % (group, artifactId))
+ deps.append("""
+ </exclusions>""")
+
+ deps.append("""
+ </dependency>
+""")
+
TEMPLATE = """<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Copied: qpid/trunk/qpid/java/lib/org.apache.felix.main-2.0.5.jar (from r1293428, qpid/trunk/qpid/java/lib/org.apache.felix.framework-2.0.5.jar)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/org.apache.felix.main-2.0.5.jar?p2=qpid/trunk/qpid/java/lib/org.apache.felix.main-2.0.5.jar&p1=qpid/trunk/qpid/java/lib/org.apache.felix.framework-2.0.5.jar&r1=1293428&r2=1293690&rev=1293690&view=diff
==============================================================================
(empty)
Modified: qpid/trunk/qpid/java/lib/poms/commons-digester-1.8.1.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/commons-digester-1.8.1.xml?rev=1293690&r1=1293689&r2=1293690&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/commons-digester-1.8.1.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/commons-digester-1.8.1.xml Sat Feb 25 20:57:51 2012
@@ -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>
Added: qpid/trunk/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml?rev=1293690&view=auto
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml (added)
+++ qpid/trunk/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml Sat Feb 25 20:57:51 2012
@@ -0,0 +1,40 @@
+<?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.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>
Modified: qpid/trunk/qpid/java/lib/poms/xalan-2.7.0.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/xalan-2.7.0.xml?rev=1293690&r1=1293689&r2=1293690&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/xalan-2.7.0.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/xalan-2.7.0.xml Sat Feb 25 20:57:51 2012
@@ -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>
+
+
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org