Skip to content

Commit f288bd7

Browse files
author
droberts2013
committed
Fix issue 7: ClassCastException
1 parent 1911879 commit f288bd7

19 files changed

+107
-26
lines changed

build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.github.hierynomus.license" version "0.14.0"
2+
id "com.github.hierynomus.license" version "0.16.1"
33
id 'nebula.release' version '13.0.0'
44
}
55

@@ -8,7 +8,7 @@ plugins {
88
apply plugin: 'java'
99
apply plugin: 'idea'
1010
apply plugin: 'eclipse'
11-
apply plugin: 'maven'
11+
// apply plugin: 'maven'
1212

1313
repositories {
1414
mavenLocal()
@@ -44,16 +44,16 @@ task integrationTest(type: Test, dependsOn: ['build']) {
4444

4545
dependencies {
4646
// Place rest-assured before JUnit dependency to make sure correct Hamcrest is used
47-
testCompile 'io.rest-assured:rest-assured:3.2.0'
48-
testCompile 'junit:junit:4.11'
49-
testCompile 'com.googlecode.json-simple:json-simple:1.1.1'
50-
testCompile 'org.assertj:assertj-core:3.6.2'
51-
testCompile "org.testcontainers:testcontainers:1.15.0"
52-
testCompile 'org.slf4j:slf4j-simple:1.8.0-beta2'
53-
testCompile 'org.skyscreamer:jsonassert:1.5.0'
47+
testImplementation 'io.rest-assured:rest-assured:3.2.0'
48+
testImplementation 'junit:junit:4.11'
49+
testImplementation 'com.googlecode.json-simple:json-simple:1.1.1'
50+
testImplementation 'org.assertj:assertj-core:3.6.2'
51+
testImplementation "org.testcontainers:testcontainers:1.15.0"
52+
testImplementation 'org.slf4j:slf4j-simple:1.8.0-beta2'
53+
testImplementation 'org.skyscreamer:jsonassert:1.5.0'
5454

55-
compile 'com.google.guava:guava:23.0'
56-
compile 'org.yaml:snakeyaml:1.24'
55+
implementation 'com.google.guava:guava:23.0'
56+
implementation 'org.yaml:snakeyaml:1.24'
5757
}
5858

5959

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#Wed May 02 14:39:33 CEST 2018
2+
languageLevel=1.8
3+
xlPluginsPluginVersion=1.3.5

gradle/buildViaTravis.sh

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
# This script will build the project.
3+
4+
SWITCHES="--info --stacktrace"
5+
6+
GRADLE_VERSION=$(./gradlew -version | grep Gradle | cut -d ' ' -f 2)
7+
8+
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
9+
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
10+
./gradlew clean build $SWITCHES
11+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
12+
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
13+
./gradlew -Prelease.travisci=true clean snapshot $SWITCHES
14+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
15+
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
16+
case "$TRAVIS_TAG" in
17+
*-rc\.*)
18+
./gradlew -Prelease.travisci=true -Prelease.useLastTag=true clean candidate $SWITCHES
19+
;;
20+
*)
21+
./gradlew -Prelease.travisci=true -Prelease.useLastTag=true clean final $SWITCHES
22+
;;
23+
esac
24+
else
25+
echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
26+
./gradlew clean build $SWITCHES
27+
fi
28+
29+
EXIT=$?
30+
31+
rm -f "$HOME/.gradle/caches/modules-2/modules-2.lock"
32+
rm -rf "$HOME/.gradle/caches/$GRADLE_VERSION/plugin-resolution"
33+
34+
exit $EXIT

gradle/dependencies.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
dependencyManagement {
2+
versions {
3+
docBaseStyleVersion="3.0.3"
4+
xlDeployVersion="9.0.0-alpha.78"
5+
licenseDatabaseVersion="1.2.45"
6+
xlPlatformVersion="2019.2.0-alpha.75"
7+
}
8+
}

gradle/wrapper/gradle-wrapper.jar

908 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip

gradlew

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"

gradlew.bat

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem http://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

src/main/resources/synthetic.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<!--
33
4-
Copyright 2021 XEBIALABS
4+
Copyright 2024 XEBIALABS
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
77

src/main/resources/ucd/HttpRequest.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2021 XEBIALABS
2+
# Copyright 2024 XEBIALABS
33
#
44
# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
55
#
@@ -40,6 +40,10 @@ def __init__(self, params, username = None, password = None, verify = True):
4040
:param password: an password
4141
(optional)
4242
"""
43+
if params.get("authenticationMethod"):
44+
params.put("authenticationMethod", str(params.get("authenticationMethod").name()).lower())
45+
if params.get("oauth2GrantType"):
46+
params.put("oauth2GrantType", str(params.get("oauth2GrantType").name()).lower())
4347
self.params = HttpConnection(params)
4448
self.username = username
4549
self.password = password

0 commit comments

Comments
 (0)