Ignore manifest

[gpl/argeo-slc.git] / org.argeo.slc / pom.xml

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 334483877857709472c2748107a352397dd4608a..c62b3495dbcff6e0f195010bf61a3b80dac0b766 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -15,7 +15,7 @@
                <version.spring-ws>1.5.5.A</version.spring-ws>
                <version.maven>2.0.9</version.maven>
                <version.ant>1.7.0</version.ant>
-               <version.jetty>6.1.11</version.jetty>
+               <version.jetty>6.1.14</version.jetty>
        </properties>
        <scm>
                <connection>
@@ -134,10 +134,14 @@
                                                        <version>${version.jetty}</version>
                                                </dependency>
                                                <dependency>
-                                                       <groupId>log4j</groupId>
-                                                       <artifactId>log4j</artifactId>
-                                                       <version>1.2.14</version>
-                                                       <type>jar</type>
+                                                       <groupId>org.apache.log4j</groupId>
+                                                       <artifactId>com.springsource.org.apache.log4j</artifactId>
+                                                       <version>1.2.15</version>
+                                               </dependency>
+                                               <dependency>
+                                                       <groupId>javax.xml.soap</groupId>
+                                                       <artifactId>com.springsource.javax.xml.soap</artifactId>
+                                                       <version>1.3.0</version>
                                                </dependency>
                                        </dependencies>
                                </plugin>
@@ -269,6 +273,11 @@
                                <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                                <version>1.5.3</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.slf4j</groupId>
+                               <artifactId>com.springsource.slf4j.jcl</artifactId>
+                               <version>1.5.3</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>
                                <artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
@@ -395,6 +404,7 @@
                                <version>1.8.0.9</version>
                        </dependency>
 
+                       <!-- XML -->
                        <dependency>
                                <groupId>org.codehaus.castor</groupId>
                                <artifactId>com.springsource.org.castor</artifactId>
@@ -491,28 +501,16 @@
                        </dependency>
 
                        <!-- OSGi -->
-                       <!-- 
-                       <dependency>
-                               <groupId>org.apache.felix</groupId>
+                       <!--
+                               <dependency> <groupId>org.apache.felix</groupId>
                                <artifactId>org.apache.felix.main</artifactId>
-                               <version>1.2.1</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>org.apache.felix</groupId>
-                                               <artifactId>
-                                                       org.apache.felix.framework
-                                               </artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>org.osgi.core</artifactId>
-                               <version>1.2.0</version>
-                               <scope>provided</scope>
-                       </dependency>
-                        -->
+                               <version>1.2.1</version> <exclusions> <exclusion>
+                               <groupId>org.apache.felix</groupId> <artifactId>
+                               org.apache.felix.framework </artifactId> </exclusion> </exclusions>
+                               </dependency> <dependency> <groupId>org.apache.felix</groupId>
+                               <artifactId>org.osgi.core</artifactId> <version>1.2.0</version>
+                               <scope>provided</scope> </dependency>
+                       -->
                        <dependency>
                                <groupId>org.eclipse.osgi</groupId>
                                <artifactId>org.eclipse.osgi</artifactId>
@@ -647,6 +645,36 @@
                        </snapshots>
                </repository>
        </repositories>
+       <pluginRepositories>
+               <pluginRepository>
+                       <id>argeo</id>
+                       <url>http://www.argeo.org/maven/argeo</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>daily</updatePolicy>
+                               <checksumPolicy>fail</checksumPolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                               <updatePolicy>never</updatePolicy>
+                               <checksumPolicy>fail</checksumPolicy>
+                       </snapshots>
+               </pluginRepository>
+               <pluginRepository>
+                       <id>argeo-snapshots</id>
+                       <url>http://www.argeo.org/maven/argeo-snapshots</url>
+                       <releases>
+                               <enabled>false</enabled>
+                               <updatePolicy>never</updatePolicy>
+                               <checksumPolicy>fail</checksumPolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                               <updatePolicy>always</updatePolicy>
+                               <checksumPolicy>fail</checksumPolicy>
+                       </snapshots>
+               </pluginRepository>
+       </pluginRepositories>
        <distributionManagement>
                <repository>
                        <uniqueVersion>false</uniqueVersion>