diff --git a/.gitignore b/.gitignore index fdba7aa6768224a4e59944c5d49c9de4e8869871..41c010cf09a29cf5f4f44b19f4f7bfad85573ff8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ bin/ target/ target2/ +*target/ +*target2/ *.class *.project *.classpath diff --git a/bc-generators/artifact-generators/pom.xml b/bc-generators/artifact-generators/pom.xml index 90ce5d2622d5b3da48156891cf655782d373846b..95a41168dbe81c6a9a76836c545063191468fc00 100644 --- a/bc-generators/artifact-generators/pom.xml +++ b/bc-generators/artifact-generators/pom.xml @@ -147,7 +147,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.4</version> + <version>2.7.3</version> </dependency> <!-- Set invocation address dependencies --> diff --git a/examples-for-test/binding-components/examples/weather-bc/pom.xml b/examples-for-test/binding-components/examples/weather-bc/pom.xml index c645a66ea104ead19d2850a2765e6eeb0d769779..a05c26e6d15475e45a2c48a320eeefb3d833615e 100644 --- a/examples-for-test/binding-components/examples/weather-bc/pom.xml +++ b/examples-for-test/binding-components/examples/weather-bc/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.4</version> + <version>2.7.3</version> </dependency> <!-- RestLet --> <dependency> diff --git a/examples-for-test/scenarios-end-to-end-test/pom.xml b/examples-for-test/scenarios-end-to-end-test/pom.xml index 33db555c9de6bba0c82b1d28b9b0ec375cac5cb2..56fc43fcca108c8efa7f8b97cb7fd18f355090e4 100644 --- a/examples-for-test/scenarios-end-to-end-test/pom.xml +++ b/examples-for-test/scenarios-end-to-end-test/pom.xml @@ -117,7 +117,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.4</version> + <version>2.7.3</version> </dependency> <!-- RestLet --> <dependency> diff --git a/pom.xml b/pom.xml index 1e255a4b8934bd0c3c41b5c5ead3afc1adee9244..8df395aebf7f5b2f9a83df5a6fd171eee17c2d54 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <vsb.version>2.1.2-SNAPSHOT</vsb.version> + <vsb.version>2.1.1-SNAPSHOT</vsb.version> </properties> <modules> <module>gm-api</module> diff --git a/protocol-pool/gm-coap/pom.xml b/protocol-pool/gm-coap/pom.xml index 22fac123816e6b30715ffbf5d658662e754f5373..3c4a0f03ac818725b88f5cb0cadbc80b803ae844 100644 --- a/protocol-pool/gm-coap/pom.xml +++ b/protocol-pool/gm-coap/pom.xml @@ -32,12 +32,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId> diff --git a/protocol-pool/gm-dpws/pom.xml b/protocol-pool/gm-dpws/pom.xml index 12705ba3b8f6e8e2ac74b53e9d2c1625e4d2f116..8155e76dc4de9b6c0b73dab89f71176dcd586d75 100644 --- a/protocol-pool/gm-dpws/pom.xml +++ b/protocol-pool/gm-dpws/pom.xml @@ -70,12 +70,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId> diff --git a/protocol-pool/gm-mqtt/pom.xml b/protocol-pool/gm-mqtt/pom.xml index 02c33bf52b2d017ddbac0dd14435be26e8bf9cd4..fb9aa23b602d7e51fce6b4297db44898ea114fb3 100644 --- a/protocol-pool/gm-mqtt/pom.xml +++ b/protocol-pool/gm-mqtt/pom.xml @@ -74,12 +74,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> diff --git a/protocol-pool/gm-rest/pom.xml b/protocol-pool/gm-rest/pom.xml index aa2948400ed28cc54ab79fe9989bc97b4f0d63bc..0dc704cc8a0d3790212aa80021542c681533a63f 100644 --- a/protocol-pool/gm-rest/pom.xml +++ b/protocol-pool/gm-rest/pom.xml @@ -44,12 +44,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> diff --git a/protocol-pool/gm-soap/pom.xml b/protocol-pool/gm-soap/pom.xml index 7b4a12fae91cca8e689ad209f8c1df1175863066..1e674331f115ac1b598c4740e5dff96985274d3b 100644 --- a/protocol-pool/gm-soap/pom.xml +++ b/protocol-pool/gm-soap/pom.xml @@ -73,17 +73,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.2</version> + <version>2.7.3</version> </dependency> <dependency> diff --git a/scenarios-end-to-end-test/scenarios/pom.xml b/scenarios-end-to-end-test/scenarios/pom.xml index 1e2544e17d71449669c9623330fc7a5f9b4a72bd..f9a6f5feb912fdc4f48fd6cf1b34053bacaaeec4 100644 --- a/scenarios-end-to-end-test/scenarios/pom.xml +++ b/scenarios-end-to-end-test/scenarios/pom.xml @@ -119,7 +119,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.4</version> + <version>2.7.3</version> </dependency> <!-- RestLet --> <dependency> diff --git a/tools/experiment/pom.xml b/tools/experiment/pom.xml index 40fee1eb3dd684ab8a81122724624a2e8c872ce8..63c3f14ba9da549e5855a77c42911a62be446898 100644 --- a/tools/experiment/pom.xml +++ b/tools/experiment/pom.xml @@ -8,11 +8,8 @@ <artifactId>tools</artifactId> <version>2.1.1-SNAPSHOT</version> </parent> - <groupId>eu.chorevolution.vsb</groupId> <artifactId>experiment</artifactId> - <version>2.1.1-SNAPSHOT</version> <name>experiment</name> - <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/tools/pom.xml b/tools/pom.xml index e5f2bc55d6eb3c964bec34f0c35bfcf506f6a7f1..f6a2f082b0e34ddc08ae9f66d9cf3391102db0d5 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>eu.chorevolution.vsb</groupId> @@ -25,11 +26,9 @@ <packaging>pom</packaging> <modules> <module>service-parser</module> - <!-- <module>wadl2gmdl</module> - <module>wsdl2gmdl</module>--> - <module>experiment</module> - <module>monitor</module> - <module>logger</module> - <module>compiler</module> + <module>experiment</module> + <module>monitor</module> + <module>logger</module> + <module>compiler</module> </modules> </project> diff --git a/vsb-manager-api/pom-vsb-manager.xml b/vsb-manager-api/pom-vsb-manager.xml index 4e742f24b212aa17d473503665c97245463211ce..0a8930687f56b9b5786861770bfdc1eb4394b28d 100644 --- a/vsb-manager-api/pom-vsb-manager.xml +++ b/vsb-manager-api/pom-vsb-manager.xml @@ -23,7 +23,7 @@ <properties> - <vsb.version>2.1.2-SNAPSHOT</vsb.version> + <vsb.version>2.1.1-SNAPSHOT</vsb.version> </properties> <dependencies> diff --git a/vsb-manager-api/pom.xml b/vsb-manager-api/pom.xml index 1d1fce96dd34f62f91a4b59c82ffb3866130e2ab..ee415039af983a888b06adc3bc260ba2031036ba 100644 --- a/vsb-manager-api/pom.xml +++ b/vsb-manager-api/pom.xml @@ -21,7 +21,7 @@ </repositories> <properties> - <vsb.version>2.1.2-SNAPSHOT</vsb.version> + <vsb.version>2.1.1-SNAPSHOT</vsb.version> </properties> <dependencies> diff --git a/vsb-manager-api/src/main/resources/pom-gm-coap.xml b/vsb-manager-api/src/main/resources/pom-gm-coap.xml index 082723642b6b2a3cb6a744fa0dd2abfbc8c3449d..5e3ab3e3849bdb859b3ef9258ac1c76620a97019 100644 --- a/vsb-manager-api/src/main/resources/pom-gm-coap.xml +++ b/vsb-manager-api/src/main/resources/pom-gm-coap.xml @@ -120,17 +120,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.2</version> + <version>2.7.3</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> diff --git a/vsb-manager-api/src/main/resources/pom-gm-dpws.xml b/vsb-manager-api/src/main/resources/pom-gm-dpws.xml index 566a3084ab0f7e3a0b34bd2d9fc68aa0efe6dc89..3f8f7571e2258863dbe53ff62109e1a8c7c9fe4c 100644 --- a/vsb-manager-api/src/main/resources/pom-gm-dpws.xml +++ b/vsb-manager-api/src/main/resources/pom-gm-dpws.xml @@ -156,17 +156,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.2</version> + <version>2.7.3</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> diff --git a/vsb-manager-api/src/main/resources/pom-gm-mqtt.xml b/vsb-manager-api/src/main/resources/pom-gm-mqtt.xml index 249790e4d9caa32919846612abde284ea6603d96..3e1a863aecba33b0e7d38c21a5767865c7857459 100644 --- a/vsb-manager-api/src/main/resources/pom-gm-mqtt.xml +++ b/vsb-manager-api/src/main/resources/pom-gm-mqtt.xml @@ -140,17 +140,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.2</version> + <version>2.7.3</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> diff --git a/vsb-manager-api/src/main/resources/pom-gm-rest.xml b/vsb-manager-api/src/main/resources/pom-gm-rest.xml index 3cd41abe253162b4d98e20c63fff8a3d135b549d..43813521b37b76b9a0f7665edcc784d868989004 100644 --- a/vsb-manager-api/src/main/resources/pom-gm-rest.xml +++ b/vsb-manager-api/src/main/resources/pom-gm-rest.xml @@ -99,17 +99,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.2</version> + <version>2.7.3</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> diff --git a/vsb-manager-api/src/main/resources/pom-gm-soap.xml b/vsb-manager-api/src/main/resources/pom-gm-soap.xml index db6bf034f412c812088305cef798ec826ac966d1..300dd7d7e0670c0dd95fa888c195b1e43386bc33 100644 --- a/vsb-manager-api/src/main/resources/pom-gm-soap.xml +++ b/vsb-manager-api/src/main/resources/pom-gm-soap.xml @@ -124,17 +124,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.2</version> + <version>2.6.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.2</version> + <version>2.7.3</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> diff --git a/vsb-manager-service-bundle/pom.xml b/vsb-manager-service-bundle/pom.xml index 2c943fca9ec8ee3558b1764022355094a31a7335..8a4045062aea43be90fb606bffe0837c1fa63196 100644 --- a/vsb-manager-service-bundle/pom.xml +++ b/vsb-manager-service-bundle/pom.xml @@ -15,7 +15,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <contextpath>vsb-manager-service-bundle</contextpath> - <vsb.version>2.1.2-SNAPSHOT</vsb.version> + <vsb.version>2.1.1-SNAPSHOT</vsb.version> </properties> <repositories> <repository>