Revision: 17330
Author: emmartins
Date: Wed Mar 16 08:45:39 2011
Log: updating license, jsip, slee plugins and osgi manifest in parent 2.x
http://code.google.com/p/mobicents/source/detail?r=17330

Modified:
 /branches/parent/2.x.y/pom.xml

=======================================
--- /branches/parent/2.x.y/pom.xml      Thu Mar 10 09:42:26 2011
+++ /branches/parent/2.x.y/pom.xml      Wed Mar 16 08:45:39 2011
@@ -1,11 +1,12 @@
-<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";> +<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>
        <packaging>pom</packaging>

        <groupId>org.mobicents</groupId>
        <artifactId>mobicents-parent</artifactId>
        <version>2.17-SNAPSHOT</version>
-
+
        <name>Mobicents :: Parent :: mobicents</name>
        <description>Mobicents :: Parent pom for 2.x releases</description>
        <url>http://www.mobicents.org</url>
@@ -30,7 +31,7 @@
                        
<organizationUrl>http://www.redhat.com/</organizationUrl>
                        <roles>
                                <role>Media Server Active Developer</role>
-                               <role>SLEE Active Developer</role>
+                               <role>SLEE Active Developer</role>
                                <role>SS7 Active Developer</role>
                        </roles>
                        <timezone>+1</timezone>
@@ -70,10 +71,10 @@
                        
<organizationUrl>http://www.redhat.com/</organizationUrl>
                        <roles>
                                <role>Mobicents Platform Lead</role>
-                               <role>SLEE Developer</role>
+                               <role>SLEE Developer</role>
                        </roles>
                        <timezone>+1</timezone>
-               </developer>
+               </developer>
                <developer>
                        <id>jean.deruelle</id>
                        <name>Jean Deruelle</name>
@@ -108,41 +109,41 @@
                        <roles>
                                <role>Media Server Developer</role>
                                <role>SIP Servlets Active Developer</role>
-                               <role>SLEE Developer</role>
+                               <role>SLEE Developer</role>
                        </roles>
                        <timezone>+1</timezone>
-               </developer>
+               </developer>
        </developers>
        <licenses>
                <license>
-                       <name>GNU GENERAL PUBLIC LICENSE</name>
-                       <url>http://www.gnu.org/licenses/gpl.html</url>
+                       <name>GNU LESSER GENERAL PUBLIC LICENSE</name>
+                       <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
                        <distribution>repo</distribution>
                </license>
        </licenses>
        <distributionManagement>
-    <repository>
-      <id>jboss-releases-repository</id>
-      <name>JBoss Releases Repository</name>
- <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
-    </repository>
-    <snapshotRepository>
-      <id>jboss-snapshots-repository</id>
-      <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-       <properties>
+               <repository>
+                       <id>jboss-releases-repository</id>
+                       <name>JBoss Releases Repository</name>
+ <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+               </repository>
+               <snapshotRepository>
+                       <id>jboss-snapshots-repository</id>
+                       <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+               </snapshotRepository>
+       </distributionManagement>
+
+       <properties>
                <!-- dependency versions -->
                <jboss.version>5.1.0.GA</jboss.version>
                <junit.version>4.1</junit.version>
-
+
                <jain-slee.version>1.1</jain-slee.version>
                <commons-pool.version>1.4</commons-pool.version>
                <ant.version>1.6.5</ant.version>
                <jain-sip-api.version>1.2</jain-sip-api.version>
-               <jain-sip-ri.version>1.2.X-SNAPSHOT</jain-sip-ri.version>
+               <jain-sip-ri.version>1.2.162</jain-sip-ri.version>
                <jain-mgcp.version>1.0</jain-mgcp.version>
                <servlet-api.version>2.4</servlet-api.version>
                <rome.version>0.9</rome.version>
@@ -153,40 +154,40 @@
                <smpp.version>0.3.7</smpp.version>
                <jaxb.version>2.1</jaxb.version>
                <clover.version>2.6.3</clover.version>
-
+
                <!-- SEAM -->
                <jboss-seam.version>2.2.0.GA</jboss-seam.version>
-               <jboss-el.version>1.0_02.CR5</jboss-el.version>
+               <jboss-el.version>1.0_02.CR5</jboss-el.version>
                <hibernate-search.version>3.0.1.GA</hibernate-search.version>
                <jbpm.version>3.2.1</jbpm.version>
                <jsf-facelets.version>1.1.15.B1</jsf-facelets.version>
