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 2011/02/08 18:21:51 UTC
svn commit: r1068486 - in /qpid/branches/0.5.x-dev/qpid/java: ./ lib/
lib/poms/
Author: robbie
Date: Tue Feb 8 17:21:49 2011
New Revision: 1068486
URL: http://svn.apache.org/viewvc?rev=1068486&view=rev
Log:
QPID-1916, QPID-2977: port the recent changes to maven artifact generation on trunk
Added:
qpid/branches/0.5.x-dev/qpid/java/lib/maven-ant-tasks-2.1.1.jar
qpid/branches/0.5.x-dev/qpid/java/lib/poms/backport-util-concurrent-2.2.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-cli-1.0.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-codec-1.3.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-collections-3.2.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-configuration-1.6.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-digester-1.8.1.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-lang-2.2.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-logging-1.0.4.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-pool-1.4.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/derby-10.3.2.1.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/junit-3.8.1.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/log4j-1.2.12.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-core-1.0.1.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.osgi.core-1.0.0.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-api-1.4.0.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-log4j12-1.4.0.xml
qpid/branches/0.5.x-dev/qpid/java/lib/poms/xalan-2.7.0.xml
Removed:
qpid/branches/0.5.x-dev/qpid/java/lib/poms/backport-util-concurrent-2.2.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-beanutils-core-1.8.0.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-cli-1.0.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-codec-1.3.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-collections-3.2.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-configuration-1.6.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-digester-1.8.1.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-lang-2.2.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-logging-1.0.4.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-pool-1.4.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/derby-10.3.2.1.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/junit-3.8.1.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/log4j-1.2.12.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-core-1.0.1.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-filter-ssl-1.0.1.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.osgi.core-1.0.0.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-api-1.4.0.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-log4j12-1.4.0.pom
qpid/branches/0.5.x-dev/qpid/java/lib/poms/xalan-2.7.0.pom
Modified:
qpid/branches/0.5.x-dev/qpid/java/build.xml
qpid/branches/0.5.x-dev/qpid/java/common.xml
qpid/branches/0.5.x-dev/qpid/java/genpom
qpid/branches/0.5.x-dev/qpid/java/module.xml
Modified: qpid/branches/0.5.x-dev/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/build.xml?rev=1068486&r1=1068485&r2=1068486&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/build.xml (original)
+++ qpid/branches/0.5.x-dev/qpid/java/build.xml Tue Feb 8 17:21:49 2011
@@ -62,6 +62,10 @@
<iterate target="pom"/>
</target>
+ <target name="release-mvn" description="Install the artifacts into the local repository">
+ <iterate target="release-mvn"/>
+ </target>
+
<target name="compile" description="compile sources">
<iterate target="compile"/>
</target>
Modified: qpid/branches/0.5.x-dev/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/common.xml?rev=1068486&r1=1068485&r2=1068486&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/common.xml (original)
+++ qpid/branches/0.5.x-dev/qpid/java/common.xml Tue Feb 8 17:21:49 2011
@@ -68,6 +68,13 @@
</fileset>
</path>
+ <property name="maven.local.repo" value="${build.scratch}/maven-local-repo"/>
+ <property name="maven.unique.version" value="false"/>
+ <property name="maven.snapshot" value="true"/>
+ <condition property="maven.version.suffix" value="" else="-SNAPSHOT">
+ <isfalse value="${maven.snapshot}"/>
+ </condition>
+
<macrodef name="indirect">
<attribute name="name"/>
<attribute name="variable"/>
Modified: qpid/branches/0.5.x-dev/qpid/java/genpom
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/genpom?rev=1068486&r1=1068485&r2=1068486&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/genpom (original)
+++ qpid/branches/0.5.x-dev/qpid/java/genpom Tue Feb 8 17:21:49 2011
@@ -32,9 +32,11 @@ parser.add_option("-a", "--artifact")
parser.add_option("-v", "--version")
parser.add_option("-d", "--description", default="")
parser.add_option("-u", "--url", default="")
-parser.add_option("-i", "--ignore", action="store_true", help="ignore missing poms")
+parser.add_option("-m", "--modules", help="modules dependencies")
+parser.add_option("-p", "--prefix", help="prefix of the project's artifacts names")
+parser.add_option("-i", "--ignore", action="store_true", help="ignore missing deps")
parser.add_option("-s", "--search-path", action="append",
- help="the path to search for poms")
+ help="the path to search for deps")
parser.add_option("-S", "--scope", metavar="ARTIFACT=SCOPE", action="append",
default=[],
help="specify scope for an artifact")
@@ -47,7 +49,7 @@ if opts.search_path is None:
else:
path = []
for p in opts.search_path:
- path.extend(p.split(":"))
+ path.extend(p.split(os.pathsep))
expanded_path = []
for p in path:
@@ -62,16 +64,18 @@ if opts.version is None:
if opts.name is None and opts.artifact is None:
die("one of name or artifact must be supplied")
+if opts.prefix is not None:
+ opts.artifact = opts.prefix + "-" + opts.artifact
+
if opts.name is None:
opts.name = opts.artifact
if opts.artifact is None:
opts.artifact = opts.name
-def lookup(pom, attr):
- nd = pom["project"][attr]
+def lookup(dep, attr):
+ nd = dep["dep"][attr]
if nd is None:
- nd = pom["project/parent"][attr]
if nd is None:
return None
return nd.text()
@@ -90,17 +94,35 @@ for s in opts.scope:
scopes[m.group(1)] = m.group(2)
deps = []
+module_depends = []
+if opts.modules is not None:
+ module_depends = opts.modules.replace("/", "-").split();
+
+for module in module_depends:
+ if opts.prefix is None:
+ artifactId = module
+ else:
+ artifactId = opts.prefix + "-" + module
+
+ deps.append("""
+ <dependency>
+ <groupId>%s</groupId>
+ <artifactId>%s</artifactId>
+ <version>%s</version>
+ </dependency>
+""" % (opts.group, artifactId, opts.version))
+
for jar in jars:
base, ext = os.path.splitext(os.path.basename(jar))
- pom = search(expanded_path, "%s.pom" % base)
- if pom is None:
+ dep = search(expanded_path, "%s.xml" % base)
+ if dep is None:
if opts.ignore:
continue
else:
- die("unable to locate pom for %s" % jar)
- group = lookup(pom, "groupId")
- artifactId = lookup(pom, "artifactId")
- version = lookup(pom, "version")
+ die("unable to locate xml for %s" % jar)
+ group = lookup(dep, "groupId")
+ artifactId = lookup(dep, "artifactId")
+ version = lookup(dep, "version")
deps.append("""
<dependency>
<groupId>%s</groupId>
@@ -119,22 +141,27 @@ TEMPLATE = """<?xml version="1.0" encodi
<groupId>%(group)s</groupId>
<artifactId>%(artifact)s</artifactId>
<version>%(version)s</version>
+
<name>%(name)s</name>
<url>%(url)s</url>
<description>%(description)s</description>
+
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
+
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
- <url>/LICENSE.txt</url>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
</license>
</licenses>
+
<dependencies>
%(dependencies)s
</dependencies>
+
</project>
"""
Added: qpid/branches/0.5.x-dev/qpid/java/lib/maven-ant-tasks-2.1.1.jar
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/maven-ant-tasks-2.1.1.jar?rev=1068486&view=auto
==============================================================================
Files qpid/branches/0.5.x-dev/qpid/java/lib/maven-ant-tasks-2.1.1.jar (added) and qpid/branches/0.5.x-dev/qpid/java/lib/maven-ant-tasks-2.1.1.jar Tue Feb 8 17:21:49 2011 differ
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/backport-util-concurrent-2.2.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/backport-util-concurrent-2.2.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/backport-util-concurrent-2.2.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/backport-util-concurrent-2.2.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>2.2</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.8.0</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-cli-1.0.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-cli-1.0.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-cli-1.0.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-cli-1.0.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-codec-1.3.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-codec-1.3.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-codec-1.3.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-codec-1.3.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-collections-3.2.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-collections-3.2.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-collections-3.2.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-collections-3.2.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-configuration-1.6.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-configuration-1.6.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-configuration-1.6.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-configuration-1.6.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-digester-1.8.1.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-digester-1.8.1.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-digester-1.8.1.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-digester-1.8.1.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8.1</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-lang-2.2.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-lang-2.2.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-lang-2.2.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-lang-2.2.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-logging-1.0.4.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-logging-1.0.4.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-logging-1.0.4.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-logging-1.0.4.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-pool-1.4.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-pool-1.4.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-pool-1.4.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/commons-pool-1.4.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.4</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/derby-10.3.2.1.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/derby-10.3.2.1.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/derby-10.3.2.1.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/derby-10.3.2.1.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.3.2.1</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.0</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/junit-3.8.1.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/junit-3.8.1.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/junit-3.8.1.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/junit-3.8.1.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/log4j-1.2.12.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/log4j-1.2.12.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/log4j-1.2.12.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/log4j-1.2.12.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-core-1.0.1.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-core-1.0.1.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-core-1.0.1.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-core-1.0.1.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>1.0.1</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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.mina</groupId>
+ <artifactId>mina-filter-ssl</artifactId>
+ <version>1.0.1</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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.framework</artifactId>
+ <version>1.0.0</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.osgi.core-1.0.0.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.osgi.core-1.0.0.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.osgi.core-1.0.0.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/org.osgi.core-1.0.0.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-api-1.4.0.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-api-1.4.0.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-api-1.4.0.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-api-1.4.0.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.0</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-log4j12-1.4.0.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-log4j12-1.4.0.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-log4j12-1.4.0.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/slf4j-log4j12-1.4.0.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.0</version>
+</dep>
Added: qpid/branches/0.5.x-dev/qpid/java/lib/poms/xalan-2.7.0.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/lib/poms/xalan-2.7.0.xml?rev=1068486&view=auto
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/lib/poms/xalan-2.7.0.xml (added)
+++ qpid/branches/0.5.x-dev/qpid/java/lib/poms/xalan-2.7.0.xml Tue Feb 8 17:21:49 2011
@@ -0,0 +1,22 @@
+<?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>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+</dep>
Modified: qpid/branches/0.5.x-dev/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/module.xml?rev=1068486&r1=1068485&r2=1068486&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/module.xml (original)
+++ qpid/branches/0.5.x-dev/qpid/java/module.xml Tue Feb 8 17:21:49 2011
@@ -18,10 +18,15 @@
- under the License.
-
-->
-<project name="module">
+<project name="module" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="common.xml"/>
+ <path id="maven-ant-tasks.classpath" path="${project.root}/lib/maven-ant-tasks-2.1.1.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
<map property="module" value="${basedir}" split="${path.separator}">
<globmapper from="${project.root}${file.separator}*" to="*"/>
</map>
@@ -105,6 +110,9 @@
<property name="module.test.jar"
location="${build.lib}/${project.name}-${module.name}-tests-${project.version}.jar"/>
+ <property name="module.source.jar"
+ location="${build.lib}/${project.name}-${module.name}-${project.version}-sources.jar"/>
+
<!-- module.depends and module.test.depends are supplied by the importing file -->
<property name="module.depends" value=""/>
<property name="module.test.depends" value=""/>
@@ -167,18 +175,37 @@
<target name="pom" depends="prepare" if="module.genpom">
<jython path="${mllib.dir}">
<args>
- <arg line="${project.root}/genpom"/>
- <arg line="-s ${project.root}/lib/poms"/>
- <arg line="-o ${build}/${module.name}.pom"/>
+ <arg line='"${project.root}/genpom"'/>
+ <arg line='-s "${project.root}/lib/poms"'/>
+ <arg line='-o "${build.scratch}/qpid-${module.name}.pom"'/>
+ <arg line="-u http://qpid.apache.org"/>
<arg line="-g org.apache.qpid"/>
+ <arg line="-v ${project.version}${maven.version.suffix}"/>
+ <arg line="-p qpid"/>
+ <arg line='-m "${module.depends}"'/>
<arg line="-a ${module.name}"/>
- <arg line="-v ${project.version}"/>
<arg line="${module.genpom.args}"/>
<arg line="${module.libs}"/>
</args>
</jython>
</target>
+ <target name="release-mvn" depends="pom" if="module.genpom" description="Install the artifacts into the local repository and prepare the release">
+ <antcall target="build"/>
+
+ <artifact:pom id="module.pom" file="${build.scratch}/qpid-${module.name}.pom"/>
+
+ <artifact:install file="${module.jar}" pomRefId="module.pom">
+ <localRepository path="${maven.local.repo}"/>
+ </artifact:install>
+
+ <artifact:deploy file="${module.jar}" pomRefId="module.pom" uniqueVersion="${maven.unique.version}">
+ <attach file="${module.source.jar}" classifier="sources"/>
+ <localRepository path="${maven.local.repo}"/>
+ <remoteRepository url="file://${module.release.base}/maven"/>
+ </artifact:deploy>
+ </target>
+
<target name="precompile"/>
<target name="compile" depends="prepare,precompile" description="compile sources">
@@ -350,7 +377,7 @@
<target name="postbuild" description="run after a build"/>
- <target name="build" depends="jar,jar-tests,libs,copy-bin,copy-etc,postbuild" description="compile and copy resources into build tree"/>
+ <target name="build" depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild" description="compile and copy resources into build tree"/>
<target name="jar.manifest" depends="compile" if="module.manifest">
<jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}"/>
</target>
@@ -371,6 +398,17 @@
<copylist todir="${build.lib}" dir="${project.root}" files="${module.libs}"/>
</target>
+ <target name="jar-sources" depends="prepare" description="create sources jar">
+ <jar destfile="${module.source.jar}">
+ <fileset dir="${project.root}/resources">
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ </fileset>
+ <fileset dir="${module.src}" includes="**/*.java"/>
+ <fileset dir="${module.precompiled}" includes="**/*.java"/>
+ </jar>
+ </target>
+
<map property="module.depends.jars" value="${module.depends}" join=",">
<globmapper from="*" to="${project.name}-*-${project.version}.jar"/>
<filtermapper>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org