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 2018/07/26 07:44:47 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1897] some
dependencies were updated to comply with audit
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 98753cc [OPENMEETINGS-1897] some dependencies were updated to comply with audit
98753cc is described below
commit 98753cc9dfadde911bc4eab51629419d5ecdbb40
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jul 26 14:40:15 2018 +0700
[OPENMEETINGS-1897] some dependencies were updated to comply with audit
---
.../src/main/jnlp/templates/template.jnlp | 2 +-
openmeetings-server/src/site/xdoc/BuildInstructions.xml | 3 +++
openmeetings-util/pom.xml | 1 -
pom.xml | 16 ++++++++++++++++
4 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp b/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
index 0d13ba0..8a88d9c 100644
--- a/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
+++ b/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
@@ -33,7 +33,7 @@
</security>
<resources>
<j2se version='1.8+'/>
- <jar href="bcprov-jdk15on-1.59.jar" main="true"/>
+ <jar href="bcprov-jdk15on-1.60.jar" main="true"/>
<jar href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
<application-desc main-class='org.apache.openmeetings.screenshare.Core'>
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index d40dd6c..a5c4a6f 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -49,6 +49,9 @@
<img src="images/eclipse-import-maven-project.png" alt="Import OM into Eclipse" width="526" height="394" />
</p>
</section>
+ <section name="Check for known vulnerabilities">
+ <source>mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml</source>
+ </section>
<section name="Check for updates">
<source>mvn versions:display-dependency-updates</source>
<source>mvn versions:display-plugin-updates</source>
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index d6c67c3..c245957 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -131,7 +131,6 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>${tika-parsers.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 4e1ce08..1089569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
<logback.version>1.2.3</logback.version>
<jetty9.version>9.4.11.v20180605</jetty9.version>
<license.excludedScopes>test</license.excludedScopes>
+ <bcprov-jdk15on.version>1.60</bcprov-jdk15on.version>
<!-- URL of the ASF SonarQube server -->
<sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
<!-- Exclude all generated code -->
@@ -747,6 +748,11 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>${selenium.version}</version>
@@ -830,6 +836,16 @@
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bcprov-jdk15on.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ <version>${tika-parsers.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>