You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/02/28 08:49:03 UTC
svn commit: r1732695 - in /openmeetings/application: branches/3.1.x/
branches/3.1.x/openmeetings-server/src/site/xdoc/ trunk/
trunk/openmeetings-server/src/site/xdoc/
Author: solomax
Date: Sun Feb 28 07:49:02 2016
New Revision: 1732695
URL: http://svn.apache.org/viewvc?rev=1732695&view=rev
Log:
Build instructions and Release guide are updated with recent build details; CHANGELOG is updated with recent issue fixed
Modified:
openmeetings/application/branches/3.1.x/CHANGELOG
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
openmeetings/application/trunk/CHANGELOG
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
Modified: openmeetings/application/branches/3.1.x/CHANGELOG
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/CHANGELOG?rev=1732695&r1=1732694&r2=1732695&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/CHANGELOG (original)
+++ openmeetings/application/branches/3.1.x/CHANGELOG Sun Feb 28 07:49:02 2016
@@ -66,6 +66,7 @@ Release Notes - Openmeetings - Version 3
* [OPENMEETINGS-1334] - It's impossible to invite om user to the my rooms
* [OPENMEETINGS-1335] - Screen sharing icons and favicon need to be updated
* [OPENMEETINGS-1336] - User can not enter to group room
+ * [OPENMEETINGS-1338] - Screen sharing application failed to connect to the server
** Improvement
* [OPENMEETINGS-794] - Add a possibility to enter brief name for users with same invitation url (grouped mail)
Modified: openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml?rev=1732695&r1=1732694&r2=1732695&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml Sun Feb 28 07:49:02 2016
@@ -56,7 +56,11 @@
<img src="images/eclipse-import-maven-project.png" alt="Import OM into Eclipse" width="526" height="394" />
</p>
</section>
-
+ <section name="Check for updates">
+ <source>mvn versions:display-dependency-updates</source>
+ <source>mvn versions:display-plugin-updates</source>
+ <source>mvn versions:display-property-updates</source>
+ </section>
<section name="Tips and Gotchas">
<p>To compile only client you can run following command: </p>
<source>
@@ -92,7 +96,6 @@ mvn install -pl openmeetings-util -pl op
target="_blank" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html
</a>
</p>
-
</section>
</body>
Modified: openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1732695&r1=1732694&r2=1732695&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml Sun Feb 28 07:49:02 2016
@@ -115,7 +115,7 @@
<source>
svn copy -r1453158 https://svn.apache.org/repos/asf/openmeetings/application/trunk \
https://svn.apache.org/repos/asf/openmeetings/application/tags/3.1.0RC1 \
- -m "Release candidate 1"
+ -m "3.1.0 Release candidate 1"
</source>
@@ -123,25 +123,23 @@ svn copy -r1453158 https://svn.apache.or
<source>svn checkout https://svn.apache.org/repos/asf/openmeetings/application/tags/$BRANCHORTAG/</source>
<p>$BRANCHORTAG should be replaced with your new TAG</p>
- <p>Edit the file build.properties change</p>
- <source>project.status=SNAPSHOT</source>
- <p>to</p>
- <source>project.status=RELEASE</source>
+ <p>Update versions of all modules</p>
+ <source>mvn versions:set -DgenerateBackupPoms=false -DnewVersion=3.1.0</source>
<p>Run the command: </p>
- <source>ant dist-release</source>
+ <source>mvn clean install</source>
<p>Test building the source on windows and OSx or Linux</p>
<p>Test running the binary's</p>
<p>Create sha256sum checksums</p>
<source>
-#On OSX you might use this command to make a MD5 checksum and store it to a file
-shasum -a 256 -r apache-openmeetings-XXX-src.zip >apache-openmeetings-XXX-src.zip.md5
+#On OSX you might use this command to make a SHA checksum and store it to a file
+shasum -a 256 -r apache-openmeetings-XXX-src.zip >apache-openmeetings-XXX-src.zip.sha
</source>
<source>
<![CDATA[
-#To create MD5 hashes On Ubuntu:
+#To create SHA hashes On Ubuntu:
for f in `ls -1 *.tar.gz *.zip`; do sha256sum $f > $f.sha; done
-#To check MD5 hashes On Ubuntu:
+#To check SHA hashes On Ubuntu:
for f in `ls -1 *.tar.gz *.zip`; do sha256sum -c $f.sha; done
]]>
</source>
@@ -164,27 +162,27 @@ for f in `ls -1 *.tar.gz *.zip`; do gpg
<p>
Commit artifacts you have created with KEYS file to the
<tt>https://dist.apache.org/repos/dist/dev/openmeetings/</tt>
- Proposed file structure for "Release Candidate 1" of 2.1 will be:
+ Proposed file structure for "Release Candidate 1" of 3.1.0 will be:
</p>
<source>
-2.1
-2.1/rc1
-2.1/rc1/src
-2.1/rc1/src/apache-openmeetings-2.1.0-src.zip
-2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz
-2.1/rc1/src/apache-openmeetings-2.1.0-src.zip.md5
-2.1/rc1/src/apache-openmeetings-2.1.0-src.zip.asc
-2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz.md5
-2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz.asc
-2.1/rc1/bin
-2.1/rc1/bin/apache-openmeetings-2.1.0.zip
-2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz
-2.1/rc1/bin/apache-openmeetings-2.1.0.zip.md5
-2.1/rc1/bin/apache-openmeetings-2.1.0.zip.asc
-2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz.md5
-2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz.asc
-2.1/rc1/CHANGELOG
-2.1/rc1/KEYS
+3.1.0
+3.1.0/rc1
+3.1.0/rc1/src
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.zip
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.tar.gz
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.zip.sha
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.zip.asc
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.tar.gz.sha
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.tar.gz.asc
+3.1.0/rc1/bin
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.zip
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.tar.gz
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.zip.sha
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.zip.asc
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.tar.gz.sha
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.tar.gz.asc
+3.1.0/rc1/CHANGELOG
+3.1.0/rc1/KEYS
</source>
</subsection>
Modified: openmeetings/application/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/CHANGELOG?rev=1732695&r1=1732694&r2=1732695&view=diff
==============================================================================
--- openmeetings/application/trunk/CHANGELOG (original)
+++ openmeetings/application/trunk/CHANGELOG Sun Feb 28 07:49:02 2016
@@ -66,6 +66,7 @@ Release Notes - Openmeetings - Version 3
* [OPENMEETINGS-1334] - It's impossible to invite om user to the my rooms
* [OPENMEETINGS-1335] - Screen sharing icons and favicon need to be updated
* [OPENMEETINGS-1336] - User can not enter to group room
+ * [OPENMEETINGS-1338] - Screen sharing application failed to connect to the server
** Improvement
* [OPENMEETINGS-794] - Add a possibility to enter brief name for users with same invitation url (grouped mail)
Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml?rev=1732695&r1=1732694&r2=1732695&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml Sun Feb 28 07:49:02 2016
@@ -56,7 +56,11 @@
<img src="images/eclipse-import-maven-project.png" alt="Import OM into Eclipse" width="526" height="394" />
</p>
</section>
-
+ <section name="Check for updates">
+ <source>mvn versions:display-dependency-updates</source>
+ <source>mvn versions:display-plugin-updates</source>
+ <source>mvn versions:display-property-updates</source>
+ </section>
<section name="Tips and Gotchas">
<p>To compile only client you can run following command: </p>
<source>
@@ -92,7 +96,6 @@ mvn install -pl openmeetings-util -pl op
target="_blank" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html
</a>
</p>
-
</section>
</body>
Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1732695&r1=1732694&r2=1732695&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml Sun Feb 28 07:49:02 2016
@@ -115,7 +115,7 @@
<source>
svn copy -r1453158 https://svn.apache.org/repos/asf/openmeetings/application/trunk \
https://svn.apache.org/repos/asf/openmeetings/application/tags/3.1.0RC1 \
- -m "Release candidate 1"
+ -m "3.1.0 Release candidate 1"
</source>
@@ -123,25 +123,23 @@ svn copy -r1453158 https://svn.apache.or
<source>svn checkout https://svn.apache.org/repos/asf/openmeetings/application/tags/$BRANCHORTAG/</source>
<p>$BRANCHORTAG should be replaced with your new TAG</p>
- <p>Edit the file build.properties change</p>
- <source>project.status=SNAPSHOT</source>
- <p>to</p>
- <source>project.status=RELEASE</source>
+ <p>Update versions of all modules</p>
+ <source>mvn versions:set -DgenerateBackupPoms=false -DnewVersion=3.1.0</source>
<p>Run the command: </p>
- <source>ant dist-release</source>
+ <source>mvn clean install</source>
<p>Test building the source on windows and OSx or Linux</p>
<p>Test running the binary's</p>
<p>Create sha256sum checksums</p>
<source>
-#On OSX you might use this command to make a MD5 checksum and store it to a file
-shasum -a 256 -r apache-openmeetings-XXX-src.zip >apache-openmeetings-XXX-src.zip.md5
+#On OSX you might use this command to make a SHA checksum and store it to a file
+shasum -a 256 -r apache-openmeetings-XXX-src.zip >apache-openmeetings-XXX-src.zip.sha
</source>
<source>
<![CDATA[
-#To create MD5 hashes On Ubuntu:
+#To create SHA hashes On Ubuntu:
for f in `ls -1 *.tar.gz *.zip`; do sha256sum $f > $f.sha; done
-#To check MD5 hashes On Ubuntu:
+#To check SHA hashes On Ubuntu:
for f in `ls -1 *.tar.gz *.zip`; do sha256sum -c $f.sha; done
]]>
</source>
@@ -164,27 +162,27 @@ for f in `ls -1 *.tar.gz *.zip`; do gpg
<p>
Commit artifacts you have created with KEYS file to the
<tt>https://dist.apache.org/repos/dist/dev/openmeetings/</tt>
- Proposed file structure for "Release Candidate 1" of 2.1 will be:
+ Proposed file structure for "Release Candidate 1" of 3.1.0 will be:
</p>
<source>
-2.1
-2.1/rc1
-2.1/rc1/src
-2.1/rc1/src/apache-openmeetings-2.1.0-src.zip
-2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz
-2.1/rc1/src/apache-openmeetings-2.1.0-src.zip.md5
-2.1/rc1/src/apache-openmeetings-2.1.0-src.zip.asc
-2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz.md5
-2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz.asc
-2.1/rc1/bin
-2.1/rc1/bin/apache-openmeetings-2.1.0.zip
-2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz
-2.1/rc1/bin/apache-openmeetings-2.1.0.zip.md5
-2.1/rc1/bin/apache-openmeetings-2.1.0.zip.asc
-2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz.md5
-2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz.asc
-2.1/rc1/CHANGELOG
-2.1/rc1/KEYS
+3.1.0
+3.1.0/rc1
+3.1.0/rc1/src
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.zip
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.tar.gz
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.zip.sha
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.zip.asc
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.tar.gz.sha
+3.1.0/rc1/src/apache-openmeetings-3.1.0-src.tar.gz.asc
+3.1.0/rc1/bin
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.zip
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.tar.gz
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.zip.sha
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.zip.asc
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.tar.gz.sha
+3.1.0/rc1/bin/apache-openmeetings-3.1.0.tar.gz.asc
+3.1.0/rc1/CHANGELOG
+3.1.0/rc1/KEYS
</source>
</subsection>