-
-               <!--  build properties  -->
+
+               <!-- build properties -->
                <compile.debug>true</compile.debug>
                <compile.source>1.5</compile.source>
-               <node>default</node>
+               <node>default</node>
                <jboss.home>${env.JBOSS_HOME}</jboss.home>
-
+
                <!-- redefine in your POM if you want to change in manifest file 
-->
                <manifest.url>http://www.mobicents.org</manifest.url>
<manifest.implementation.title>${pom.groupId}:${pom.artifactId}</manifest.implementation.title> <manifest.implementation.version>${pom.version}</manifest.implementation.version> <manifest.implementation.vendor>JBoss, a Red Hat division</manifest.implementation.vendor>
-
+
                <!-- default versions for mobicents maven plugins -->
- <mobicents.tools.mavenplugin.du.version>2.0.0.CR1</mobicents.tools.mavenplugin.du.version> - <mobicents.tools.mavenplugin.library.version>1.0.0.CR1</mobicents.tools.mavenplugin.library.version> + <mobicents.tools.mavenplugin.du.version>2.0.0.CR2</mobicents.tools.mavenplugin.du.version> + <mobicents.tools.mavenplugin.library.version>1.0.0.CR2</mobicents.tools.mavenplugin.library.version> <mobicents.tools.mavenplugin.eclipse.version>1.0.0.FINAL</mobicents.tools.mavenplugin.eclipse.version>
-
+
        </properties>

        <dependencyManagement>
                <dependencies>
-
-               <!-- dependency versions -->
-
-               <!-- JBOSS AS -->
-
+
+                       <!-- dependency versions -->
+
+                       <!-- JBOSS AS -->
+
                        <dependency>
                                <groupId>org.jboss.jbossas</groupId>
                                
<artifactId>jboss-as-component-matrix</artifactId>
@@ -194,9 +195,9 @@
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
+                       <dependency>
                                <groupId>org.jboss.jbossas</groupId>
-                               <artifactId>jboss-as-cluster</artifactId>
+                               <artifactId>jboss-as-cluster</artifactId>
                                <version>${jboss.version}</version>
                        </dependency>
                        <dependency>
@@ -206,12 +207,12 @@
                        </dependency>
                        <dependency>
                                <groupId>org.jboss.jbossas</groupId>
-               <artifactId>jboss-as-j2se</artifactId>
+                               <artifactId>jboss-as-j2se</artifactId>
                                <version>${jboss.version}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.jboss.jbossas</groupId>
-                               <artifactId>jboss-as-system-jmx</artifactId>
+                               <artifactId>jboss-as-system-jmx</artifactId>
                                <version>${jboss.version}</version>
                        </dependency>
                        <dependency>
@@ -224,135 +225,135 @@
                                <artifactId>jboss-as-console</artifactId>
                                <version>${jboss.version}</version>
                        </dependency>
-
-
+
+
                        <dependency>
                                <groupId>javax.slee</groupId>
                                <artifactId>jain-slee</artifactId>
                                <version>${jain-slee.version}</version>
