aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r1074490 - in /aries/branches/experimental-release-by-module/proxy: ./ proxy-bundle/ proxy-distro/ proxy-distro/src/ proxy-distro/src/main/ proxy-distro/src/main/assemblies/ proxy-impl/ proxy-itests/ proxy-parent/
Date Fri, 25 Feb 2011 12:03:24 GMT
Author: zoe
Date: Fri Feb 25 12:03:23 2011
New Revision: 1074490

URL: http://svn.apache.org/viewvc?rev=1074490&view=rev
Log:
try release by bundle with a distribution

Added:
    aries/branches/experimental-release-by-module/proxy/proxy-distro/
    aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml
    aries/branches/experimental-release-by-module/proxy/proxy-distro/src/
    aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/
    aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/
    aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml
Removed:
    aries/branches/experimental-release-by-module/proxy/proxy-parent/
Modified:
    aries/branches/experimental-release-by-module/proxy/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=1074490&r1=1074489&r2=1074490&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/pom.xml Fri Feb 25 12:03:23 2011
@@ -25,17 +25,20 @@
     </parent>  
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>proxy-module</artifactId>
+    <artifactId>proxy</artifactId>
     <version>0.4-SNAPSHOT</version>
-    <name>Apache Aries Proxy Module</name>
+    <name>Apache Aries Proxy</name>
     <packaging>pom</packaging>
 
     <description>
-      A group pom for all the proxy modules. Note - this is a reactor pom, it is not the
proxy-parent. 
+      A parent pom for all the proxy modules. 
     </description>
+
+     <properties>
+        <proxy-api-version>0.3</proxy-api-version>
+     </properties>
+
     <modules>
-    <!--Must be in dependency order (maven 2?) -->
-      <module>proxy-parent</module>
       <module>proxy-api</module>
       <module>proxy-impl</module>
       <module>proxy-bundle</module>

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=1074490&r1=1074489&r2=1074490&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 Fri Feb 25 12:03:23
2011
@@ -19,9 +19,9 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.aries.proxy</groupId>
-        <artifactId>proxy-parent</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.3</version>
     </parent>
 
     <artifactId>org.apache.aries.proxy</artifactId>
@@ -58,7 +58,7 @@
         <dependency>
         	<groupId>org.apache.aries.proxy</groupId>
         	<artifactId>org.apache.aries.proxy.impl</artifactId>
-            <version>0.5-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
      <!-- Dependencies on other aries modules, versions specified in module parent -->
 

Added: aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml?rev=1074490&view=auto
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml (added)
+++ aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml Fri Feb 25 12:03:23
2011
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+		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">
+
+	<modelVersion>4.0.0</modelVersion>
+
+    <parent>
+       <groupId>org.apache.aries</groupId>
+       <artifactId>java5-parent</artifactId>
+       <version>0.3</version>
+    </parent>
+
+
+	<groupId>org.apache.aries.proxy.distro</groupId>
+	<artifactId>proxy-distro</artifactId>
+	<name>Proxy distribution</name>
+	<packaging>pom</packaging>
+    <!--
+	<dependencies>
+    	<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.3</version>
+		</dependency>
+    	<dependency>
+			<groupId>org.apache.aries.proxy</groupId>
+			<artifactId>org.apache.aries.proxy</artifactId>
+            <version>0.3</version>
+		</dependency>
+	</dependencies>
+    -->
+    <modules>
+        <module>../proxy-api</module>
+        <module>../proxy-impl</module>
+        <module>../proxy-bundle</module> 
+    </modules>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2-beta-5</version>
+                <executions>
+                  <execution>
+                    <phase>package</phase>
+                       <goals>
+                          <goal>single</goal>
+                       </goals>
+				<configuration>
+					<descriptors>
+						<descriptor>src/main/assemblies/proxy-distro.xml</descriptor>
+					</descriptors>
+				</configuration>
+                </execution>
+                </executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Added: aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml?rev=1074490&view=auto
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml
(added)
+++ aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml
Fri Feb 25 12:03:23 2011
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+		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.
+	-->
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+	<id>proxy-distro</id>
+
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+<!--
+	<dependencySets> 
+		<dependencySet>
+			<outputDirectory></outputDirectory>
+		</dependencySet> 
+	</dependencySets>
+-->
+    <moduleSets>
+        <moduleSet>
+            <sources>
+              <fileSets>
+                  <fileSet>
+                     <excludes>
+                         <exclude>target/**</exclude> 
+                         <exclude>.*/**</exclude>
+                      </excludes>
+                   </fileSet>
+               </fileSets>
+               <outputDirectoryMapping>source/${module.artifactId}</outputDirectoryMapping>
+            </sources>
+            <binaries>
+                  <includeDependencies>false</includeDependencies>
+                  <outputDirectory>binaries</outputDirectory>
+                  <unpack>false</unpack>
+
+            </binaries>
+        </moduleSet>
+    </moduleSets>
+</assembly>

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=1074490&r1=1074489&r2=1074490&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 Fri Feb 25 12:03:23
2011
@@ -19,9 +19,9 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.aries.proxy</groupId>
-        <artifactId>proxy-parent</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.3</version>
     </parent>
 
     <artifactId>org.apache.aries.proxy.impl</artifactId>
@@ -59,12 +59,14 @@
         <dependency>
         	<groupId>org.apache.aries</groupId>
         	<artifactId>org.apache.aries.util</artifactId>
+            <version>0.3</version>
         	<scope>compile</scope>
         </dependency>
     <!-- External dependencies, versions specified in module parent or default-parent
-->
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
+            <version>3.2</version>
             <optional>true</optional>
         </dependency>
         <dependency>

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=1074490&r1=1074489&r2=1074490&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 Fri Feb 25 12:03:23
2011
@@ -19,9 +19,9 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.aries.proxy</groupId>
-        <artifactId>proxy-parent</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.3</version>
     </parent>
 
     <artifactId>org.apache.aries.proxy.itests</artifactId>
@@ -43,6 +43,7 @@
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
+            <version>0.3</version>
             <scope>test</scope>
         </dependency>
     <!-- External dependencies, versions specified in module parent or default-parent
-->
@@ -93,6 +94,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
+            <version>1.2.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -113,6 +115,7 @@
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
+            <version>3.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>



Mime
View raw message