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 2017/05/01 05:59:30 UTC
openmeetings git commit: no jira: project coordinates are updated svn
-> git
Repository: openmeetings
Updated Branches:
refs/heads/master 943f172e9 -> a0db37bf1
no jira: project coordinates are updated svn -> git
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a0db37bf
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a0db37bf
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a0db37bf
Branch: refs/heads/master
Commit: a0db37bf1fa620bc185cc9aefe53f6e146b83209
Parents: 943f172
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon May 1 12:59:22 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon May 1 12:59:22 2017 +0700
----------------------------------------------------------------------
.gitignore | 16 ++++++++++++
KEYS | 9 +++----
openmeetings-screenshare/pom.xml | 2 +-
openmeetings-server/pom.xml | 6 ++---
.../src/site/xdoc/BuildInstructions.xml | 23 +++++++++--------
.../src/site/xdoc/GetVersionInfo.xml | 18 ++++++--------
.../src/site/xdoc/Internationalisation.xml | 4 +--
.../src/site/xdoc/ReleaseGuide.xml | 26 +++++++++++---------
.../src/site/xdoc/RestrictedAccess.xml | 8 +++---
.../src/site/xdoc/WebsiteGuide.xml | 18 +++++++-------
.../src/site/xdoc/get-involved.xml | 9 +------
.../src/site/xdoc/themes-and-branding.xml | 6 ++---
.../org/apache/openmeetings/util/Version.java | 4 +--
pom.xml | 8 +++---
14 files changed, 83 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f28090a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+# Eclipse
+.classpath
+.project
+.settings
+
+# IntellyJ
+.idea
+*.iml
+
+# Maven
+target
+
+# OM
+openmeetings-server/red5-server
+openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
+
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index 122ab85..8255c07 100644
--- a/KEYS
+++ b/KEYS
@@ -1,8 +1,7 @@
-Edit this file in SVN at https://svn.apache.org/repos/asf/openmeetings/project/KEYS
-then update in /www/www.apache.org/dist/openmeetings/KEYS by logging in to people.apache.org
-and running:
-
-svn export http://svn.apache.org/repos/asf/openmeetings/project/KEYS /www/www.apache.org/dist/incubator/openmeetings/KEYS
+Edit this file in Git at:
+https://git-wip-us.apache.org/repos/asf/openmeetings.git
+then include in the release as described here:
+http://openmeetings.apache.org/ReleaseGuide.html
pub 2048R/93A30395 2011-12-20
Key fingerprint = BF13 CF11 F9C9 0CBE 4413 09AB 0055 16BF 93A3 0395
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-screenshare/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml
index 4d22b61..b36f33f 100644
--- a/openmeetings-screenshare/pom.xml
+++ b/openmeetings-screenshare/pom.xml
@@ -164,7 +164,7 @@
<Application-Name>${project.name}</Application-Name>
<Built-By>OpenMeetings - http://openmeetings.apache.org</Built-By>
<Built-On>${maven.build.timestamp}</Built-On>
- <Svn-Revision>${buildNumber}</Svn-Revision>
+ <Git-Revision>${buildNumber}</Git-Revision>
<Product-Version>${project.version}</Product-Version>
<Permissions>all-permissions</Permissions>
<Trusted-Only>true</Trusted-Only>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-server/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index e233b07..8cfc7d5 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -44,9 +44,9 @@
</properties>
<url>http://openmeetings.apache.org</url>
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/trunk</developerConnection>
- <url>https://svn.apache.org/repos/asf/openmeetings/application/trunk</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/openmeetings.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/openmeetings.git</developerConnection>
+ <url>http://git-wip-us.apache.org/repos/asf/wicket/repo?p=openmeetings.git</url>
<tag>HEAD</tag>
</scm>
<profiles>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-server/src/site/xdoc/BuildInstructions.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index 1b134e8..9c65f2b 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -37,15 +37,12 @@
<ul>
<li>Oracle JDK8</li>
<li>Apache Maven (minimum) 3.3.9</li>
- <li>
- SVN Command line client (Subversion 1.7 required!)
- <a href="http://subversion.apache.org/packages.html" target="_blank" rel="nofollow">http://subversion.apache.org/packages.html</a>
- </li>
+ <li>Git</li>
</ul>
</div>
<p>Get the source: </p>
- <source><![CDATA[svn checkout https://svn.apache.org/repos/asf/openmeetings/application/trunk/]]></source>
+ <source><![CDATA[git clone https://git-wip-us.apache.org/repos/asf/openmeetings.git]]></source>
<p>Run the command: </p>
<source><![CDATA[mvn clean install -P allModules]]></source>
</section>
@@ -89,16 +86,18 @@ mvn install -P allModules,quick,mysql -pl openmeetings-web -pl openmeetings-serv
mvn install -P allModules,quick,mysql -pl openmeetings-util -pl openmeetings-db -pl openmeetings-core -pl openmeetings-install -pl openmeetings-service -pl openmeetings-web -pl openmeetings-server -pl openmeetings-webservice -Dwicket.mode=DEVELOPMENT
]]>
</source>
- <p>
+ <div>
<b>Working behind a proxy:</b>
If you are sitting behind a proxy you should add some proxy settings before starting the build process.
<br />
- For SVN Command Line Client (From CollabNet 1.7) see:
- <a
- href="https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html"
- target="_blank" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html
- </a>
- </p>
+ <source>git config --global http.proxy http://proxyuser:proxypwd@proxy.server.com:8080</source>
+ <ul>
+ <li>change <tt>proxyuser</tt> to your proxy user</li>
+ <li>change <tt>proxypwd</tt> to your proxy password</li>
+ <li>change <tt>proxy.server.com</tt> to the URL of your proxy server</li>
+ <li>change <tt>8080</tt> to the proxy port configured on your proxy server</li>
+ </ul>
+ </div>
</section>
</body>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/GetVersionInfo.xml b/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
index b075bab..3d9cf3e 100644
--- a/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
+++ b/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
@@ -33,11 +33,11 @@
</p>
<p>You get something like this: </p>
<source>
- ##################################################
- # Openmeetings is up #
- # 2.1.1-RELEASE 1490720 7-June-2013 #
- # and ready to use #
- ##################################################
+ ################################################################################
+ # Openmeetings is up #
+ # 4.0.0-SNAPSHOT 943f172e9d63c3ab7210f895fdede1ad7fa6aebc 2017/05/01 05:56 #
+ # and ready to use #
+ ################################################################################
</source>
</section>
<section name="How to check which Openmeetings version running (1.8.0 - 2.1.0)">
@@ -56,11 +56,9 @@
<source>
<![CDATA[
Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.6.0_26-b03-383-11A511 (Apple Inc.)
-Built-By: OpenMeetings - http://openmeetings.googlecode.com
-Built-On: 23-October-2011
-Svn-Revision: 4368
+Built-By: OpenMeetings - http://openmeetings.apache.org
+Built-On: 2017/05/01 05:41
+Git-Revision: 943f172e9d63c3ab7210f895fdede1ad7fa6aebc
]]>
</source>
<p>This version info is available since version 1.8.0. If you have an
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-server/src/site/xdoc/Internationalisation.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/Internationalisation.xml b/openmeetings-server/src/site/xdoc/Internationalisation.xml
index 7df2226..020c1a4 100644
--- a/openmeetings-server/src/site/xdoc/Internationalisation.xml
+++ b/openmeetings-server/src/site/xdoc/Internationalisation.xml
@@ -24,8 +24,8 @@
<p>You can find all current language files here: </p>
<p>
<a
- href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/"
- rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
+ href="https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=tree;f=openmeetings-web/src/main/java/org/apache/openmeetings/web/app;hb=HEAD"
+ rel="nofollow">https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=tree;f=openmeetings-web/src/main/java/org/apache/openmeetings/web/app;hb=HEAD
</a>
</p>
<p>Just take one file and translate it to your language. </p>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
index b1227ec..8271385 100644
--- a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
+++ b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
@@ -77,7 +77,7 @@
<li>
If that is "success" then add your key to:
<br />
- <a href="https://svn.apache.org/repos/asf/openmeetings/project/KEYS">https://svn.apache.org/repos/asf/openmeetings/project/KEYS</a>
+ <a href="https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=KEYS;hb=HEAD">https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=KEYS;hb=HEAD</a>
<br />
<br />
and follow the instructions in the file.
@@ -99,6 +99,11 @@
</subsection>
<subsection name="Step1 - Prepare files">
<ul>
+ <li>Switch to the necessary branch:
+ <source>
+git checkout BRANCH
+ </source>
+ </li>
<li>
Check that all files:<br />
LICENSE, NOTICE, DISCLAIMER, CHANGELOG, README<br />
@@ -111,18 +116,17 @@
<tt>openmeetings-server/src/site/xdoc/downloads.xml</tt><br/>
</li>
<li>
- Create a TAG of the SVN tree that you would like to release<br/>
+ Create a TAG of the Git tree that you would like to release<br/>
Example:
-
+
<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 "3.1.0 Release candidate 1"
+git tag 4.0.0RC1
+git push origin 4.0.0RC1
</source>
</li>
<li>
<p>Get the source from your TAG: </p>
- <source>svn checkout https://svn.apache.org/repos/asf/openmeetings/application/tags/$BRANCHORTAG/</source>
+ <source>git checkout $BRANCHORTAG</source>
<p>$BRANCHORTAG should be replaced with your new TAG</p>
</li>
<li>
@@ -205,7 +209,7 @@ mvn deploy -Pdeploy,rc
<subsection name="Step3 - Sign web start application">
<p>If VOTEs positive: Sign screen sharing web application and re-pack the release</p>
<ul>
- <li>Go to the folder you check out: https://svn.apache.org/repos/asf/openmeetings/application/tags/$BRANCHORTAG/</li>
+ <li>Go to the folder you check out your $BRANCHORTAG</li>
<li>
<p>Run the command: </p>
<source>
@@ -244,8 +248,8 @@ for f in `ls -1 *.tar.gz *.zip`; do sha256sum -c $f.sha256; done
</source>
<p>
Create signatures with the your KEY for every file, the KEY must be available at:<br />
- <a href="https://svn.apache.org/repos/asf/openmeetings/project/KEYS">
- https://svn.apache.org/repos/asf/openmeetings/project/KEYS
+ <a href="https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=KEYS;hb=HEAD">
+ https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=KEYS;hb=HEAD
</a>
</p>
<source>
@@ -290,7 +294,7 @@ for f in `ls -1 *.tar.gz *.zip`; do gpg --verify $f.asc; done
[ANNOUNCE] Apache OpenMeetings x.xx released
</li>
<li>
- Update release section of DOAP file <tt>site/trunk/doap.rdf (https://svn.apache.org/repos/asf/openmeetings/site/trunk/doap.rdf)</tt>
+ Update release section of DOAP file <tt>openmeetings-site/doap.rdf (https://git-wip-us.apache.org/repos/asf?p=openmeetings-site.git;a=blob;f=doap.rdf;hb=HEAD)</tt>
</li>
<li>
Add a section to <a href="downloads.html">downloads</a> website.<br />
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
index 1072771..e38dcd4 100644
--- a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
+++ b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
@@ -13,8 +13,8 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>How to restrict access to your Openmeetings server</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
@@ -32,8 +32,8 @@
<source>webapp.virtualHosts=*,localhost, 127.0.0.1</source>
Sample file:
<a
- href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
- rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
+ href="https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties;hb=HEAD"
+ rel="nofollow">https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties;hb=HEAD
</a>
</section>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
index 1379596..723bb33 100644
--- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
+++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
@@ -37,7 +37,7 @@
<p>
The Apache OpenMeetings HTML websites are generated from XML files.
You edit the XML files, run the MAVEN command <source><![CDATA[mvn install -P allModules,unpacked]]></source> that generates the HTML files
- and then you copy generated HTML files into appropriate place and commit to SVN both: XML and HTML files.
+ and then you copy generated HTML files into appropriate place and commit to Git both: XML and HTML files.
</p>
<p>
The website itself uses JQuery to generate the menu, the pop images and the image slider at the landing page.
@@ -48,26 +48,26 @@
<subsection name="Editing the website">
<div>
<p>
- OpenMeetings website (<a href="http://openmeetings.apache.org/">http://openmeetings.apache.org/</a>) is a copy from the SVN repository.<br />
- The file in the SVN to be synced are at:
+ OpenMeetings website (<a href="http://openmeetings.apache.org/">http://openmeetings.apache.org/</a>) is a copy from the Git repository.<br />
+ The files in the Git to be synced are at:
<br />
- <a href="http://svn.apache.org/repos/asf/openmeetings/trunk/site/">http://svn.apache.org/repos/asf/openmeetings/trunk/site/</a><br/>
+ <a href="https://git-wip-us.apache.org/repos/asf?p=openmeetings-site.git">https://git-wip-us.apache.org/repos/asf?p=openmeetings-site.git</a><br/>
</p>
<div>
- To update the website you need to checkout trunk:<br />
- <a href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/">https://svn.apache.org/repos/asf/openmeetings/application/trunk/</a> <br/>
+ To update the website you need to clone master:<br />
+ <a href="https://git-wip-us.apache.org/repos/asf/openmeetings-site.git">https://git-wip-us.apache.org/repos/asf/openmeetings-site.git</a> <br/>
edit the files in the folder <tt>openmeetings-server/src/site</tt><br/>
then you run the command:
<source><![CDATA[mvn install -Dunpacked=true]]></source>
control the output locally in the folder <tt>openmeetings-server/target/server/webapps/openmeetings/docs/</tt><br/>
copy site contents into target folder: <source><![CDATA[cp -r openmeetings-server/target/server/webapps/openmeetings/docs/* ../site/]]></source>
- And then commit your changes into the SVN <i>both</i> the edited xml(s) and generated html files.
+ And then commit your changes into the Git <i>both</i> the edited xml(s) and generated html files.
</div>
<p>
- The public website is automatically synced with the SVN repository.<br/>
- Changes to the SVN should be immediately synced to the production website.<br/>
+ The public website is automatically synced with the Git repository.<br/>
+ Changes to the Git should be immediately synced to the production website.<br/>
If not you might login to people.apache.org,<br/>
cd to <tt>/www/openmeetings.apache.org/content/</tt><br/>
and run the linux command "touch" on the files that need to be synced
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-server/src/site/xdoc/get-involved.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/get-involved.xml b/openmeetings-server/src/site/xdoc/get-involved.xml
index faa4de6..b848444 100644
--- a/openmeetings-server/src/site/xdoc/get-involved.xml
+++ b/openmeetings-server/src/site/xdoc/get-involved.xml
@@ -121,17 +121,10 @@
<li>
<p>
Check out the OpenMeetings sources and test your svn account:
- <a href="http://svn.apache.org/viewvc/openmeetings/">
- SubversionRepository
- </a>
- .
+ <a href="https://git-wip-us.apache.org/repos/asf/openmeetings.git">Git Repository</a>
</p>
-
</li>
-
</ul>
-
</section>
-
</body>
</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-server/src/site/xdoc/themes-and-branding.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/themes-and-branding.xml b/openmeetings-server/src/site/xdoc/themes-and-branding.xml
index f3f8103..ac73b29 100644
--- a/openmeetings-server/src/site/xdoc/themes-and-branding.xml
+++ b/openmeetings-server/src/site/xdoc/themes-and-branding.xml
@@ -31,10 +31,10 @@
<section name="Editing the theme">
<p>To modify default theme used by OM</p>
<ul>
- <li>please open following file in the SVN:<br/>
+ <li>please open following file in the Git:<br/>
<a
- href="https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css"
- target="_blank" rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css
+ href="https://git-wip-us.apache.org/repos/asf/openmeetings.git/?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css;hb=HEAD"
+ target="_blank" rel="nofollow">https://git-wip-us.apache.org/repos/asf/openmeetings.git/?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css;hb=HEAD
</a><br/>
Or if you already installed OpenMeetings on your machine at:<br />
<tt>/webapps/openmeetings/css/theme_om/jquery-ui.css</tt>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java
index 77127d9..2d677dd 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
public class Version {
private static final Logger log = Red5LoggerFactory.getLogger(Version.class, OpenmeetingsVariables.webAppRootKey);
- private static final int startedStringLength = 48;
+ private static final int startedStringLength = 78;
private static String version = null;
private static String revision = null;
private static String buildDate = null;
@@ -53,7 +53,7 @@ public class Version {
public static String getRevision() {
if (revision == null) {
try {
- revision = getAttributes().getValue("Svn-Revision");
+ revision = getAttributes().getValue("Git-Revision");
} catch (Exception e) {
log.error("Error", e);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0db37bf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48faea7..243d913 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,9 +391,9 @@
</contributor>
</contributors>
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/application/trunk</developerConnection>
- <url>https://svn.apache.org/repos/asf/openmeetings/application/trunk</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/openmeetings.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/openmeetings.git</developerConnection>
+ <url>http://git-wip-us.apache.org/repos/asf/wicket/repo?p=openmeetings.git</url>
<tag>HEAD</tag>
</scm>
<mailingLists>
@@ -792,7 +792,7 @@
<manifestEntries>
<Built-By>OpenMeetings - http://openmeetings.apache.org</Built-By>
<Built-On>${maven.build.timestamp}</Built-On>
- <Svn-Revision>${buildNumber}</Svn-Revision>
+ <Git-Revision>${buildNumber}</Git-Revision>
<Product-Version>${project.version}</Product-Version>
</manifestEntries>
</archive>