Merge branch 'ARIES-1006' into trunk

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1598807 13f79535-47bb-0310-9956-ffa450edef68
apache · May 31, 2014 · 0932408 · 0932408
1 parent 2e23f30
commit 0932408
Show file tree

Hide file tree

Showing 10 changed files with 232 additions and 183 deletions.
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
@@ -1,37 +1,39 @@
 <?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.
+ 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>1.0.0</version>
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
-
-
+
     <groupId>org.apache.aries.tutorials</groupId>
     <artifactId>tutorials</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>Apache Aries Tutorials</name>
     <packaging>pom</packaging>
-  
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tutorials</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tutorials</developerConnection>
@@ -48,7 +50,7 @@
         <ariesUtilVersion>0.1-SNAPSHOT</ariesUtilVersion>
         <ariesWebVersion>0.1-SNAPSHOT</ariesWebVersion>
     </properties>
-    
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -109,13 +111,13 @@
                 <artifactId>geronimo-jta_1.1_spec</artifactId>
                 <version>1.1.1</version>
             </dependency>
-<!--
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_1.0_spec</artifactId>
-                <version>1.1.2</version>
-            </dependency>
--->
+            <!--
+                        <dependency>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+                            <version>1.1.2</version>
+                        </dependency>
+            -->
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_2.0_spec</artifactId>

diff --git a/util/pom.xml b/util/pom.xml
@@ -1,3 +1,4 @@
+<?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
@@ -17,18 +18,19 @@
  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>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.aries.util-parent</artifactId>
     <packaging>pom</packaging>
     <version>1.1.1-SNAPSHOT</version>
-
     <name>Apache Aries Util</name>
     <description>
         This bundle contains the OSGi common util for Apache Aries
@@ -44,6 +46,5 @@
         <module>util-r42</module>
         <module>util</module>
     </modules>
-
 
 </project>
diff --git a/util/util-r42/pom.xml b/util/util-r42/pom.xml
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
  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>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.aries.util-r42</artifactId>
@@ -35,49 +38,52 @@
 
     <!-- no scm info since this and the util project must be built together to produce the util bundle -->
     <!--<properties>-->
-        <!--&lt;!&ndash; Export package versions are maintained in packageinfo files &ndash;&gt;-->
+    <!--&lt;!&ndash; Export package versions are maintained in packageinfo files &ndash;&gt;-->
 
