2 new revisions:
Revision: 72facf0d7038
Author: Jean Deruelle <[email protected]>
Date: Wed Aug 8 14:28:36 2012
Log: Fixing poms to include jsr 309 in the release process
http://code.google.com/p/mediaserver/source/detail?r=72facf0d7038
Revision: 1b5674f324b7
Author: Jean Deruelle <[email protected]>
Date: Wed Aug 8 14:50:25 2012
Log: Fixing pom for performing better releases
http://code.google.com/p/mediaserver/source/detail?r=1b5674f324b7
==============================================================================
Revision: 72facf0d7038
Author: Jean Deruelle <[email protected]>
Date: Wed Aug 8 14:28:36 2012
Log: Fixing poms to include jsr 309 in the release process
http://code.google.com/p/mediaserver/source/detail?r=72facf0d7038
Modified:
/jsr-309/pom.xml
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
/pom.xml
=======================================
--- /jsr-309/pom.xml Wed Jul 11 09:28:19 2012
+++ /jsr-309/pom.xml Wed Aug 8 14:28:36 2012
@@ -1,10 +1,10 @@
<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.mobicents</groupId>
- <artifactId>mobicents</artifactId>
- <version>1.25</version>
+ <parent>
+ <groupId>org.mobicents</groupId>
+ <artifactId>mobicents-parent</artifactId>
+ <version>2.22</version>
</parent>
<groupId>org.mobicents.jsr309</groupId>
@@ -60,18 +60,6 @@
</dependency>
</dependencies>
- <scm>
- <connection>
-
scm:svn:http://mobicents.googlecode.com/svn/trunk/servers/media/jsr-309
- </connection>
- <developerConnection>
-
scm:svn:http://mobicents.googlecode.com/svn/trunk/servers/media/jsr-309
- </developerConnection>
- <url>
-
http://mobicents.googlecode.com/svn/trunk/servers/media/jsr-309
- </url>
- </scm>
-
<profiles>
<profile>
<id>maven-release</id>
@@ -81,17 +69,41 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
<configuration>
- <autoVersionSubmodules>
- true
- </autoVersionSubmodules>
-
<remoteTagging>true</remoteTagging>
- <tagBase>
-
http://mobicents.googlecode.com/svn/tags/servers/media/2.x.y/jsr-309/
- </tagBase>
+
<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+
<autoVersionSubmodules>true</autoVersionSubmodules>
+ <preparationGoals>clean
install</preparationGoals>
+
<arguments>-Dmaven.test.skip</arguments>
</configuration>
</plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+
<id>attach-sources</id>
+
<phase>verify</phase>
+ <goals>
+
<goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ <executions>
+ <execution>
+
<id>attach-javadocs</id>
+
<phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -124,14 +136,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
<configuration>
-
<autoVersionSubmodules>true</autoVersionSubmodules>
- <remoteTagging>true</remoteTagging>
- <resume>false</resume>
- <tagBase>
-
http://mobicents.googlecode.com/svn/tags/servers/media/2.x.y/jsr-309/
- </tagBase>
+
<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+
<autoVersionSubmodules>true</autoVersionSubmodules>
+ <preparationGoals>clean
install</preparationGoals>
+ <arguments>-Dmaven.test.skip</arguments>
</configuration>
</plugin>
<plugin>
@@ -158,48 +167,34 @@
</build>
<repositories>
- <repository>
- <id>maven</id>
- <name>Maven Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jboss</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jboss-snapshots</id>
- <name>JBoss Snapshot Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
-
<url>http://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>
+ <repository>
+ <id>mobicents-public-repository-group</id>
+ <name>Mobicens Public Maven Repository Group</name>
+
<url>https://oss.sonatype.org/content/groups/public</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+
<url>http://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>
<repository>
<id>jboss-deprecated</id>
<name>jboss-deprecated</name>
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Wed Aug 8 13:29:08 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Wed Aug 8 14:28:36 2012
@@ -13,7 +13,7 @@
Bundle-Vendor: TeleStax, Inc.
Implementation-Vendor-Id: TeleStax, Inc.
Bundle-Version: 2.4.0.FINAL
-Bnd-LastModified: 1344457294244
+Bnd-LastModified: 1344458342447
Bundle-ManifestVersion: 2
Bundle-License: http://www.gnu.org/licenses/lgpl-2.1.html
Bundle-Description: Mobicents :: Parent pom for 2.x releases
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Wed Aug 8 13:29:08 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Wed Aug 8 14:28:36 2012
@@ -1,5 +1,5 @@
#Generated by Maven
-#Wed Aug 08 22:21:34 CEST 2012
+#Wed Aug 08 22:39:02 CEST 2012
version=2.4.0.FINAL
groupId=org.mobicents.media.docs
artifactId=mobicents-mms-docs-sources
=======================================
--- /pom.xml Wed Aug 8 13:42:12 2012
+++ /pom.xml Wed Aug 8 14:28:36 2012
@@ -104,19 +104,26 @@
</dependencies>
-
<!-- RELEASE STUFF -->
<profiles>
<profile>
- <id>maven-release</id>
- <!-- modules>
- <module>bootstrap</module>
- <module>server-spi</module>
- <module>server-impl</module>
- <module>server-standalone</module>
- <module>controllers</module>
- </modules -->
+ <id>maven-release</id>
+ <modules>
+ <module>hardware</module>
+ <module>spi</module>
+ <module>scheduler</module>
+ <module>codecs</module>
+ <module>component</module>
+ <module>io</module>
+ <module>resources</module>
+ <module>chassis</module>
+ <module>endpoints</module>
+ <module>controls</module>
+ <module>media-server-docs</module>
+ <module>bootstrap</module>
+ <module>jsr-309</module>
+ </modules>
<build>
<plugins>
<plugin>
==============================================================================
Revision: 1b5674f324b7
Author: Jean Deruelle <[email protected]>
Date: Wed Aug 8 14:50:25 2012
Log: Fixing pom for performing better releases
http://code.google.com/p/mediaserver/source/detail?r=1b5674f324b7
Modified:
/hardware/dahdi/native/linux/pom.xml
/hardware/dahdi/native/pom.xml
/hardware/pom.xml
/jsr-309/pom.xml
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.xml
=======================================
--- /hardware/dahdi/native/linux/pom.xml Wed Aug 8 13:29:08 2012
+++ /hardware/dahdi/native/linux/pom.xml Wed Aug 8 14:50:25 2012
@@ -4,7 +4,8 @@
<parent>
<groupId>org.mobicents.media.hardware</groupId>
<artifactId>mobicents-media-hardware</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>libmobicents-dahdi-linux</artifactId>
=======================================
--- /hardware/dahdi/native/pom.xml Wed Aug 8 13:42:12 2012
+++ /hardware/dahdi/native/pom.xml Wed Aug 8 14:50:25 2012
@@ -57,7 +57,7 @@
<module>linux</module>
</modules>
</profile>
- <profile>
+ <!--profile>
<id>maven-release</id>
<modules>
<module>linux</module>
@@ -68,7 +68,7 @@
<modules>
<module>linux</module>
</modules>
- </profile>
+ </profile-->
</profiles>
</project>
=======================================
--- /hardware/pom.xml Wed Aug 8 13:42:12 2012
+++ /hardware/pom.xml Wed Aug 8 14:50:25 2012
@@ -27,11 +27,9 @@
<profiles>
<profile>
<id>maven-release</id>
- <modules>
- <!--
+ <modules>
<module>dahdi</module>
- -->
- <module>dialogic</module>
+ <!--module>dialogic</module-->
</modules>
</profile>
</profiles>
=======================================
--- /jsr-309/pom.xml Wed Aug 8 14:28:36 2012
+++ /jsr-309/pom.xml Wed Aug 8 14:50:25 2012
@@ -9,7 +9,7 @@
<groupId>org.mobicents.jsr309</groupId>
<artifactId>mobicents-jsr309-impl</artifactId>
- <version>2.4.0.FINAL</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>Mobicents JSR-309 Impl</name>
<url>http://www.mobicents.org/products_media_server.html</url>
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Wed Aug 8 14:28:36 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Wed Aug 8 14:50:25 2012
@@ -5,15 +5,15 @@
Build-Jdk: 1.6.0_30
Implementation-Title: org.mobicents.media.docs:mobicents-mms-docs-sour
ces
-Implementation-Version: 2.4.0.FINAL
+Implementation-Version: 3.0.0-SNAPSHOT
Tool: Bnd-1.15.0
Bundle-Name: Mobicents Media :: Docs :: Sources :: mobicents-mms-docs-
sources
Implementation-URL: http://www.mobicents.org
Bundle-Vendor: TeleStax, Inc.
Implementation-Vendor-Id: TeleStax, Inc.
-Bundle-Version: 2.4.0.FINAL
-Bnd-LastModified: 1344458342447
+Bundle-Version: 3.0.0.SNAPSHOT
+Bnd-LastModified: 1344462428614
Bundle-ManifestVersion: 2
Bundle-License: http://www.gnu.org/licenses/lgpl-2.1.html
Bundle-Description: Mobicents :: Parent pom for 2.x releases
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Wed Aug 8 14:28:36 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Wed Aug 8 14:50:25 2012
@@ -1,5 +1,5 @@
#Generated by Maven
-#Wed Aug 08 22:39:02 CEST 2012
-version=2.4.0.FINAL
+#Wed Aug 08 23:47:08 CEST 2012
+version=3.0.0-SNAPSHOT
groupId=org.mobicents.media.docs
artifactId=mobicents-mms-docs-sources
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.xml
Wed Jul 11 09:28:19 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.xml
Wed Aug 8 14:50:25 2012
@@ -6,7 +6,7 @@
<parent>
<artifactId>mobicents-mms-docs</artifactId>
<groupId>org.mobicents.media.docs</groupId>
- <version>2.4.0.FINAL</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>mobicents-mms-docs-sources</artifactId>