Skip to content

Commit 798069c

Browse files
marcingrzejszczakmarcingrzejszczak
committed
Fix
1 parent 8b3112b commit 798069c

7 files changed

Lines changed: 22 additions & 36 deletions

File tree

‎beer_contracts/src/main/resources/contracts/com/example/beer-api-producer-external/1.0.0/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<spring-cloud-dependencies.version>2022.0.0-SNAPSHOT</spring-cloud-dependencies.version>
2626
<!-- We don't want to run tests -->
2727
<skipTests>true</skipTests>
28+
<!-- We don't want to compile any tests -->
29+
<maven.test.skip>true</maven.test.skip>
2830
<!-- We don't want to add build folders to the generated jar -->
2931
<excludeBuildFolders>true</excludeBuildFolders>
3032
</properties>

‎beer_contracts/src/main/resources/contracts/foo/bar/bazService/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
2424
<spring-cloud-dependencies.version>2022.0.0-SNAPSHOT</spring-cloud-dependencies.version>
2525
<skipTests>true</skipTests>
26+
<!-- We don't want to compile any tests -->
27+
<maven.test.skip>true</maven.test.skip>
2628
</properties>
2729

2830
<dependencyManagement>

‎beer_contracts/src/main/resources/contracts/foo/bar/beer-api-consumer/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
2424
<spring-cloud-dependencies.version>2022.0.0-SNAPSHOT</spring-cloud-dependencies.version>
2525
<skipTests>true</skipTests>
26+
<!-- We don't want to compile any tests -->
27+
<maven.test.skip>true</maven.test.skip>
2628
</properties>
2729

2830
<dependencyManagement>

‎pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<module>producer_with_junit4</module>
6363
<module>producer_with_xml</module>
6464
<module>producer_with_latest_2_2_features</module>
65-
<!-- <module>producer_kotlin_ftw</module>--> <!-- https://github.com/rest-assured/rest-assured/pull/1652 -->
66-
<!-- <module>producer_java</module> &lt;!&ndash; TODO: Parsing broken &ndash;&gt;-->
65+
<module>producer_kotlin_ftw</module>
66+
<module>producer_java</module>
6767
<module>producer_kafka_middleware</module>
6868
<module>producer_rabbit_middleware</module>
6969
<!-- <module>producer_jms_middleware</module>-->
@@ -78,8 +78,8 @@
7878
<module>consumer_with_junit4</module>
7979
<!--<module>consumer_security</module>--> <!-- TODO: Fix me -->
8080
<module>consumer_with_latest_2_2_features</module>
81-
<!-- <module>consumer_java</module> &lt;!&ndash; TODO: Parsing broken &ndash;&gt;-->
82-
<!-- <module>consumer_kotlin_ftw</module>--> <!-- https://github.com/rest-assured/rest-assured/pull/1652 -->
81+
<module>consumer_java</module>
82+
<module>consumer_kotlin_ftw</module>
8383
<module>consumer_kafka_middleware</module>
8484
<module>consumer_rabbit_middleware</module>
8585
<!-- <module>consumer_jms_middleware</module>-->
@@ -112,7 +112,7 @@
112112
<module>producer_router_function</module>
113113
<module>producer_yaml</module>
114114
<module>producer_advanced</module>
115-
<module>producer_proto</module>R
115+
<module>producer_proto</module>
116116
<module>producer_kotlin</module>
117117
<!-- <module>producer_security</module> --> <!-- TODO: Fix me -->
118118
<module>producer_with_stubs_per_consumer</module>
@@ -126,8 +126,8 @@
126126
<module>producer_with_junit4</module>
127127
<module>producer_with_xml</module>
128128
<module>producer_with_latest_2_2_features</module>
129-
<!-- <module>producer_kotlin_ftw</module>--> <!-- TODO: https://github.com/rest-assured/rest-assured/pull/1652 -->
130-
<!-- <module>producer_java</module>--> <!-- TODO: Parsing broken -->
129+
<module>producer_kotlin_ftw</module>
130+
<module>producer_java</module>
131131
<module>producer_kafka_middleware</module>
132132
<module>producer_rabbit_middleware</module>
133133
<!-- <module>producer_jms_middleware</module>-->
@@ -142,8 +142,8 @@
142142
<module>consumer_with_junit4</module>
143143
<!--<module>consumer_security</module>--> <!-- TODO: Fix me -->
144144
<module>consumer_with_latest_2_2_features</module>
145-
<!-- <module>consumer_java</module>--> <!-- TODO: Parsing broken -->
146-
<!-- <module>consumer_kotlin_ftw</module>--> <!-- TODO: https://github.com/rest-assured/rest-assured/pull/1652 -->
145+
<module>consumer_java</module>
146+
<module>consumer_kotlin_ftw</module>
147147
<module>consumer_kafka_middleware</module>
148148
<module>consumer_rabbit_middleware</module>
149149
<!-- <module>consumer_jms_middleware</module>-->
@@ -159,8 +159,8 @@
159159
<activeByDefault>false</activeByDefault>
160160
</activation>
161161
<modules>
162-
<!-- <module>producer_java</module>--> <!-- TODO: Parsing broken -->
163-
<!-- <module>consumer_java</module>--> <!-- TODO: Parsing broken -->
162+
<module>producer_java</module>
163+
<module>consumer_java</module>
164164
</modules>
165165
</profile>
166166
</profiles>

