Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@svettwer
svettwer committed Jun 13, 2018
2 parents 229a6a3 + 2ee9e3a commit c0dfe1e
Show file tree
Hide file tree
Showing 88 changed files with 1,286 additions and 109 deletions.
2 changes: 1 addition & 1 deletion modules/citrus-arquillian/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ...uillian/src/test/java/com/consol/citrus/arquillian/client/CitrusArchiveProcessorTest.java
View file
Expand Up @@ -46,7 +46,7 @@ public class CitrusArchiveProcessorTest {
public void setCitrusVersion() {
Field version = ReflectionUtils.findField(Citrus.class, "version");
ReflectionUtils.makeAccessible(version);
ReflectionUtils.setField(version, Citrus.class, "2.7.6");
ReflectionUtils.setField(version, Citrus.class, "2.7.7-SNAPSHOT");
}

@BeforeMethod
Expand Down
2 changes: 1 addition & 1 deletion ...llian/src/test/java/com/consol/citrus/arquillian/shrinkwrap/CitrusArchiveBuilderTest.java
View file
Expand Up @@ -31,7 +31,7 @@ public class CitrusArchiveBuilderTest {
public void setCitrusVersion() {
Field version = ReflectionUtils.findField(Citrus.class, "version");
ReflectionUtils.makeAccessible(version);
ReflectionUtils.setField(version, Citrus.class, "2.7.6");
ReflectionUtils.setField(version, Citrus.class, "2.7.7-SNAPSHOT");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-bom/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-camel/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-core/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-cucumber/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-docker/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-ftp/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-http/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-integration/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-java-dsl/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-jdbc/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-jms/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-jmx/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-kubernetes/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-mail/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-camel/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-core/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-cucumber/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ...l-cucumber/src/main/resources/com/consol/citrus/schema/citrus-cucumber-testcase-2.7.6.xsd
View file
Expand Up @@ -22,7 +22,7 @@
attributeFormDefault="unqualified">

<xs:import namespace="http://www.citrusframework.org/schema/testcase"
schemaLocation="http://www.citrusframework.org/schema/testcase/citrus-testcase-2.7.6.xsd" />
schemaLocation="http://www.citrusframework.org/schema/testcase/citrus-testcase-2.7.7-SNAPSHOT.xsd" />

<xs:element name="step">
<xs:annotation>
Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-docker/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-ftp/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-http/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-jdbc/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-jms/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-jmx/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-kubernetes/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-mail/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-rmi/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-selenium/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-ssh/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-vertx/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-websocket/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-ws/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ...s-model/model-ws/src/main/resources/com/consol/citrus/schema/citrus-ws-testcase-2.7.6.xsd
View file
Expand Up @@ -22,7 +22,7 @@
attributeFormDefault="unqualified">

<xs:import namespace="http://www.citrusframework.org/schema/testcase"
schemaLocation="http://www.citrusframework.org/schema/testcase/citrus-testcase-2.7.6.xsd" />
schemaLocation="http://www.citrusframework.org/schema/testcase/citrus-testcase-2.7.7-SNAPSHOT.xsd" />

<xs:complexType name="SoapAttachmentType">
<xs:choice>
Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/model-zookeeper/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>citrus-model</artifactId>
<groupId>com.consol.citrus.model</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-model/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-restdocs/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-rmi/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-selenium/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-ssh/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-vertx/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/citrus-websocket/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>citrus</artifactId>
<groupId>com.consol.citrus</groupId>
<version>2.7.6</version>
<version>2.7.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit c0dfe1e

Please sign in to comment.