Fix issue seen with enunciate plugin when importing in eclipse the

[controller.git] / opendaylight / commons / opendaylight / pom.xml

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 39f100d6dc78b89fd8aa4bfa3bfc8c62a76c4d11..77e07c7a9f0cce7c2491221de0acb0a01fb7333b 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -5,22 +5,15 @@
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>

-  <!-- The sitebuildsettings-pom.xml contains the specific settings
-       for a site on which the build can be performed so it will
-       contain for instance reference to the local Maven proxy/host
-       server or the local sonar etc. -->
-  <parent>
-    <groupId>sitebuildsettings</groupId>
-    <artifactId>sitebuildsettings</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../../sitebuildsettings-pom.xml</relativePath>
-  </parent>

   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
   <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
   <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

+    <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
+    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+    <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>

     <siteplugin>3.2</siteplugin>
     <projectinfo>2.6</projectinfo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <siteplugin>3.2</siteplugin>
     <projectinfo>2.6</projectinfo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


@@ -170,12 +163,12 @@
   <distributionManagement>
     <!-- OpenDayLight Released artifact -->
     <repository>
   <distributionManagement>
     <!-- OpenDayLight Released artifact -->
     <repository>

-      <id>${opendaylightID}-release</id>
+      <id>opendaylight-release</id>

       <url>${nexusproxy}/repositories/opendaylight.release/</url>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <url>${nexusproxy}/repositories/opendaylight.release/</url>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>

-      <id>${opendaylightID}-snapshot</id>
+      <id>opendaylight-snapshot</id>

       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
     </snapshotRepository>
     <!-- Site deployment -->
       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
     </snapshotRepository>
     <!-- Site deployment -->


@@ -310,6 +303,19 @@
                     <ignore/>
                   </action>
                 </pluginExecution>
                     <ignore/>
                   </action>
                 </pluginExecution>

+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.codehaus.enunciate</groupId>
+                    <artifactId>maven-enunciate-plugin</artifactId>
+                    <versionRange>[0.0,)</versionRange>
+                    <goals>
+                      <goal>docs</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>

               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>
               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>


@@ -796,36 +802,5 @@
       <artifactId>jersey-json</artifactId>
       <version>${jersey.version}</version>
     </dependency>
       <artifactId>jersey-json</artifactId>
       <version>${jersey.version}</version>
     </dependency>

-    <dependency>
-      <groupId>com.sun.jersey.contribs</groupId>
-      <artifactId>jersey-spring</artifactId>
-      <version>${jersey.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-aop</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-web</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-beans</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>

   </dependencies>
 </project>
   </dependencies>
 </project>