-        <!--<aries.osgi.export.pkg>-->
-            <!--org.apache.aries.util;-->
-            <!--org.apache.aries.util.tracker;-->
-            <!--org.apache.aries.util.nls;-->
-            <!--org.apache.aries.util.io;-->
-            <!--org.apache.aries.util.service.registry;-->
-            <!--org.apache.aries.util.manifest;-->
-            <!--org.apache.aries.util.filesystem;-->
-        <!--</aries.osgi.export.pkg>-->
-        <!--<aries.osgi.import.pkg>-->
-            <!--!org.apache.aries.util*,-->
-            <!--org.osgi.framework.hooks.bundle;resolution:=optional,-->
-            <!--org.osgi.framework.launch;resolution:=optional,-->
-            <!--org.osgi.framework.wiring.*;resolution:=optional,-->
-            <!--org.osgi.service.framework;resolution:=optional,-->
-            <!--org.eclipse.osgi.internal.loader;resolution:=optional,-->
-            <!--org.eclipse.osgi.framework.internal.core;resolution:=optional,-->
-            <!--org.eclipse.osgi.framework.adaptor;resolution:=optional,-->
-            <!--*-->
-        <!--</aries.osgi.import.pkg>-->
-        <!--<aries.osgi.private.pkg>-->
-            <!--org.apache.aries.util.internal,-->
-            <!--org.apache.aries.util.filesystem.impl,-->
-            <!--org.apache.aries.util.tracker.hook-->
-        <!--</aries.osgi.private.pkg>-->
+    <!--<aries.osgi.export.pkg>-->
+    <!--org.apache.aries.util;-->
+    <!--org.apache.aries.util.tracker;-->
+    <!--org.apache.aries.util.nls;-->
+    <!--org.apache.aries.util.io;-->
+    <!--org.apache.aries.util.service.registry;-->
+    <!--org.apache.aries.util.manifest;-->
+    <!--org.apache.aries.util.filesystem;-->
+    <!--</aries.osgi.export.pkg>-->
+    <!--<aries.osgi.import.pkg>-->
+    <!--!org.apache.aries.util*,-->
+    <!--org.osgi.framework.hooks.bundle;resolution:=optional,-->
+    <!--org.osgi.framework.launch;resolution:=optional,-->
+    <!--org.osgi.framework.wiring.*;resolution:=optional,-->
+    <!--org.osgi.service.framework;resolution:=optional,-->
+    <!--org.eclipse.osgi.internal.loader;resolution:=optional,-->
+    <!--org.eclipse.osgi.framework.internal.core;resolution:=optional,-->
+    <!--org.eclipse.osgi.framework.adaptor;resolution:=optional,-->
+    <!--*-->
+    <!--</aries.osgi.import.pkg>-->
+    <!--<aries.osgi.private.pkg>-->
+    <!--org.apache.aries.util.internal,-->
+    <!--org.apache.aries.util.filesystem.impl,-->
+    <!--org.apache.aries.util.tracker.hook-->
+    <!--</aries.osgi.private.pkg>-->
     <!--</properties>-->
 
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
+            <version>4.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
+            <version>4.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -92,4 +98,5 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
 </project>
diff --git a/util/util/pom.xml b/util/util/pom.xml
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
  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>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.aries.util</artifactId>
@@ -37,7 +40,6 @@
 
     <properties>
         <!-- Export package versions are maintained in packageinfo files -->
-
         <aries.osgi.export.pkg>
             org.apache.aries.util*;-split-package:=merge-first
         </aries.osgi.export.pkg>
@@ -69,7 +71,6 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.3.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -80,6 +81,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -96,31 +98,31 @@
     </dependencies>
 
     <build>
-     <plugins>
-<!-- Configure the javadoc plugin to also include the r42 javadoc -->
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8.1</version>
-        <executions>
-          <execution>
-            <id>javadoc-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <configuration>
-		<excludePackageNames>*.impl:*.internal</excludePackageNames>
-              <!-- switch on dependency-driven aggregation -->
-              <includeDependencySources>true</includeDependencySources>
-              
-              <dependencySourceIncludes>
-                <dependencySourceInclude>org.apache.aries:*util*</dependencySourceInclude>
-              </dependencySourceIncludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
+        <plugins>
+            <!-- Configure the javadoc plugin to also include the r42 javadoc -->
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8.1</version>
+                <executions>
+                    <execution>
+                        <id>javadoc-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <excludePackageNames>*.impl:*.internal</excludePackageNames>
+                            <!-- switch on dependency-driven aggregation -->
+                            <includeDependencySources>true</includeDependencySources>
+
+                            <dependencySourceIncludes>
+                                <dependencySourceInclude>org.apache.aries:*util*</dependencySourceInclude>
+                            </dependencySourceIncludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
                 <version>0.1.0</version>
@@ -136,7 +138,8 @@
                         </configuration>
                     </execution>
                 </executions>
-        </plugin>
+            </plugin>
         </plugins>
     </build>
+
 </project>
diff --git a/versioning/pom.xml b/versioning/pom.xml
@@ -16,13 +16,16 @@
  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">
+-->
+<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>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.versioning</groupId>
@@ -34,9 +37,9 @@
         OSGi Semantic Versioning Checker
     </description>
 
-
     <modules>
         <module>versioning-checker</module>
         <module>versioning-plugin</module>
-  </modules>
+    </modules>
+
 </project>