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/11/30 15:40:03 UTC
[2/6] openmeetings git commit: [OPENMEETINGS-1738] maven-site-plugin
and reflow-skin are updated
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f52fee4d/openmeetings-server/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/site.xml b/openmeetings-server/src/site/site.xml
index 4cf92e8..bcd2cae 100644
--- a/openmeetings-server/src/site/site.xml
+++ b/openmeetings-server/src/site/site.xml
@@ -40,18 +40,6 @@
<item name="Mailing Lists" href="/mail-lists.html" />
<item name="Wiki" href="http://cwiki.apache.org/confluence/display/OPENMEETINGS/" />
</menu>
- <menu name="Development">
- <item name="Source Code" href="/source-repository.html" />
- <item name="Bugs / Issues" href="/issue-tracking.html" />
- <item name="Dependencies" href="/dependencies.html" />
- <item name="Continuous Integration" href="/integration.html" />
- <item name="Build Instructions 3.0.x" href="/BuildInstructions_3.0.x.html" />
- <item name="Build Instructions" href="/BuildInstructions.html" />
- <item name="JUnit Testing" href="/JUnitTesting.html" />
- <item name="Manual Testing" href="/ManualTesting.html" />
- <item name="Release Guide" href="/ReleaseGuide.html" />
- <item name="Website Guide" href="/WebsiteGuide.html" />
- </menu>
<menu name="Configuration">
<item name="Integration" href="#integration">
<item name="SOAP/REST API" href="/openmeetings-webservice/apidocs/index.html" target="_blank"/>
@@ -124,6 +112,18 @@
<item name="Get version info" href="/GetVersionInfo.html" />
</item>
</menu>
+ <menu name="Development">
+ <item name="Source Code" href="/source-repository.html" />
+ <item name="Bugs / Issues" href="/issue-tracking.html" />
+ <item name="Dependencies" href="/dependencies.html" />
+ <item name="Continuous Integration" href="/integration.html" />
+ <item name="Build Instructions 3.0.x" href="/BuildInstructions_3.0.x.html" />
+ <item name="Build Instructions" href="/BuildInstructions.html" />
+ <item name="JUnit Testing" href="/JUnitTesting.html" />
+ <item name="Manual Testing" href="/ManualTesting.html" />
+ <item name="Release Guide" href="/ReleaseGuide.html" />
+ <item name="Website Guide" href="/WebsiteGuide.html" />
+ </menu>
</body>
<custom>
<reflowSkin>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f52fee4d/openmeetings-server/src/site/xdoc/NewsArchive.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/NewsArchive.xml b/openmeetings-server/src/site/xdoc/NewsArchive.xml
index 74f20e6..a7456a9 100644
--- a/openmeetings-server/src/site/xdoc/NewsArchive.xml
+++ b/openmeetings-server/src/site/xdoc/NewsArchive.xml
@@ -33,7 +33,7 @@
<br/>
Other fixes and improvements
<br/>
- <span class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</span>
+ <div class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</div>
</div>
<br/>
<span>
@@ -57,7 +57,7 @@
<br/>
Other fixes and improvements
<br/>
- <span class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</span>
+ <div class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</div>
</div>
<br/>
<span>
@@ -91,7 +91,7 @@
<br/>
Other fixes and improvements
<br/>
- <span class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</span>
+ <div class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</div>
</div>
<br/>
<span>
@@ -129,7 +129,7 @@
<br/>
Other fixes and improvements
<br/>
- <span class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</span>
+ <div class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</div>
</div>
<br/>
<span>
@@ -154,7 +154,7 @@
<br/>
Other fixes and improvements in all components
<br/>
- <span class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</span>
+ <div class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</div>
</div>
<br/>
<span>
@@ -176,14 +176,13 @@
<br/>
Other fixes in Import/Export and email templates
<br/>
- <span class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</span>
+ <div class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</div>
</div>
- <br/>
- <span>
+ <div>
11 issues are fixed please check <br/>
<a href="https://www.apache.org/dist/openmeetings/3.1.5/CHANGELOG">CHANGELOG</a> and
<a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&version=12338819">Detailed list</a>
- </span>
+ </div>
<span> See <a href="downloads.html">Downloads page</a>.</span>
<span class="date">(2017-01-30)</span>
</div>
@@ -209,7 +208,7 @@
Other fixes in LDAP, groups, recordings, screen-sharing, calendar and installer<br/>
Italian and Ukrainian translations are improved
<br/>
- <span class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</span>
+ <div class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</div>
</div>
<br/>
<span>
@@ -229,11 +228,10 @@
<li>Other fixes in localization, backup/restore, screen-sharing, invitations etc.</li>
</ul>
<br/>
- <span class="bs-callout bs-callout-danger">
+ <div class="bs-callout bs-callout-danger">
NOTE java8 is required starting from this version<br/>
- </span>
- <br/>
- <span class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</span>
+ </div>
+ <div class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</div>
</div>
<br/>
<span>
@@ -248,10 +246,10 @@
<b>Version 3.1.2 released!</b>
<div>Service release 2 for 3.1.0 contains following improvements and bug fixes:<br/>
<br/>
- <span class="bs-callout bs-callout-danger">
+ <div class="bs-callout bs-callout-danger">
Security vulnerability <b>CVE-2016-3089 - Apache OpenMeetings XSS in SWF panel</b> was fixed,
please check <a href="security.html">Security Page</a><br/>
- </span>
+ </div>
<br/>
Other fixes<br/>
<ul>
@@ -261,7 +259,7 @@
<li>Private recording files were available to all users</li>
<li>Other fixes in admin, localization, installer, invitations, room etc.</li>
</ul>
- <span class="bs-callout bs-callout-info">Additionally signed Screen-Sharing application is available since this release</span>
+ <div class="bs-callout bs-callout-info">Additionally signed Screen-Sharing application is available since this release</div>
</div>
<br/>
<span>
@@ -276,10 +274,10 @@
<b>Version 3.1.1 released!</b>
<div>Service release 1 for 3.1.0 contains following improvements and bug fixes:<br/>
<br/>
- <span class="bs-callout bs-callout-danger">
+ <div class="bs-callout bs-callout-danger">
Multiple security vulnerabilities (CVE-2016-0783, CVE-2016-0784, CVE-2016-2163, CVE-2016-2164) were fixed,
please check <a href="security.html">Security Page</a><br/>
- </span>
+ </div>
<br/>
Other fixes<br/>
</div>
@@ -288,9 +286,9 @@
<a href="https://www.apache.org/dist/openmeetings/3.1.1/CHANGELOG">CHANGELOG</a> and
<a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&version=12334656">Detailed list</a>
</span>
- <span class="bs-callout bs-callout-danger">please NOTE this release contains screen-sharing application signed be self-signed certificate due to <a href="https://issues.apache.org/jira/browse/INFRA-11384">INFRA-11384</a>.
+ <div class="bs-callout bs-callout-danger">please NOTE this release contains screen-sharing application signed be self-signed certificate due to <a href="https://issues.apache.org/jira/browse/INFRA-11384">INFRA-11384</a>.
to use screen-sharing application with modern Java, please add OM site to the list of java security exceptions by running $JAVA_HOME/bin/ControlPanel.
- </span>
+ </div>
<span> See <a href="downloads.html">Downloads page</a>.</span>
<span class="date">(2016-03-24)</span>
</div>
@@ -320,9 +318,9 @@
<a href="http://archive.apache.org/dist/openmeetings/3.1.0/CHANGELOG">CHANGELOG</a> and
<a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&version=12333397">Detailed list</a>
</span>
- <span class="bs-callout bs-callout-danger">please NOTE this release contains screen-sharing application signed be self-signed certificate due to <a href="https://issues.apache.org/jira/browse/INFRA-11384">INFRA-11384</a>.
+ <div class="bs-callout bs-callout-danger">please NOTE this release contains screen-sharing application signed be self-signed certificate due to <a href="https://issues.apache.org/jira/browse/INFRA-11384">INFRA-11384</a>.
to use screen-sharing application with modern Java, please add OM site to the list of java security exceptions by running $JAVA_HOME/bin/ControlPanel.
- </span>
+ </div>
<span> See <a href="http://archive.apache.org/dist/openmeetings/3.1.0">Archived download</a>.</span>
<span class="date">(2016-03-06)</span>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f52fee4d/openmeetings-server/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/index.xml b/openmeetings-server/src/site/xdoc/index.xml
index 358c4d6..9bc12f4 100644
--- a/openmeetings-server/src/site/xdoc/index.xml
+++ b/openmeetings-server/src/site/xdoc/index.xml
@@ -90,8 +90,7 @@
<li>config types are introduced</li>
</ul>
Other fixes and improvements
- <br/>
- <span class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</span>
+ <div class="bs-callout bs-callout-info">Please update to this release from any previous OpenMeetings release</div>
</div>
<br/>
@@ -122,14 +121,14 @@
<section name="Feature details">
<subsection name="Audio and Video Conferencing">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/Features_Screen_Conference_Room_Thumb.png" class="example-image-link"
title="OpenMeetings Conference Room" style="float:none; display: block; width:250px;height:175px;border:0;">
<img src="images/Features_Screen_Conference_Room_Thumb.png" title="OpenMeetings Conference Room"
style="width: 250px; height: 175px;" alt="" />
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<span class="p_content">There are four options to use OpenMeetings audio/video functions,
which you can select during a conference session.
</span>
@@ -147,7 +146,7 @@
</subsection>
<subsection name="Meeting recording and Screen sharing">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/desktopsharing.png" class="example-image-link"
title="Screensharing-recording" style="float:none; display: block; width: 140px; height: 150px">
<img src="images/desktopsharing.png" title="Screensharing-recording" style="float:none; display: block; width: 140px; height: 150px" alt="" />
@@ -157,7 +156,7 @@
<img src="images/recordings_timeleine.png" title="Device" style="float:none; display: block; width: 200px; height: 115px" alt="" />
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<ul>
<li>Recorded sessions contain everything including sound recorded
from all audio streams in exactly the way you've seen it in the conference.
@@ -172,14 +171,14 @@
</subsection>
<subsection name="File Explorer">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/file_smal.png" class="example-image-link"
title="File Explorer" style="float:none; display: block; width:135px;height:200px;border:0;">
<img src="images/file_smal.png" title="File Explorer" alt=""
style="float:none; display: block; width:135px;height:200px;border:0;"/>
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<span class="p_content">Advanced File-Explorer in every conference room, Drag and Drop
interface for managing uploaded files, including the possibility to
create a document tree with folders.
@@ -197,14 +196,14 @@
</subsection>
<subsection name="Moderating System">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/right_management.png" class="example-image-link"
title="Right management" style="float:none; display: block; width:135px;height:216px;border:0;">
<img src="images/right_management.png" title="Right management" alt=""
style="float:none; display: block; width:135px;height:216px;border:0;"/>
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<span class="p_content">During a conference, the moderator can adjust the user permission to every user individually.</span>
<ul>
<li>
@@ -237,7 +236,7 @@
</subsection>
<subsection name="Multi-Whiteboard and Chat">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/whiteboard.png" class="example-image-link"
title="Whiteboard" style="float:none; display: block; width:240px;height:165px;border:0;">
<img src="images/whiteboard.png" title="Whiteboard"
@@ -249,7 +248,7 @@
style="float:none; display: block; width: 240px; height: 68px" alt="" />
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<span class="p_content" style="width: 450px">
Multi-Whiteboard, you can add new whiteboard instances, each
white board can have the full range of tools and
@@ -280,14 +279,14 @@
</subsection>
<subsection name="User and room management">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/dashboard.png" class="example-image-link"
title="Dashboard with MyRooms" style="float:none; display: block; width:250px;height:130px;border:0;">
<img src="images/dashboard.png" title="Dashboard with MyRooms" alt=""
style="float:none; display: block; width:250px;height:130px;border:0;"/>
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<span class="p_content" >
You can manage users and multiple organizations in a single
OpenMeetings instance. You can also create users that only have
@@ -307,14 +306,14 @@
</subsection>
<subsection name="Private message center">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/privat_messages.png" class="example-image-link"
title="Private Messages and Contact Search" style="float:none; display: block; width:230px;height:125px;border:0;">
<img src="images/privat_messages.png" title="Private Messages and Contact Search" alt=""
style="float:none; display: block; width:230px;height:125px;border:0;"/>
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<span class="p_content">
Send users messages and organize them in folders. You can book
conference rooms by sending private messages. The booked event
@@ -330,14 +329,14 @@
</subsection>
<subsection name="Plan meetings with integrated calendar">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/calendar.png" class="example-image-link"
title="Calendar" style="float:none; display: block; width:200px;height:115px;border:0;">
<img src="images/calendar.png" title="Calendar" alt=""
style="float:none; display: block; width:200px;height:115px;border:0;"/>
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<ul>
<li>Plan your conferencing and invite attendees from OpenMeetings or External.</li>
<li>The invited attendees will recieve an E-mail with details to the meetings and a link with a
@@ -350,14 +349,14 @@
</subsection>
<subsection name="Polls and Votes">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/poll.png" class="example-image-link"
title="Create a poll" style="float:none; display: block; width:250px;height:250px;border:0;">
<img src="images/poll.png" title="Create a poll" alt=""
style="float:none; display: block; width:250px;height:250px;border:0;"/>
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<span class="p_content">
You can create a poll with yes/no or 1-10 questions, let the
user vote and see the voting results.
@@ -370,14 +369,14 @@
</subsection>
<subsection name="Backup">
<div class="row">
- <div class="span3">
+ <div class="col-md-5">
<a href="images/backup.png" class="example-image-link"
title="Backup" style="float:none; display: block; width:240px;height:135px;border:0;">
<img src="images/backup.png" title="Backup" alt=""
style="float:none; display: block; width:250px;height:135px;border:0;"/>
</a>
</div>
- <div class="span5">
+ <div class="col-md-5">
<span class="p_content">You can backup all user-generated data including files
uploaded by the users in a single ZIP file and import that ZIP into
a new installation of OpenMeetings again.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f52fee4d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9f952a8..3d65d33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<!-- plugin versions -->
<maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
- <maven-site-plugin.version>3.3</maven-site-plugin.version>
+ <maven-site-plugin.version>3.6</maven-site-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
@@ -48,7 +48,7 @@
<checksum-maven-plugin.version>1.6</checksum-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<license-maven-plugin.version>1.14</license-maven-plugin.version>
- <reflow-velocity-tools.version>1.1.1</reflow-velocity-tools.version>
+ <reflow-skin.version>1.2.3.DEVACFR</reflow-skin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
@@ -567,12 +567,8 @@
<repository>
<id>jpresso</id>
<url>http://repository.jspresso.org/maven2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
<pluginRepositories>
@@ -583,12 +579,14 @@
<pluginRepository>
<id>jpresso</id>
<url>http://repository.jspresso.org/maven2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>openmeetings-bintray</id>
+ <url>https://dl.bintray.com/openmeetings/maven</url>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>false</enabled></snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
@@ -840,13 +838,7 @@
<dependency>
<groupId>lt.velykis.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId>
- <version>${reflow-velocity-tools.version}</version>
- </dependency>
- <!-- Reflow skin requires Velocity >= 1.7 -->
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
+ <version>${reflow-skin.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1052,6 +1044,8 @@
<notes></notes>
<patterns>
<pattern>Licensed MIT</pattern>
+ <pattern>Licensed under MIT</pattern>
+ <pattern>Licensed under the MIT license</pattern>
<pattern>MIT/GPL2 Licensed</pattern>
<pattern>licensed under the MIT and GPL</pattern>
</patterns>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f52fee4d/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 83557ee..b427601 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -11,11 +11,10 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
+-->
<project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
- name="Apache OpenMeetings Project">
-
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+ name="Apache OpenMeetings Project">
<bannerLeft>
<name>Apache OpenMeetings</name>
<src>http://openmeetings.apache.org/images/logo.png</src>
@@ -30,7 +29,7 @@
<skin>
<groupId>lt.velykis.maven.skins</groupId>
<artifactId>reflow-maven-skin</artifactId>
- <version>1.1.1</version>
+ <version>${reflow-skin.version}</version>
</skin>
<version position="none"/>
@@ -45,10 +44,10 @@
<item name="Wiki" href="https://cwiki.apache.org/confluence/display/OPENMEETINGS"/>
</links>
<menu ref="modules" inherit="top"/>
- <footer>
+ <footer><![CDATA[
<p>Apache OpenMeetings, OpenMeetings, Apache, the Apache feather, and the Apache OpenMeetings project logo</p>
<p>are trademarks of the Apache Software Foundation.</p>
- </footer>
+ ]]></footer>
</body>
<poweredBy></poweredBy>
@@ -59,6 +58,7 @@
<name><![CDATA[
<span class="color-highlight">Apache</span> OpenMeetings
]]></name>
+ <href>http://openmeetings.apache.org/index.html</href>
</brand>
<absoluteResourceURL>http://openmeetings.apache.org</absoluteResourceURL>
<protocolRelativeURLs>true</protocolRelativeURLs>