aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From timothyjw...@apache.org
Subject svn commit: r1725467 - in /aries/trunk/async: async-all-index/ async-all-index/pom.xml async-all/pom.xml async-api/pom.xml async-impl/pom.xml async-index/ async-index/pom.xml pom.xml promise-api/pom.xml
Date Tue, 19 Jan 2016 10:56:53 GMT
Author: timothyjward
Date: Tue Jan 19 10:56:53 2016
New Revision: 1725467

URL: http://svn.apache.org/viewvc?rev=1725467&view=rev
Log:
[async] Generate indexes for Aries Async, and tidy up dependencies so that the indexes are
clean

Added:
    aries/trunk/async/async-all-index/
    aries/trunk/async/async-all-index/pom.xml
    aries/trunk/async/async-index/
    aries/trunk/async/async-index/pom.xml
Modified:
    aries/trunk/async/async-all/pom.xml
    aries/trunk/async/async-api/pom.xml
    aries/trunk/async/async-impl/pom.xml
    aries/trunk/async/pom.xml
    aries/trunk/async/promise-api/pom.xml

Added: aries/trunk/async/async-all-index/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/async/async-all-index/pom.xml?rev=1725467&view=auto
==============================================================================
--- aries/trunk/async/async-all-index/pom.xml (added)
+++ aries/trunk/async/async-all-index/pom.xml Tue Jan 19 10:56:53 2016
@@ -0,0 +1,99 @@
+<?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>parent</artifactId>
+        <version>2.0.0</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.aries.async</groupId>
+    <artifactId>async-all-index</artifactId>
+    <name>Apache Aries Async (all-in-one) Index</name>
+    <packaging>pom</packaging>
+    <version>1.0.2-SNAPSHOT</version>
+    <description>
+       An index for the Apache Aries Async Service (all-in-one)
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/async/async-index</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/async/async-index</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/async/async-index</url>
+    </scm>
+
+
+    <properties>
+        <local.url.policy>REQUIRED</local.url.policy>
+    </properties>
+    
+    
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <properties>
+                <local.url.policy>FORBIDDEN</local.url.policy>
+            </properties>
+        </profile>
+        <profile>
+            <id>deploy</id>
+            <properties>
+                <local.url.policy>FORBIDDEN</local.url.policy>
+            </properties>
+        </profile>
+    </profiles>
+    
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.aries.async</groupId>
+            <artifactId>org.apache.aries.async</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-indexer-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <localURLs>${local.url.policy}</localURLs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>index</id>
+                        <goals>
+                            <goal>index</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
+

Modified: aries/trunk/async/async-all/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/async/async-all/pom.xml?rev=1725467&r1=1725466&r2=1725467&view=diff
==============================================================================
--- aries/trunk/async/async-all/pom.xml (original)
+++ aries/trunk/async/async-all/pom.xml Tue Jan 19 10:56:53 2016
@@ -56,6 +56,7 @@
         </aries.osgi.export.pkg>
         <aries.osgi.private.pkg>
         	org.apache.aries.async.impl,
+        	org.osgi.util.tracker,
             net.sf.cglib.*
         </aries.osgi.private.pkg>
         <aries.osgi.import.pkg>
@@ -77,25 +78,47 @@
             <groupId>org.apache.aries.async</groupId>
             <artifactId>org.apache.aries.async.promise.api</artifactId>
             <version>1.0.2-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.async</groupId>
             <artifactId>org.apache.aries.async.api</artifactId>
             <version>1.0.2-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.async</groupId>
             <artifactId>org.apache.aries.async.impl</artifactId>
             <version>1.0.2-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.log</artifactId>
+            <version>1.3.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.util.tracker</artifactId>
+            <version>1.5.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
 	        <groupId>cglib</groupId>
 	  		<artifactId>cglib-nodep</artifactId>
 	  		<version>3.1</version>
