aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1824943 - in /aries/trunk/jndi: ./ jndi-api/ jndi-bundle/ jndi-core/ jndi-legacy-support/ jndi-rmi/ jndi-url-itest-biz/ jndi-url-itest-web/ jndi-url-itest/ jndi-url/ parent/
Date Wed, 21 Feb 2018 09:04:52 GMT
Author: gnodet
Date: Wed Feb 21 09:04:52 2018
New Revision: 1824943

URL: http://svn.apache.org/viewvc?rev=1824943&view=rev
Log:
[jndi] Add jndi parent pom

Added:
    aries/trunk/jndi/parent/
    aries/trunk/jndi/parent/pom.xml
Modified:
    aries/trunk/jndi/jndi-api/pom.xml
    aries/trunk/jndi/jndi-bundle/pom.xml
    aries/trunk/jndi/jndi-core/pom.xml
    aries/trunk/jndi/jndi-legacy-support/pom.xml
    aries/trunk/jndi/jndi-rmi/pom.xml
    aries/trunk/jndi/jndi-url-itest-biz/pom.xml
    aries/trunk/jndi/jndi-url-itest-web/pom.xml
    aries/trunk/jndi/jndi-url-itest/pom.xml
    aries/trunk/jndi/jndi-url/pom.xml
    aries/trunk/jndi/pom.xml

Modified: aries/trunk/jndi/jndi-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-api/pom.xml (original)
+++ aries/trunk/jndi/jndi-api/pom.xml Wed Feb 21 09:04:52 2018
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.jndi</groupId>
+        <artifactId>jndi-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.jndi</groupId>

Modified: aries/trunk/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-bundle/pom.xml (original)
+++ aries/trunk/jndi/jndi-bundle/pom.xml Wed Feb 21 09:04:52 2018
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.jndi</groupId>
+        <artifactId>jndi-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.jndi</groupId>
@@ -91,12 +91,12 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-core/pom.xml (original)
+++ aries/trunk/jndi/jndi-core/pom.xml Wed Feb 21 09:04:52 2018
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.jndi</groupId>
+        <artifactId>jndi-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.jndi</groupId>
@@ -65,12 +65,12 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.enterprise</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -82,7 +82,6 @@
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>
-            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -97,26 +96,7 @@
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
-            <version>1.0.0</version>
         </dependency>
     </dependencies>
 
-     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.aries.versioning</groupId>
-                <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-verify</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>version-check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: aries/trunk/jndi/jndi-legacy-support/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-legacy-support/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-legacy-support/pom.xml (original)
+++ aries/trunk/jndi/jndi-legacy-support/pom.xml Wed Feb 21 09:04:52 2018
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.jndi</groupId>
+        <artifactId>jndi-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.jndi</groupId>
@@ -57,7 +57,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: aries/trunk/jndi/jndi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-rmi/pom.xml (original)
+++ aries/trunk/jndi/jndi-rmi/pom.xml Wed Feb 21 09:04:52 2018
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.jndi</groupId>
+        <artifactId>jndi-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.jndi</groupId>
@@ -68,7 +68,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/jndi/jndi-url-itest-biz/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-biz/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest-biz/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest-biz/pom.xml Wed Feb 21 09:04:52 2018
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.jndi</groupId>
+        <artifactId>jndi-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
    
     <groupId>org.apache.aries.jndi</groupId>

Modified: aries/trunk/jndi/jndi-url-itest-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-web/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest-web/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest-web/pom.xml Wed Feb 21 09:04:52 2018
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.jndi</groupId>
+        <artifactId>jndi-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
    
     <groupId>org.apache.aries.jndi</groupId>

Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Wed Feb 21 09:04:52 2018
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.jndi</groupId>
+        <artifactId>jndi-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.jndi</groupId>
@@ -43,19 +43,19 @@
      </scm>
      
      <properties>
-        <exam.version>3.4.0</exam.version>
+        <exam.version>4.11.0</exam.version>
         <url.version>1.6.0</url.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -160,8 +160,8 @@
             <version>2.0.0</version>
             <exclusions>
             	<exclusion>
+                    <groupId>org.osgi</groupId>
             		<artifactId>org.osgi.core</artifactId>
-            		<groupId>org.osgi</groupId>
             	</exclusion>
             </exclusions>
         </dependency>
@@ -171,9 +171,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.8.0.v20120529-1548</version>
+            <version>3.11.3</version>
         </dependency>
 
         <dependency>
@@ -214,13 +214,14 @@
 		<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
 			<artifactId>pax-web-extender-war</artifactId>
-            <version>1.1.17</version>
+            <scope>test</scope>
+            <version>1.1.18</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
 			<artifactId>pax-web-jetty-bundle</artifactId>
             <scope>test</scope>
-            <version>1.1.17</version>
+            <version>1.1.18</version>
 		</dependency>
 
 		<dependency>

Modified: aries/trunk/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/pom.xml (original)
+++ aries/trunk/jndi/jndi-url/pom.xml Wed Feb 21 09:04:52 2018
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.jndi</groupId>
+        <artifactId>jndi-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.jndi</groupId>
@@ -84,12 +84,14 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.enterprise</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Added: aries/trunk/jndi/parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/parent/pom.xml?rev=1824943&view=auto
==============================================================================
--- aries/trunk/jndi/parent/pom.xml (added)
+++ aries/trunk/jndi/parent/pom.xml Wed Feb 21 09:04:52 2018
@@ -0,0 +1,140 @@
+<?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.1</version>
+        <relativePath>../../parent/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.aries.jndi</groupId>
+    <artifactId>jndi-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Aries JNDI Parent</name>
+    <version>1.0.0-SNAPSHOT</version>
+    <description>
+        JNDI project parent pom
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-parent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-parent</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-parent</url>
+    </scm>
+
+    <dependencyManagement>
+        <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.core</artifactId>
+                <version>6.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>osgi.cmpn</artifactId>
+                <version>6.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>osgi.enterprise</artifactId>
+                <version>6.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.7.25</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.testsupport</groupId>
+                <artifactId>org.apache.aries.testsupport.unit</artifactId>
+                <version>1.0.0</version>
+                <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.aries.versioning</groupId>
+                <artifactId>org.apache.aries.versioning.plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-verify</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>version-check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <version>0.12</version>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
+                    <excludeSubProjects>true</excludeSubProjects>
+                    <excludes>
+                        <exclude>**/NOTICE.vm</exclude>
+                        <exclude>**/dependency-reduced-pom.xml</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: aries/trunk/jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/pom.xml?rev=1824943&r1=1824942&r2=1824943&view=diff
==============================================================================
--- aries/trunk/jndi/pom.xml (original)
+++ aries/trunk/jndi/pom.xml Wed Feb 21 09:04:52 2018
@@ -38,6 +38,7 @@
     </description>
 
     <modules>
+        <module>parent</module>
         <module>jndi-api</module>
         <module>jndi-core</module>
         <module>jndi-url</module>
@@ -49,4 +50,14 @@
         <module>jndi-url-itest</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>osgi.core</artifactId>
+                <version>6.0.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>



Mime
View raw message