Author: solomax
Date: Tue Aug 30 02:11:44 2016
New Revision: 1758315
URL: http://svn.apache.org/viewvc?rev=1758315&view=rev
Log:
[OPENMEETINGS-1461] JDK8 is now required to build/run OpenMeetings
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/application/branches/3.1.x/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/application/branches/3.2.x/pom.xml
openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/application/trunk/pom.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
Tue Aug 30 02:11:44 2016
@@ -32,7 +32,7 @@
<all-permissions/>
</security>
<resources>
- <j2se version='1.7+'/>
+ <j2se version='1.8+'/>
<jar href="bcprov-jdk15on-1.54.jar" main="true"/>
<jar
href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
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=1758315&r1=1758314&r2=1758315&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
Tue Aug 30 02:11:44 2016
@@ -35,8 +35,8 @@
<div>
<p>To build a binary release of OpenMeetings
you need: </p>
<ul>
- <li>Oracle JDK7</li>
- <li>Apache Maven (minimum) 3.3.3</li>
+ <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>
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=1758315&r1=1758314&r2=1758315&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
Tue Aug 30 02:11:44 2016
@@ -26,7 +26,7 @@
<div>
<p>To build a binary release of
OpenMeetings you need: </p>
<ul>
- <li>Sun JDK7</li>
+ <li>Sun JDK8</li>
<li>Apache Maven 3.3.9</li>
<li>
SVN Command line client
(Subversion 1.7 required!)
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Tue Aug 30 02:11:44 2016
@@ -69,7 +69,7 @@ public class VideoInfo extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- final IRecordingConverter converter =
getBean(isInterview ? InterviewConverter.class : RecordingConverter.class);
+ final IRecordingConverter converter = isInterview ?
getBean(InterviewConverter.class) : getBean(RecordingConverter.class);
new Thread() {
@Override
public void run() {
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Tue Aug 30 02:11:44 2016
@@ -89,25 +89,6 @@
</properties>
</profile>
<profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
-
<additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
<id>rc</id>
<build>
<plugins>
@@ -124,7 +105,7 @@
<configuration>
<rules>
<requireJavaVersion>
-
<version>[1.7.0, 1.8.0)</version>
+
<version>[1.8.0)</version>
</requireJavaVersion>
</rules>
<failFast>true</failFast>
@@ -768,6 +749,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
+ <configuration>
+
<additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
</plugin>
<plugin>
<inherited>true</inherited>
@@ -775,8 +759,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<optimize>true</optimize>
<debug>true</debug>
</configuration>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
Tue Aug 30 02:11:44 2016
@@ -32,7 +32,7 @@
<all-permissions/>
</security>
<resources>
- <j2se version='1.7+'/>
+ <j2se version='1.8+'/>
<jar href="bcprov-jdk15on-1.54.jar" main="true"/>
<jar
href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
Tue Aug 30 02:11:44 2016
@@ -35,8 +35,8 @@
<div>
<p>To build a binary release of OpenMeetings
you need: </p>
<ul>
- <li>Oracle JDK7</li>
- <li>Apache Maven (minimum) 3.3.3</li>
+ <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>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
Tue Aug 30 02:11:44 2016
@@ -26,7 +26,7 @@
<div>
<p>To build a binary release of
OpenMeetings you need: </p>
<ul>
- <li>Sun JDK7</li>
+ <li>Sun JDK8</li>
<li>Apache Maven 3.3.9</li>
<li>
SVN Command line client
(Subversion 1.7 required!)
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Tue Aug 30 02:11:44 2016
@@ -69,7 +69,7 @@ public class VideoInfo extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- final IRecordingConverter converter =
getBean(isInterview ? InterviewConverter.class : RecordingConverter.class);
+ final IRecordingConverter converter = isInterview ?
getBean(InterviewConverter.class) : getBean(RecordingConverter.class);
new Thread() {
@Override
public void run() {
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Tue Aug 30 02:11:44 2016
@@ -89,25 +89,6 @@
</properties>
</profile>
<profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
-
<additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
<id>rc</id>
<build>
<plugins>
@@ -124,7 +105,7 @@
<configuration>
<rules>
<requireJavaVersion>
-
<version>[1.7.0, 1.8.0)</version>
+
<version>[1.8.0)</version>
</requireJavaVersion>
</rules>
<failFast>true</failFast>
@@ -768,6 +749,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
+ <configuration>
+
<additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
</plugin>
<plugin>
<inherited>true</inherited>
@@ -775,8 +759,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<optimize>true</optimize>
<debug>true</debug>
</configuration>
Modified:
openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
(original)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
Tue Aug 30 02:11:44 2016
@@ -32,7 +32,7 @@
<all-permissions/>
</security>
<resources>
- <j2se version='1.7+'/>
+ <j2se version='1.8+'/>
<jar href="bcprov-jdk15on-1.54.jar" main="true"/>
<jar
href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
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=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/BuildInstructions.xml
Tue Aug 30 02:11:44 2016
@@ -35,8 +35,8 @@
<div>
<p>To build a binary release of OpenMeetings
you need: </p>
<ul>
- <li>Oracle JDK7</li>
- <li>Apache Maven (minimum) 3.3.3</li>
+ <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>
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=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
Tue Aug 30 02:11:44 2016
@@ -26,7 +26,7 @@
<div>
<p>To build a binary release of
OpenMeetings you need: </p>
<ul>
- <li>Sun JDK7</li>
+ <li>Sun JDK8</li>
<li>Apache Maven 3.3.9</li>
<li>
SVN Command line client
(Subversion 1.7 required!)
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Tue Aug 30 02:11:44 2016
@@ -69,7 +69,7 @@ public class VideoInfo extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- final IRecordingConverter converter =
getBean(isInterview ? InterviewConverter.class : RecordingConverter.class);
+ final IRecordingConverter converter = isInterview ?
getBean(InterviewConverter.class) : getBean(RecordingConverter.class);
new Thread() {
@Override
public void run() {
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1758315&r1=1758314&r2=1758315&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Tue Aug 30 02:11:44 2016
@@ -89,25 +89,6 @@
</properties>
</profile>
<profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
-
<additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
<id>rc</id>
<build>
<plugins>
@@ -124,7 +105,7 @@
<configuration>
<rules>
<requireJavaVersion>
-
<version>[1.7.0, 1.8.0)</version>
+
<version>[1.8.0)</version>
</requireJavaVersion>
</rules>
<failFast>true</failFast>
@@ -768,6 +749,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
+ <configuration>
+
<additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
</plugin>
<plugin>
<inherited>true</inherited>
@@ -775,8 +759,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<optimize>true</optimize>
<debug>true</debug>
</configuration>