+	  		<scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: aries/trunk/async/async-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/async/async-api/pom.xml?rev=1725467&r1=1725466&r2=1725467&view=diff
==============================================================================
--- aries/trunk/async/async-api/pom.xml (original)
+++ aries/trunk/async/async-api/pom.xml Tue Jan 19 10:56:53 2016
@@ -67,11 +67,13 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.annotation</artifactId>
             <version>6.0.1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: aries/trunk/async/async-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/async/async-impl/pom.xml?rev=1725467&r1=1725466&r2=1725467&view=diff
==============================================================================
--- aries/trunk/async/async-impl/pom.xml (original)
+++ aries/trunk/async/async-impl/pom.xml Tue Jan 19 10:56:53 2016
@@ -49,9 +49,12 @@
         <aries.osgi.export.pkg>
         </aries.osgi.export.pkg>
         <aries.osgi.private.pkg>
-        	org.apache.aries.async.impl
+        	org.apache.aries.async.impl,
+        	net.sf.cglib.*
         </aries.osgi.private.pkg>
         <aries.osgi.import.pkg>
+            !net.sf.cglib.asm.util,
+            !org.apache.tools.*,
             *
         </aries.osgi.import.pkg>
         <lastReleaseVersion>1.0.1</lastReleaseVersion>
@@ -70,21 +73,30 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>org.osgi.service.log</artifactId>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>org.osgi.util.tracker</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.annotation</artifactId>
             <version>6.0.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
 	        <groupId>cglib</groupId>
 	  		<artifactId>cglib-nodep</artifactId>
 	  		<version>3.1</version>
+	  		<scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

Added: aries/trunk/async/async-index/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/async/async-index/pom.xml?rev=1725467&view=auto
==============================================================================
--- aries/trunk/async/async-index/pom.xml (added)
+++ aries/trunk/async/async-index/pom.xml Tue Jan 19 10:56:53 2016
@@ -0,0 +1,99 @@
+<?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>parent</artifactId>
+        <version>2.0.0</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.aries.async</groupId>
+    <artifactId>async-index</artifactId>
+    <name>Apache Aries Async Index</name>
+    <packaging>pom</packaging>
+    <version>1.0.2-SNAPSHOT</version>
+    <description>
+       An index for the Apache Aries Async Service
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/async/async-index</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/async/async-index</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/async/async-index</url>
+    </scm>
+
+
+    <properties>
+        <local.url.policy>REQUIRED</local.url.policy>
+    </properties>
+    
+    
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <properties>
+                <local.url.policy>FORBIDDEN</local.url.policy>
+            </properties>
+        </profile>
+        <profile>
+            <id>deploy</id>
+            <properties>
+                <local.url.policy>FORBIDDEN</local.url.policy>
+            </properties>
+        </profile>
+    </profiles>
+    
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.aries.async</groupId>
+            <artifactId>org.apache.aries.async.impl</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-indexer-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <localURLs>${local.url.policy}</localURLs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>index</id>
+                        <goals>
+                            <goal>index</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
+

Modified: aries/trunk/async/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/async/pom.xml?rev=1725467&r1=1725466&r2=1725467&view=diff
==============================================================================
--- aries/trunk/async/pom.xml (original)
+++ aries/trunk/async/pom.xml Tue Jan 19 10:56:53 2016
@@ -48,6 +48,8 @@
         <module>async-api</module>
         <module>async-impl</module>
         <module>async-all</module>
+        <module>async-index</module>
+        <module>async-all-index</module>
     </modules>
 
 </project>

Modified: aries/trunk/async/promise-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/async/promise-api/pom.xml?rev=1725467&r1=1725466&r2=1725467&view=diff
==============================================================================
--- aries/trunk/async/promise-api/pom.xml (original)
+++ aries/trunk/async/promise-api/pom.xml Tue Jan 19 10:56:53 2016
@@ -61,14 +61,10 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.annotation</artifactId>
             <version>6.0.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>



Mime
View raw message