Skip to content

Commit 8390f53

Browse files
committed
Merge branch '4.1' into 4.0-master
2 parents 3273b8f + 3efca83 commit 8390f53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+10
-13
lines changed

marklogic-client-api/src/test/java/com/marklogic/client/test/FailedRequestTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static org.junit.Assert.assertEquals;
1919

2020
import org.junit.Test;
21+
import org.junit.Ignore;
2122
import org.slf4j.Logger;
2223
import org.slf4j.LoggerFactory;
2324

@@ -99,8 +100,8 @@ public void testFailedRequest()
99100

100101
}
101102

102-
103-
@Test
103+
// Test testErrorOnNonREST commented out because of Git issue #865
104+
@Ignore
104105
public void testErrorOnNonREST() throws ForbiddenUserException {
105106
DatabaseClient badClient = DatabaseClientFactory.newClient(Common.HOST,
106107
8001, new DigestAuthContext(Common.USER, Common.PASS));

marklogic-development-tools/build.gradle renamed to ml-development-tools/build.gradle

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,27 @@ dependencies {
3131
testCompileOnly gradleTestKit()
3232
}
3333

34-
task pluginJar(type: Jar) {
35-
version = '4.1'
34+
task mlDevelopmentToolsPlugin(type: Jar) {
35+
baseName = 'ml-development-tools'
3636
}
3737

3838
publishing {
3939
publications {
4040
main(MavenPublication) {
41-
artifact pluginJar
41+
artifact mlDevelopmentToolsPlugin
4242
}
4343
}
4444
}
4545

4646
pluginBundle {
47-
website = 'http://www.gradle.org/'
47+
website = 'https://github.com/marklogic/java-client-api'
4848
vcsUrl = '[email protected]:marklogic/java-client-api.git'
49-
description = 'ml-development-tools plugin for developing data services on MarkLogic'
50-
tags = ['marklogic', 'development tools', 'data services']
51-
5249
plugins {
53-
marklogicClientToolsPlugin {
50+
mlDevelopmentToolsPlugin {
5451
id = 'com.marklogic.ml-development-tools'
5552
displayName = 'ml-development-tools MarkLogic Data Service Tools'
56-
description = 'Gradle plugin for developing data services on MarkLogic'
53+
description = 'ml-development-tools plugin for developing data services on MarkLogic'
5754
tags = ['marklogic', 'development tools', 'data services']
58-
version = project.version
5955
}
6056
}
6157
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)