You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/11/10 10:29:14 UTC
[jmeter] branch master updated (ea824d5 -> 0aa9af7)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from ea824d5 build.gradle.kts : Revert useless additions introduced in commit f05baec58fa278479108c2929e622a5b8cfe2157
new 177678b Remove explicit version from build.gradle.kts files
new 0aa9af7 Mark jmeter-maven-plugin tests with allow_failures
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 5 ++++-
src/build.gradle.kts | 2 +-
src/components/build.gradle.kts | 4 ++--
src/functions/build.gradle.kts | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
[jmeter] 02/02: Mark jmeter-maven-plugin tests with allow_failures
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 0aa9af768c90c67bc349553894168bfc65f3f792
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Nov 9 22:38:18 2019 +0300
Mark jmeter-maven-plugin tests with allow_failures
---
.travis.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 4ad5c86..7c9edae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,9 @@ env:
- ORG_GRADLE_PROJECT_checksumPrint=true
matrix:
+ allow_failures:
+ # j-m-p does not seem to download all the dependencies: https://github.com/jmeter-maven-plugin/jmeter-maven-plugin/issues/187
+ - name: jmeter-maven-plugin tests
include:
- name: Tests with OpenJDK 8 + code coverage
jdk: openjdk8
@@ -61,7 +64,7 @@ matrix:
- name: jmeter-maven-plugin tests
jdk: openjdk8
script:
- - ./gradlew -PskipJavadoc publishToMavenLocal -Pjmeter.version=42.0
+ - ./gradlew -PskipJavadoc publishToMavenLocal -Pjmeter.version=42.0 -PchecksumIgnore
- cd ..
- git clone --depth 100 https://github.com/jmeter-maven-plugin/jmeter-maven-plugin.git
- cd jmeter-maven-plugin
[jmeter] 01/02: Remove explicit version from build.gradle.kts files
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 177678b770bbf036bbca4a11e7fbafec22361856
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sun Nov 10 13:28:38 2019 +0300
Remove explicit version from build.gradle.kts files
---
src/build.gradle.kts | 2 +-
src/components/build.gradle.kts | 4 ++--
src/functions/build.gradle.kts | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/build.gradle.kts b/src/build.gradle.kts
index 0885e9a..c4bc7ed 100644
--- a/src/build.gradle.kts
+++ b/src/build.gradle.kts
@@ -77,7 +77,7 @@ subprojects {
if (groovyUsed) {
testImplementation("org.spockframework:spock-core")
}
- testRuntimeOnly("cglib:cglib-nodep:3.2.9") {
+ testRuntimeOnly("cglib:cglib-nodep") {
because("""
org.spockframework.mock.CannotCreateMockException: Cannot create mock for
class org.apache.jmeter.report.processor.AbstractSummaryConsumer${'$'}SummaryInfo.
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 359d477..e40f563 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
api(project(":src:core"))
testCompile(project(":src:core", "testClasses"))
- api("org.apache-extras.beanshell:bsh:2.0b6") {
+ api("org.apache-extras.beanshell:bsh") {
because("""
BeanShell is not required for JMeter, however it is commonly used in the jmx scripts.
New scripts should refrain from using BeanShell though and migrate to Groovy or other
@@ -28,7 +28,7 @@ dependencies {
""".trimIndent())
}
- api("javax.mail:mail:1.5.0-b01") {
+ api("javax.mail:mail") {
exclude("javax.activation", "activation")
}
// There's no javax.activation:activation:1.2.0, so we use com.sun...
diff --git a/src/functions/build.gradle.kts b/src/functions/build.gradle.kts
index 1c345ef..b26ffcf 100644
--- a/src/functions/build.gradle.kts
+++ b/src/functions/build.gradle.kts
@@ -35,6 +35,6 @@ dependencies {
}
implementation("com.github.ben-manes.caffeine:caffeine")
implementation("oro:oro")
- testImplementation("org.hamcrest:hamcrest-core:1.3")
+ testImplementation("org.hamcrest:hamcrest-core")
testImplementation("org.exparity:hamcrest-date")
}