‎scripts/clean.sh‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ function clean() {
1111
rm -rf ~/.m2/repository/com/example/
1212
rm -rf "${ROOT}"/target/
1313
rm -rf ~/.gradle/caches/modules-2/files-2.1/com.example/
14-
clearDocker
1514
}
1615

17-
function clearDocker() {
18-
pushd "${ROOT}"/docker
19-
./stop.sh
20-
popd
21-
}
22-
23-
clean
16+
clean

‎scripts/runAcceptanceTests.sh‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,7 @@ export CI="${CI:-false}"
1010

1111
source "${ROOT}"/scripts/clean.sh
1212

13-
trap 'clean && clearDocker' EXIT
14-
15-
function startDockerCompose() {
16-
pushd "${ROOT}"/docker
17-
docker-compose pull
18-
docker-compose up -d
19-
popd
20-
}
13+
trap 'clean' EXIT
2114

2215
clean
2316

@@ -35,9 +28,8 @@ export SKIP_COMPATIBILITY="${SKIP_COMPATIBILITY:-false}"
3528

3629
if [[ "${SKIP_COMPATIBILITY}" != "true" ]]; then
3730
echo -e "\n\nWill run compatibility build\n\n"
38-
startDockerCompose
3931
# TODO: Go back to snapshots one day
40-
export CURRENT_BOOT_VERSION="2.4.0"
32+
export CURRENT_BOOT_VERSION="2.7.5"
4133
. ${ROOT}/scripts/runCompatibilityBuild.sh
4234
fi
4335

@@ -75,7 +67,6 @@ EOF
7567
export PREPARE_FOR_WORKSHOPS=true
7668

7769
clean
78-
clearDocker
7970

8071
. ${ROOT}/scripts/runMavenBuilds.sh
8172

‎scripts/runGradleBuilds.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ function build_gradle() {
9898
build producer_with_latest_2_2_features
9999
build producer_with_latest_3_0_features_gradle
100100
build producer_java
101-
# https://github.com/rest-assured/rest-assured/pull/1652
102-
# build producer_kotlin_ftw
103-
build producer_kafka
101+
build producer_kotlin_ftw
104102
build producer_kafka_middleware
105103
build producer_rabbit_middleware
106104
# build producer_jms_middleware
@@ -128,9 +126,7 @@ function build_gradle() {
128126
kill_java
129127

130128
build consumer_java
131-
# https://github.com/rest-assured/rest-assured/pull/1652
132-
# build consumer_kotlin_ftw
133-
build consumer_kafka
129+
build consumer_kotlin_ftw
134130
build consumer_kafka_middleware
135131
build consumer_rabbit_middleware
136132
# build consumer_jms_middleware

0 commit comments

Comments
 (0)