From 14c02f2dc4e4004414ab6bf32117f3e445b10f3e Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 4 Sep 2019 17:40:48 +0200
Subject: [PATCH] OO-4220: update libraries, remove wadl document profile in
pom
---
README.md | 18 +---
pom.xml | 278 +++---------------------------------------------------
2 files changed, 15 insertions(+), 281 deletions(-)
diff --git a/README.md b/README.md
index c5c73972aad..a630742e348 100644
--- a/README.md
+++ b/README.md
@@ -223,17 +223,7 @@ To read the OpenOlat REST API documentation:
1. start OpenOlat
2. go to Administration -> Core configuration -> REST API
3. Make sure the REST API ist enabled
-4. Click the documentation link in the admin panel or open YOURSERVERURL/restapi/api/doc in your browser
-
-For developer: if you modified the documentation in the source files, you need to compile
-the REST API documentation. Do the following:
-
-```bash
-mvn clean package
-mvn compile -Pdocumentation,tomcat
-```
-
-The process need a lot of memory, give it 4 Gig.
+4. Click the documentation link in the admin panel
### Automated tests
@@ -348,10 +338,10 @@ mvn clean test -Dwith-postgresql -Dtest.env.db.postgresql.pass=serial -Dtest=org
#### Execute selenium functional tests
The selenium integration tests start the whole web application in Tomcat 8.0. They run with
-Google Chrome and its WebDriver will be automatically downloaded (internet connection
-needed). It need to be installed the standard way on Mac or Linux.
+Google Chrome or Firefox and their WebDrivers will be automatically downloaded (internet connection
+needed). The browsers need to be installed the standard way on Mac or Linux.
-Execution time ca. 65m
+Execution time ca. 60 - 90m
**For MySQL:**
diff --git a/pom.xml b/pom.xml
index 1c6b7fd3b80..f81675f2e17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,15 +62,14 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<targetJdk>1.8</targetJdk>
- <org.springframework.version>5.1.8.RELEASE</org.springframework.version>
+ <org.springframework.version>5.1.9.RELEASE</org.springframework.version>
<org.hibernate.version>5.4.4.Final</org.hibernate.version>
- <com.sun.jersey.version>1.19.4</com.sun.jersey.version>
- <apache.cxf>3.3.2</apache.cxf>
+ <apache.cxf>3.3.3</apache.cxf>
<apache.pdfbox>2.0.16</apache.pdfbox>
<apache.poi>4.1.0</apache.poi>
- <apache.log4j>2.12.0</apache.log4j>
+ <apache.log4j>2.12.1</apache.log4j>
<io.jsonwebtoken>0.10.7</io.jsonwebtoken>
- <io.undertow>2.0.23.Final</io.undertow>
+ <io.undertow>2.0.26.Final</io.undertow>
<jackson.version>2.9.9</jackson.version>
<org.mysql.version>5.1.46</org.mysql.version>
<org.postgresql.version>42.2.6</org.postgresql.version>
@@ -78,7 +77,7 @@
<lucene.version>7.7.0</lucene.version>
<version.selenium>3.141.59</version.selenium>
<version.drone>2.5.1</version.drone>
- <activemq.version>5.15.9</activemq.version>
+ <activemq.version>5.15.10</activemq.version>
<qtiworks.version>1.0.18</qtiworks.version>
<!-- properties for testing and Q&A -->
@@ -104,29 +103,6 @@
<skipSeleniumTests>false</skipSeleniumTests>
</properties>
<profiles>
- <profile>
- <id>documentation</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>maven-wadl-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>compressjs</id>
<build>
@@ -434,7 +410,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>3.23.2</version>
+ <version>3.23.5</version>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
@@ -1542,238 +1518,6 @@
</executions>
</plugin>
- <!-- start rest api documentation: broken: mvn javadoc:javadoc -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
- <executions>
- <execution>
- <id>schemagen</id>
- <goals>
- <goal>schemagen</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <sources>
- <source>src/main/java/org/olat/core/commons/services/notifications/restapi/vo/</source>
- <source>src/main/java/org/olat/commons/calendar/restapi/</source>
- <source>src/main/java/org/olat/modules/curriculum/restapi/</source>
- <source>src/main/java/org/olat/modules/fo/restapi/</source>
- <source>src/main/java/org/olat/modules/docpool/restapi/</source>
- <source>src/main/java/org/olat/modules/gotomeeting/restapi/</source>
- <source>src/main/java/org/olat/modules/taxonomy/restapi/</source>
- <source>src/main/java/org/olat/modules/vitero/restapi/</source>
- <source>src/main/java/org/olat/modules/wiki/restapi/vo/</source>
- <source>src/main/java/org/olat/restapi/system/vo/</source>
- <source>src/main/java/org/olat/restapi/support/vo/</source>
- <source>src/main/java/org/olat/registration/restapi/</source>
- <source>src/main/java/org/olat/user/restapi/</source>
- </sources>
- <schemaSourceExcludeFilters>
- <myExcludes implementation="org.codehaus.mojo.jaxb2.shared.filters.pattern.PatternFileFilter">
- <patterns>
- <pattern>jaxb\.index</pattern>
- <pattern>.*WebService.java</pattern>
- <pattern>.*Factory.java</pattern>
- <pattern>.*Examples.java</pattern>
- <pattern>.*DateParam.java</pattern>
- <pattern>.*StatusVO.java</pattern>
- <pattern>.*GoToErrorVO.java</pattern>
- </patterns>
- </myExcludes>
- </schemaSourceExcludeFilters>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <verbose>true</verbose>
- </configuration>
- </plugin>
-
- <!-- Javadoc -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <phase>compile</phase>
- </execution>
- </executions>
-
- <configuration>
- <encoding>UTF-8</encoding>
- <verbose>false</verbose>
- <show>public</show>
- <subpackages>
- org.olat.core.commons.services.notifications.restapi,
- org.olat.commons.calendar.restapi,
- org.olat.course.nodes.bc,
- org.olat.course.nodes.bc,
- org.olat.course.nodes.co,
- org.olat.course.nodes.en,
- org.olat.course.certificate.restapi,
- org.olat.course.db.restapi,
- org.olat.modules.curriculum.restapi,
- org.olat.modules.docpool.restapi,
- org.olat.modules.fo.restapi,
- org.olat.modules.gotomeeting.restapi,
- org.olat.modules.openmeetings.restapi,
- org.olat.modules.taxonomy.restapi,
- org.olat.modules.vitero.restapi,
- org.olat.modules.wiki.restapi,
- org.olat.registration.restapi,
- org.olat.restapi,
- org.olat.user.restapi
- </subpackages>
- <doclet>com.sun.jersey.wadl.resourcedoc.ResourceDoclet</doclet>
- <docletArtifacts>
- <docletArtifact>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>wadl-resourcedoc-doclet</artifactId>
- <version>${com.sun.jersey.version}</version>
- </docletArtifact>
- <!-- Also specify jersey and xerces as doclet artifacts as the ResourceDoclet
- uses classes provided by them to generate the resourcedoc. -->
- <docletArtifact>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${com.sun.jersey.version}</version>
- </docletArtifact>
- <docletArtifact>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.12.0</version>
- </docletArtifact>
- </docletArtifacts>
- <additionalparam>-output
- ${project.build.outputDirectory}/resourcedoc.xml</additionalparam>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>maven-wadl-plugin</artifactId>
- <version>${com.sun.jersey.version}</version>
- <executions>
- <execution>
- <id>generate</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <phase>compile</phase>
- </execution>
- </executions>
-
- <configuration>
- <wadlFile>${project.build.outputDirectory}/application.wadl</wadlFile>
- <formatWadlFile>true</formatWadlFile>
- <baseUri>http://www.example.com</baseUri>
- <packagesResourceConfig>
- <param>
- org.olat.core.commons.services.notifications.restapi;
- org.olat.commons.calendar.restapi;
- org.olat.course.nodes.bc;
- org.olat.course.nodes.co;
- org.olat.course.nodes.en;
- org.olat.course.certificate.restapi;
- org.olat.course.db.restapi;
- org.olat.modules.curriculum.restapi;
- org.olat.modules.fo.restapi;
- org.olat.modules.docpool.restapi;
- org.olat.modules.gotomeeting.restapi;
- org.olat.modules.openmeetings.restapi;
- org.olat.modules.taxonomy.restapi;
- org.olat.modules.vitero.restapi;
- org.olat.modules.wiki.restapi;
- org.olat.registration.restapi;
- org.olat.restapi;
- org.olat.user.restapi;
- </param>
- </packagesResourceConfig>
- <wadlGenerators>
- <wadlGeneratorDescription>
- <className>com.sun.jersey.server.wadl.generators.WadlGeneratorApplicationDoc</className>
- <properties>
- <property>
- <name>applicationDocsFile</name>
- <value>src/main/java/org/olat/restapi/support/application-doc.xml</value>
- </property>
- </properties>
- </wadlGeneratorDescription>
- <wadlGeneratorDescription>
- <className>com.sun.jersey.server.wadl.generators.WadlGeneratorGrammarsSupport</className>
- <properties>
- <property>
- <name>grammarsFile</name>
- <value>src/main/java/org/olat/restapi/support/application-grammars.xml</value>
- </property>
- </properties>
- </wadlGeneratorDescription>
- <wadlGeneratorDescription>
- <className>com.sun.jersey.server.wadl.generators.resourcedoc.WadlGeneratorResourceDocSupport</className>
- <properties>
- <property>
- <name>resourceDocFile</name>
- <value>${project.build.outputDirectory}/resourcedoc.xml</value>
- </property>
- </properties>
- </wadlGeneratorDescription>
- </wadlGenerators>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.12.0</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>xslt: ${project.build.outputDirectory}/application.html</id>
- <phase>compile</phase> <!-- append to the packaging phase. -->
- <goals>
- <goal>transform</goal> <!-- goals == mojos -->
- </goals>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${project.build.outputDirectory}</dir>
- <includes>
- <include>application.wadl</include>
- </includes>
- <outputDir>src/main/java/org/olat/restapi/api/_content/</outputDir>
- <stylesheet>src/main/java/org/olat/restapi/support/wadl_documentation.xsl</stylesheet>
- <fileMappers>
- <fileMapper
- implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
- <targetExtension>.html</targetExtension>
- </fileMapper>
- </fileMappers>
- </transformationSet>
- </transformationSets>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon9</artifactId>
- <version>9.1.0.8</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <!-- end rest api documentation -->
-
<!-- Dependency checks -->
<plugin>
<groupId>org.owasp</groupId>
@@ -2125,7 +1869,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.26</version>
+ <version>1.7.28</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -2240,7 +1984,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.11</version>
+ <version>4.4.12</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -2266,7 +2010,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
@@ -2361,7 +2105,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20180813</version>
+ <version>20190722</version>
</dependency>
<dependency>
<groupId>jazzlib</groupId>
@@ -2396,7 +2140,7 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
- <version>1.6.3</version>
+ <version>1.6.4</version>
</dependency>
<dependency>
<groupId>com.neemsoft</groupId>
--
GitLab