You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2011/02/23 16:44:33 UTC
svn commit: r1073791 - in
/aries/branches/experimental-release-by-module/proxy: pom.xml
proxy-api/pom.xml proxy-bundle/pom.xml proxy-impl/pom.xml
proxy-itests/pom.xml proxy-parent/ proxy-parent/pom.xml
Author: zoe
Date: Wed Feb 23 15:44:32 2011
New Revision: 1073791
URL: http://svn.apache.org/viewvc?rev=1073791&view=rev
Log:
separate reactor/parent poms
Added:
aries/branches/experimental-release-by-module/proxy/proxy-parent/
aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml
Modified:
aries/branches/experimental-release-by-module/proxy/pom.xml
aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml
aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml
aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml
aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml
Modified: aries/branches/experimental-release-by-module/proxy/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/pom.xml?rev=1073791&r1=1073790&r2=1073791&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/pom.xml Wed Feb 23 15:44:32 2011
@@ -41,66 +41,13 @@
<url>http://svn.apache.org/viewvc/aries/trunk/proxy</url>
</scm>
- <dependencyManagement>
- <dependencies>
- <!-- internal dependencies -->
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- <version>0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.itests</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <!-- dependencies on other aries modules -->
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>0.3</version>
- </dependency>
- <!-- external dependencies -->
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <modules>
+ <module>proxy-parent</module>
+ <module>proxy-api</module>
+ <module>proxy-impl</module>
+ <module>proxy-bundle</module>
+ <module>proxy-itests</module>
+ </modules>
<build>
<pluginManagement>
@@ -110,6 +57,7 @@
<artifactId>maven-release-plugin</artifactId>
<version>2.0</version>
<configuration>
+ <autoVersionSubmodules>false</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
<arguments>-Papache-release -DskipTests=true</arguments>
@@ -119,12 +67,5 @@
</pluginManagement>
</build>
- <modules>
- <module>proxy-api</module>
- <module>proxy-impl</module>
- <module>proxy-bundle</module>
- <module>proxy-itests</module>
- </modules>
-
</project>
Modified: aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml?rev=1073791&r1=1073790&r2=1073791&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml Wed Feb 23 15:44:32 2011
@@ -20,18 +20,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>proxy</artifactId>
+ <artifactId>proxy-parent</artifactId>
<version>0.4-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.proxy.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Proxy</name>
- <version>0.3</version>
+ <version>FRED-SNAPSHOT</version>
<description>
This bundle contains the Apache Aries Proxy service API.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api</url>
+ </scm>
+
<properties>
<aries.osgi.export.pkg>
org.apache.aries.proxy;
@@ -41,6 +47,7 @@
</aries.osgi.import.pkg>
<aries.osgi.private.pkg>
</aries.osgi.private.pkg>
+ <Implementation-Version>4.4.4</Implementation-Version>
</properties>
<dependencies>
Modified: aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml?rev=1073791&r1=1073790&r2=1073791&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-bundle/pom.xml Wed Feb 23 15:44:32 2011
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>proxy</artifactId>
+ <artifactId>proxy-parent</artifactId>
<version>0.4-SNAPSHOT</version>
</parent>
Modified: aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml?rev=1073791&r1=1073790&r2=1073791&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-impl/pom.xml Wed Feb 23 15:44:32 2011
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>proxy</artifactId>
+ <artifactId>proxy-parent</artifactId>
<version>0.4-SNAPSHOT</version>
</parent>
Modified: aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml?rev=1073791&r1=1073790&r2=1073791&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-itests/pom.xml Wed Feb 23 15:44:32 2011
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>proxy</artifactId>
+ <artifactId>proxy-parent</artifactId>
<version>0.4-SNAPSHOT</version>
</parent>
Added: aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml?rev=1073791&view=auto
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml (added)
+++ aries/branches/experimental-release-by-module/proxy/proxy-parent/pom.xml Wed Feb 23 15:44:32 2011
@@ -0,0 +1,123 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.3</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>proxy-parent</artifactId>
+ <name>Apache Aries Class Proxy</name>
+ <version>0.4-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <description>
+ A common proxy class generation service that can be used by blueprint and jndi and others.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/proxy</url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- internal dependencies -->
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.itests</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ </dependency>
+ <!-- dependencies on other aries modules -->
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>0.3</version>
+ </dependency>
+ <!-- external dependencies -->
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <autoVersionSubmodules>false</autoVersionSubmodules>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy</goals>
+ <arguments>-Papache-release -DskipTests=true</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
+