This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 52f726d Upgrading cargo-maven2-plugin, Tomcat, Swagger UI, Groovy,
Flowable and Camel
52f726d is described below
commit 52f726d85526321d52d0d50f178659361a128eb6
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Jul 18 12:06:44 2019 +0200
Upgrading cargo-maven2-plugin, Tomcat, Swagger UI, Groovy, Flowable and
Camel
---
ext/camel/provisioning-camel/pom.xml | 4 ----
.../META-INF/resources/swagger/index.html | 4 ++--
pom.xml | 27 +++++-----------------
3 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/ext/camel/provisioning-camel/pom.xml
b/ext/camel/provisioning-camel/pom.xml
index 3bcff53..ded4831 100644
--- a/ext/camel/provisioning-camel/pom.xml
+++ b/ext/camel/provisioning-camel/pom.xml
@@ -52,10 +52,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-script</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-metrics</artifactId>
</dependency>
<dependency>
diff --git
a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
index 4bc87ee..f8a8209 100644
--- a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
+++ b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
@@ -57,8 +57,7 @@ under the License.
<script src="./swagger-ui-standalone-preset.js"> </script>
<script>
window.onload = function() {
-
- // Build a system
+ // Begin Swagger UI call region
const ui = SwaggerUIBundle({
// <ApacheSyncope>
urls: [{
@@ -81,6 +80,7 @@ under the License.
],
layout: "StandaloneLayout"
})
+ // End Swagger UI call region
window.ui = ui
}
diff --git a/pom.xml b/pom.xml
index bed73cf..0a86e5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -408,11 +408,11 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <groovy.version>3.0.0-beta-1</groovy.version>
+ <groovy.version>3.0.0-beta-2</groovy.version>
- <flowable.version>6.4.1</flowable.version>
+ <flowable.version>6.4.2</flowable.version>
- <camel.version>3.0.0-M2</camel.version>
+ <camel.version>3.0.0-M4</camel.version>
<slf4j.version>1.7.26</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
@@ -444,7 +444,7 @@ under the License.
<log.directory>${project.build.directory}/log</log.directory>
<swagger-core.version>2.0.8</swagger-core.version>
- <swagger-ui.version>3.22.2</swagger-ui.version>
+ <swagger-ui.version>3.23.0</swagger-ui.version>
<guava.version>20.0</guava.version>
<jquery.version>3.4.1</jquery.version>
@@ -507,7 +507,7 @@ under the License.
<cargo.log>${log.directory}/cargo.log</cargo.log>
<cargo.output>${log.directory}/cargo-output.log</cargo.output>
- <tomcat.version>9.0.21</tomcat.version>
+ <tomcat.version>9.0.22</tomcat.version>
<docker.postgresql.version>11.2</docker.postgresql.version>
<docker.mysql.version>8.0</docker.mysql.version>
@@ -733,21 +733,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-script</artifactId>
- <version>${camel.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-metrics</artifactId>
<version>${camel.version}</version>
<exclusions>
@@ -2026,7 +2011,7 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
<configuration>
<configuration>
<type>standalone</type>