-                       </dependency>
-
-               <dependency>
-                       <groupId>ant</groupId>
-                       <artifactId>ant</artifactId>
-                       <version>${ant.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>commons-pool</groupId>
-                       <artifactId>commons-pool</artifactId>
-                       <version>${commons-pool.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>jain</groupId>
-                       <artifactId>jain-mgcp-ri</artifactId>
-                       <version>${jain-mgcp.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.sip</groupId>
-                       <artifactId>jain-sip-api</artifactId>
-                       <version>${jain-sip-api.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.sip</groupId>
-                       <artifactId>jain-sip-ri</artifactId>
-                       <version>${jain-sip-ri.version}</version>
-               </dependency>
-
-               <dependency>
-               <groupId>rome</groupId>
-                       <artifactId>rome</artifactId>
-               <version>${rome.version}</version>
-       </dependency>
-
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
-                       <version>${servlet-api.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>jaxb-api</artifactId>
-                       <version>${jaxb.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.xml</groupId>
-                       <artifactId>jaxb-impl</artifactId>
-                       <version>${jaxb.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>commons-httpclient</groupId>
-                       <artifactId>commons-httpclient</artifactId>
-                       <version>${commons.httpclient.version}</version>
-               </dependency>
-
-               <dependency>
-               <groupId>jdom</groupId>
-                       <artifactId>jdom</artifactId>
-               <version>${jdom.version}</version>
-       </dependency>
-
-       <dependency>
-                       <groupId>ie.omk</groupId>
-                       <artifactId>smppapi</artifactId>
-                       <version>${smpp.version}</version>
-               </dependency>
-
-               <!-- SEAM and converged demo -->
-               <dependency>
-               <groupId>org.jboss.seam</groupId>
-                       <artifactId>jboss-el</artifactId>
-               <version>${jboss-el.version}</version>
-       </dependency>
-               <dependency>
-               <groupId>org.jboss.seam</groupId>
-               <artifactId>jboss-seam</artifactId>
-               <version>${jboss-seam.version}</version>
-       </dependency>
-       <dependency>
-               <groupId>org.hibernate</groupId>
-               <artifactId>hibernate-search</artifactId>
-               <version>${hibernate-search.version}</version>
-        </dependency>
-         <dependency>
-               <groupId>org.jbpm</groupId>
-                       <artifactId>jbpm-jpdl</artifactId>
-               <version>${jbpm.version}</version>
-       </dependency>
-       <dependency>
-                       <groupId>org.jboss.seam</groupId>
-                       <artifactId>jboss-seam-debug</artifactId>
-                       <version>${jboss-seam.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.jboss.seam</groupId>
-                       <artifactId>jboss-seam-ui</artifactId>
-                       <version>${jboss-seam.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId> com.sun.facelets</groupId>
-                       <artifactId> jsf-facelets</artifactId>
-                       <version>${jsf-facelets.version}</version>
-               </dependency>
-               <dependency>
-               <groupId>org.jboss.seam</groupId>
-               <artifactId>jboss-seam</artifactId>
-               <version>${jboss-seam.version}</version>
-               <type>ejb</type>
-       </dependency>
-
+                       </dependency>
+
+                       <dependency>
+                               <groupId>ant</groupId>
+                               <artifactId>ant</artifactId>
+                               <version>${ant.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>commons-pool</groupId>
+                               <artifactId>commons-pool</artifactId>
+                               <version>${commons-pool.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               <version>${junit.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>jain</groupId>
+                               <artifactId>jain-mgcp-ri</artifactId>
+                               <version>${jain-mgcp.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>javax.sip</groupId>
+                               <artifactId>jain-sip-api</artifactId>
+                               <version>${jain-sip-api.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>javax.sip</groupId>
+                               <artifactId>jain-sip-ri</artifactId>
+                               <version>${jain-sip-ri.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>rome</groupId>
+                               <artifactId>rome</artifactId>
+                               <version>${rome.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>javax.servlet</groupId>
+                               <artifactId>servlet-api</artifactId>
+                               <version>${servlet-api.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>javax.xml.bind</groupId>
+                               <artifactId>jaxb-api</artifactId>
+                               <version>${jaxb.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>javax.xml</groupId>
+                               <artifactId>jaxb-impl</artifactId>
+                               <version>${jaxb.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>commons-httpclient</groupId>
+                               <artifactId>commons-httpclient</artifactId>
+                               <version>${commons.httpclient.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>jdom</groupId>
+                               <artifactId>jdom</artifactId>
+                               <version>${jdom.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>ie.omk</groupId>
+                               <artifactId>smppapi</artifactId>
+                               <version>${smpp.version}</version>
+                       </dependency>
+
+                       <!-- SEAM and converged demo -->
+                       <dependency>
+                               <groupId>org.jboss.seam</groupId>
+                               <artifactId>jboss-el</artifactId>
+                               <version>${jboss-el.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jboss.seam</groupId>
+                               <artifactId>jboss-seam</artifactId>
+                               <version>${jboss-seam.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.hibernate</groupId>
+                               <artifactId>hibernate-search</artifactId>
+                               <version>${hibernate-search.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jbpm</groupId>
+                               <artifactId>jbpm-jpdl</artifactId>
+                               <version>${jbpm.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jboss.seam</groupId>
+                               <artifactId>jboss-seam-debug</artifactId>
+                               <version>${jboss-seam.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jboss.seam</groupId>
+                               <artifactId>jboss-seam-ui</artifactId>
+                               <version>${jboss-seam.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId> com.sun.facelets</groupId>
+                               <artifactId> jsf-facelets</artifactId>
+                               <version>${jsf-facelets.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jboss.seam</groupId>
+                               <artifactId>jboss-seam</artifactId>
+                               <version>${jboss-seam.version}</version>
+                               <type>ejb</type>
+                       </dependency>
+
                </dependencies>
        </dependencyManagement>

@@ -364,61 +365,61 @@
        </issueManagement>

        <repositories>
-        <repository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-
+               <repository>
+                       <id>jboss-public-repository-group</id>
+                       <name>JBoss Public Maven Repository Group</name>
+                       
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
+                       <layout>default</layout>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                       </snapshots>
+               </repository>
+       </repositories>
+       <pluginRepositories>
+               <pluginRepository>
+                       <id>jboss-public-repository-group</id>
+                       <name>JBoss Public Maven Repository Group</name>
+                       
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
+                       <layout>default</layout>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                       </snapshots>
+               </pluginRepository>
+       </pluginRepositories>
+
        <profiles>
                <profile>
                        <id>set-svn-revision</id>
                        <build>
-               <plugins>
-                       <plugin>
-                         <groupId>org.codehaus.mojo</groupId>
-                         <artifactId>buildnumber-maven-plugin</artifactId>
-                         <version>1.0-beta-1</version>
-                         <executions>
-                       <execution>
-                             <phase>validate</phase>
-                                       <goals>
-                                       <goal>create</goal>
-                                       </goals>
-                           </execution>
-                         </executions>
-                         <configuration>
-                           <doCheck>false</doCheck>
-                           <doUpdate>false</doUpdate>
-                         </configuration>
-                       </plugin>
-                       </plugins>
+                               <plugins>
+                                       <plugin>
+                                               
<groupId>org.codehaus.mojo</groupId>
+                                               
<artifactId>buildnumber-maven-plugin</artifactId>
+                                               <version>1.0-beta-1</version>
+                                               <executions>
+                                                       <execution>
+                                                               
<phase>validate</phase>
+                                                               <goals>
+                                                                       
<goal>create</goal>
+                                                               </goals>
+                                                       </execution>
+                                               </executions>
+                                               <configuration>
+                                                       <doCheck>false</doCheck>
+                                                       
<doUpdate>false</doUpdate>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
                        </build>
                </profile>
                <profile>
@@ -447,7 +448,7 @@
                        </build>
                </profile>
        </profiles>
-
+
        <build>
                <pluginManagement>
                        <plugins>
@@ -490,33 +491,45 @@
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>
-                                       <archive>
-                                               <manifestEntries>
-                                                   <Implementation-Title>
-                                                       
${manifest.implementation.title}
-                                                   </Implementation-Title>
-                                                       <Implementation-Version>
-                                                               
${manifest.implementation.version}
-                                                       
</Implementation-Version>
-                                                       
<Implementation-Vendor-Id>
-                                                               
${manifest.implementation.vendor}
-                                                       
</Implementation-Vendor-Id>
-                                                       <Implementation-URL>
-                                                               ${manifest.url}
-                                                       </Implementation-URL>
-                                                       
<SVN-Revision>${buildNumber}</SVN-Revision>
-                                               </manifestEntries>
+                                       <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                                        </archive>
                                </configuration>
                        </plugin>
-
-               </plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>bundle-manifest</id>
+                                               <phase>process-resources</phase>
+                                               <goals>
+                                                       <goal>manifest</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <supportedProjectTypes>
+                                               
<supportedProjectType>jar</supportedProjectType>
+                                               
<supportedProjectType>bundle</supportedProjectType>
+                                               
<supportedProjectType>war</supportedProjectType>
+                                       </supportedProjectTypes>
+                                       <instructions>
+ <Implementation-Title>${manifest.implementation.title}</Implementation-Title> + <Implementation-Version>${manifest.implementation.version}</Implementation-Version> + <Implementation-Vendor-Id>${manifest.implementation.vendor}</Implementation-Vendor-Id>
+                                               
<Implementation-URL>${manifest.url}</Implementation-URL>
+                                               
<SVN-Revision>${buildNumber}</SVN-Revision>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
        </build>
-
+
        <scm>
<connection>scm:svn:https://mobicents.googlecode.com/svn/branches/parent/2.x.y</connection> <developerConnection>scm:svn:https://mobicents.googlecode.com/svn/branches/parent/2.x.y</developerConnection>
                
<url>http://mobicents.googlecode.com/svn/branches/parent/2.x.y</url>
        </scm>
-
+
 </project>

Reply via email to