continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r726790 - in /continuum/branches/continuum-osgi-prototype: ./ continuum-app/ continuum-build-plugin/ continuum-builder/ continuum-commandline-notification-plugin/ continuum-model/ continuum-plugin-api/ continuum-plugin-manager/
Date Mon, 15 Dec 2008 20:17:19 GMT
Author: evenisse
Date: Mon Dec 15 12:17:19 2008
New Revision: 726790

URL: http://svn.apache.org/viewvc?rev=726790&view=rev
Log:
Use dependency/plugin management

Modified:
    continuum/branches/continuum-osgi-prototype/continuum-app/pom.xml
    continuum/branches/continuum-osgi-prototype/continuum-build-plugin/pom.xml
    continuum/branches/continuum-osgi-prototype/continuum-builder/pom.xml
    continuum/branches/continuum-osgi-prototype/continuum-commandline-notification-plugin/pom.xml
    continuum/branches/continuum-osgi-prototype/continuum-model/pom.xml
    continuum/branches/continuum-osgi-prototype/continuum-plugin-api/pom.xml
    continuum/branches/continuum-osgi-prototype/continuum-plugin-manager/pom.xml
    continuum/branches/continuum-osgi-prototype/pom.xml

Modified: continuum/branches/continuum-osgi-prototype/continuum-app/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-osgi-prototype/continuum-app/pom.xml?rev=726790&r1=726789&r2=726790&view=diff
==============================================================================
--- continuum/branches/continuum-osgi-prototype/continuum-app/pom.xml (original)
+++ continuum/branches/continuum-osgi-prototype/continuum-app/pom.xml Mon Dec 15 12:17:19
2008
@@ -1,4 +1,6 @@
-<project>
+<?xml version='1.0' encoding='UTF-8'?>
+<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.continuum</groupId>
@@ -12,37 +14,30 @@
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-plugin-manager</artifactId>
-      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-builder</artifactId>
-      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-build-plugin</artifactId>
-      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-commandline-notification-plugin</artifactId>
-      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.4.3</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.4.3</version>
     </dependency>
   </dependencies>
 

Modified: continuum/branches/continuum-osgi-prototype/continuum-build-plugin/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-osgi-prototype/continuum-build-plugin/pom.xml?rev=726790&r1=726789&r2=726790&view=diff
==============================================================================
--- continuum/branches/continuum-osgi-prototype/continuum-build-plugin/pom.xml (original)
+++ continuum/branches/continuum-osgi-prototype/continuum-build-plugin/pom.xml Mon Dec 15
12:17:19 2008
@@ -1,4 +1,6 @@
-<project>
+<?xml version='1.0' encoding='UTF-8'?>
+<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.continuum</groupId>
@@ -12,17 +14,14 @@
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-plugin-api</artifactId>
-      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.4.3</version>
     </dependency>
   </dependencies>
 
@@ -31,7 +30,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

Modified: continuum/branches/continuum-osgi-prototype/continuum-builder/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-osgi-prototype/continuum-builder/pom.xml?rev=726790&r1=726789&r2=726790&view=diff
==============================================================================
--- continuum/branches/continuum-osgi-prototype/continuum-builder/pom.xml (original)
+++ continuum/branches/continuum-osgi-prototype/continuum-builder/pom.xml Mon Dec 15 12:17:19
2008
@@ -1,4 +1,6 @@
-<project>
+<?xml version='1.0' encoding='UTF-8'?>
+<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.continuum</groupId>
@@ -12,22 +14,18 @@
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-plugin-api</artifactId>
-      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.4.3</version>
     </dependency>
   </dependencies>
 
@@ -36,7 +34,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -47,15 +44,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>

Modified: continuum/branches/continuum-osgi-prototype/continuum-commandline-notification-plugin/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-osgi-prototype/continuum-commandline-notification-plugin/pom.xml?rev=726790&r1=726789&r2=726790&view=diff
==============================================================================
--- continuum/branches/continuum-osgi-prototype/continuum-commandline-notification-plugin/pom.xml
(original)
+++ continuum/branches/continuum-osgi-prototype/continuum-commandline-notification-plugin/pom.xml
Mon Dec 15 12:17:19 2008
@@ -1,4 +1,6 @@
-<project>
+<?xml version='1.0' encoding='UTF-8'?>
+<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.continuum</groupId>
@@ -12,17 +14,14 @@
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-plugin-api</artifactId>
-      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.4.3</version>
     </dependency>
   </dependencies>
 
