felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apan...@apache.org
Subject svn commit: r1233806 - in /felix/trunk/webconsole-plugins/servicediagnostics: core/pom.xml parent/ parent/pom.xml pom.xml sample/pom.xml
Date Fri, 20 Jan 2012 08:21:22 GMT
Author: apanday
Date: Fri Jan 20 08:21:21 2012
New Revision: 1233806

URL: http://svn.apache.org/viewvc?rev=1233806&view=rev
Log:
poms rework for release

Added:
    felix/trunk/webconsole-plugins/servicediagnostics/parent/
    felix/trunk/webconsole-plugins/servicediagnostics/parent/pom.xml   (with props)
Modified:
    felix/trunk/webconsole-plugins/servicediagnostics/core/pom.xml
    felix/trunk/webconsole-plugins/servicediagnostics/pom.xml
    felix/trunk/webconsole-plugins/servicediagnostics/sample/pom.xml

Modified: felix/trunk/webconsole-plugins/servicediagnostics/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/servicediagnostics/core/pom.xml?rev=1233806&r1=1233805&r2=1233806&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/servicediagnostics/core/pom.xml (original)
+++ felix/trunk/webconsole-plugins/servicediagnostics/core/pom.xml Fri Jan 20 08:21:21 2012
@@ -4,15 +4,24 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.felix</groupId>
-    <artifactId>servicediagnostics</artifactId>
+    <artifactId>servicediagnostics.parent</artifactId>
     <version>0.1.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.apache.felix.servicediagnostics.plugin</artifactId>
   <packaging>bundle</packaging>
   <version>0.1.1-SNAPSHOT</version>
   <name>Apache Felix Web Console Service Diagnostics Plugin</name>
+  <description>
+    This is a plugin for the Apache Felix OSGi web console providing a graphical representation
of services and missing required dependencies.
+  </description>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics/core</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics/core</developerConnection>
+    <url>http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/servicediagnostics/core</url>
+  </scm>
 
   <dependencies>
     <dependency>

Added: felix/trunk/webconsole-plugins/servicediagnostics/parent/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/servicediagnostics/parent/pom.xml?rev=1233806&view=auto
==============================================================================
--- felix/trunk/webconsole-plugins/servicediagnostics/parent/pom.xml (added)
+++ felix/trunk/webconsole-plugins/servicediagnostics/parent/pom.xml Fri Jan 20 08:21:21 2012
@@ -0,0 +1,116 @@
+<?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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.felix</groupId>
+    <artifactId>felix-parent</artifactId>
+    <version>2.1</version>
+    <relativePath>../../../pom/pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.felix</groupId>
+  <artifactId>servicediagnostics.parent</artifactId>
+  <version>0.1.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>Service Diagnostics - Parent</name>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics/parent</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics/parent</developerConnection>
+    <url>http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/servicediagnostics/parent</url>
+  </scm>
+
+<repositories>
+    <repository>
+      <id>scala-tools.org</id>
+      <name>Scala-tools Maven2 Repository</name>
+      <url>http://scala-tools.org/repo-releases</url>
+    </repository>
+  </repositories>
+  
+  <pluginRepositories>
+    <pluginRepository>
+      <id>scala-tools.org</id>
+      <name>Scala-tools Maven2 Repository</name>
+      <url>http://scala-tools.org/repo-releases</url>
+    </pluginRepository>
+  </pluginRepositories>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>4.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>4.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.scr</artifactId>
+      <version>1.6.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>biz.aQute</groupId>
+      <artifactId>bndlib</artifactId>
+      <version>1.43.0</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src/main/scala</sourceDirectory>
+    <testSourceDirectory>src/test/scala</testSourceDirectory>
+    
+    <plugins>
+      <plugin>
+        <groupId>org.scala-tools</groupId>
+        <artifactId>maven-scala-plugin</artifactId>
+        <version>2.15.2</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <scalaVersion>2.9.1</scalaVersion>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.5</version>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+  
+</project>

Propchange: felix/trunk/webconsole-plugins/servicediagnostics/parent/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: felix/trunk/webconsole-plugins/servicediagnostics/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/servicediagnostics/pom.xml?rev=1233806&r1=1233805&r2=1233806&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/servicediagnostics/pom.xml (original)
+++ felix/trunk/webconsole-plugins/servicediagnostics/pom.xml Fri Jan 20 08:21:21 2012
@@ -27,98 +27,18 @@
   </parent>
 
   <groupId>org.apache.felix</groupId>
-  <artifactId>servicediagnostics</artifactId>
+  <artifactId>servicediagnostics.reactor</artifactId>
   <version>0.1.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Service Diagnostics Plugin - Parent</name>
+  <name>Service Diagnostics - Reactor</name>
   <description>
     This is a plugin for the Apache Felix OSGi web console providing a graphical representation
of services and missing required dependencies.
   </description>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/webconsole-plugins/servicediagnostics</developerConnection>
-    <url>http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/servicediagnostics</url>
-  </scm>
-
   <modules>
     <module>core</module>
-    <!--module>sample</module-->
+    <module>sample</module>
   </modules>
-
-  <repositories>
-    <repository>
-      <id>scala-tools.org</id>
-      <name>Scala-tools Maven2 Repository</name>
-      <url>http://scala-tools.org/repo-releases</url>
-    </repository>
-  </repositories>
-  
-  <pluginRepositories>
-    <pluginRepository>
-      <id>scala-tools.org</id>
-      <name>Scala-tools Maven2 Repository</name>
-      <url>http://scala-tools.org/repo-releases</url>
-    </pluginRepository>
-  </pluginRepositories>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>4.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>4.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.scr</artifactId>
-      <version>1.6.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.dependencymanager</artifactId>
-      <version>3.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute</groupId>
-      <artifactId>bndlib</artifactId>
-      <version>1.43.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <sourceDirectory>src/main/scala</sourceDirectory>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
-    
-    <plugins>
-      <plugin>
-        <groupId>org.scala-tools</groupId>
-        <artifactId>maven-scala-plugin</artifactId>
-        <version>2.15.2</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <scalaVersion>2.9.1</scalaVersion>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.5</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
   
 </project>

Modified: felix/trunk/webconsole-plugins/servicediagnostics/sample/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/servicediagnostics/sample/pom.xml?rev=1233806&r1=1233805&r2=1233806&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/servicediagnostics/sample/pom.xml (original)
+++ felix/trunk/webconsole-plugins/servicediagnostics/sample/pom.xml Fri Jan 20 08:21:21 2012
@@ -5,14 +5,14 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.felix</groupId>
-    <artifactId>servicediagnostics</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <artifactId>servicediagnostics.parent</artifactId>
+    <version>0.1.1-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>org.apache.felix</groupId>
   <artifactId>servicediagnostics.sample</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.1.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>Sample Services and Launcher for Service Diagnostics</name>
 



Mime
View raw message