@@ -31,7 +30,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

Modified: continuum/branches/continuum-osgi-prototype/continuum-model/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-osgi-prototype/continuum-model/pom.xml?rev=726790&r1=726789&r2=726790&view=diff
==============================================================================
--- continuum/branches/continuum-osgi-prototype/continuum-model/pom.xml (original)
+++ continuum/branches/continuum-osgi-prototype/continuum-model/pom.xml Mon Dec 15 12:17:19
2008
@@ -1,4 +1,6 @@
-<project>
+<?xml version='1.0' encoding='UTF-8'?>
+<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.continuum</groupId>
@@ -13,7 +15,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

Modified: continuum/branches/continuum-osgi-prototype/continuum-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-osgi-prototype/continuum-plugin-api/pom.xml?rev=726790&r1=726789&r2=726790&view=diff
==============================================================================
--- continuum/branches/continuum-osgi-prototype/continuum-plugin-api/pom.xml (original)
+++ continuum/branches/continuum-osgi-prototype/continuum-plugin-api/pom.xml Mon Dec 15 12:17:19
2008
@@ -1,4 +1,6 @@
-<project>
+<?xml version='1.0' encoding='UTF-8'?>
+<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.continuum</groupId>
@@ -12,7 +14,6 @@
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-model</artifactId>
-      <version>1.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
@@ -21,7 +22,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -30,15 +30,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>

Modified: continuum/branches/continuum-osgi-prototype/continuum-plugin-manager/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-osgi-prototype/continuum-plugin-manager/pom.xml?rev=726790&r1=726789&r2=726790&view=diff
==============================================================================
--- continuum/branches/continuum-osgi-prototype/continuum-plugin-manager/pom.xml (original)
+++ continuum/branches/continuum-osgi-prototype/continuum-plugin-manager/pom.xml Mon Dec 15
12:17:19 2008
@@ -1,4 +1,6 @@
-<project>
+<?xml version='1.0' encoding='UTF-8'?>
+<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.continuum</groupId>
@@ -11,27 +13,11 @@
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-plugin-api</artifactId>
-      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.main</artifactId>
-      <version>1.2.2</version>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
 

Modified: continuum/branches/continuum-osgi-prototype/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-osgi-prototype/pom.xml?rev=726790&r1=726789&r2=726790&view=diff
==============================================================================
--- continuum/branches/continuum-osgi-prototype/pom.xml (original)
+++ continuum/branches/continuum-osgi-prototype/pom.xml Mon Dec 15 12:17:19 2008
@@ -1,4 +1,6 @@
-<project>
+<?xml version='1.0' encoding='UTF-8'?>
+<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>
   <groupId>org.apache.continuum</groupId>
   <artifactId>continuum-plugins</artifactId>
@@ -14,4 +16,90 @@
     <module>continuum-build-plugin</module>
     <module>continuum-commandline-notification-plugin</module>
   </modules>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.continuum</groupId>
+        <artifactId>continuum-builder</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.continuum</groupId>
+        <artifactId>continuum-model</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.continuum</groupId>
+        <artifactId>continuum-plugin-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.continuum</groupId>
+        <artifactId>continuum-plugin-manager</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.continuum</groupId>
+        <artifactId>continuum-build-plugin</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.continuum</groupId>
+        <artifactId>continuum-commandline-notification-plugin</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.main</artifactId>
+        <version>${felix.core}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.compendium</artifactId>
+        <version>${felix.osgi}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>${felix.osgi}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <properties>
+    <felix.core>1.2.2</felix.core>
+    <felix.osgi>1.2.0</felix.osgi>
+    <slf4j.version>1.4.3</slf4j.version>
+  </properties>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.0.2</version>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>1.4.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>



Mime
View raw message