Skip to content

Commit 9a9faba

Browse files
authored
Merge pull request #775 from marklogic/feature/release-prep
MLE-22591 Bumped a couple dependencies and updated NOTICE
2 parents a4dc817 + a3882e2 commit 9a9faba

17 files changed

+112
-635
lines changed

NOTICE.txt

Lines changed: 96 additions & 450 deletions
Large diffs are not rendered by default.

ml-gradle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
api project(":ml-app-deployer")
1010

1111
// For tasks that need to fiddle with the filesystem.
12-
implementation "commons-io:commons-io:2.19.0"
12+
implementation "commons-io:commons-io:2.20.0"
1313

1414
// For UnitTestTask.
1515
compileOnly ("com.marklogic:marklogic-unit-test-client:1.5.0") {

ml-javaclient-util/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22
api 'com.marklogic:marklogic-client-api:7.2.0'
3-
api 'com.marklogic:marklogic-xcc:11.3.1'
3+
api 'com.marklogic:marklogic-xcc:12.0.0'
44

55
// API dependency as some Spring classes, like Resource, are used throughout this project.
66
api "org.springframework:spring-context:${springVersion}"

ml-javaclient-util/src/test/java/com/marklogic/client/ext/datamovement/AbstractDataMovementTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
/*
2-
* Copyright (c) 2023 MarkLogic Corporation
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
153
*/
164
package com.marklogic.client.ext.datamovement;
175

ml-javaclient-util/src/test/java/com/marklogic/client/ext/datamovement/UrisQueryQueryBatcherBuilderTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
/*
2-
* Copyright (c) 2023 MarkLogic Corporation
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
153
*/
164
package com.marklogic.client.ext.datamovement;
175

ml-javaclient-util/src/test/java/com/marklogic/client/ext/datamovement/job/DeleteCollectionsTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
/*
2-
* Copyright (c) 2023 MarkLogic Corporation
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
153
*/
164
package com.marklogic.client.ext.datamovement.job;
175

ml-javaclient-util/src/test/java/com/marklogic/client/ext/datamovement/job/DeleteTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
/*
2-
* Copyright (c) 2023 MarkLogic Corporation
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
153
*/
164
package com.marklogic.client.ext.datamovement.job;
175

ml-javaclient-util/src/test/java/com/marklogic/client/ext/datamovement/job/ExportBatchesToDirectoryTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
/*
2-
* Copyright (c) 2023 MarkLogic Corporation
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
153
*/
164
package com.marklogic.client.ext.datamovement.job;
175

ml-javaclient-util/src/test/java/com/marklogic/client/ext/datamovement/job/ExportBatchesToZipsTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
/*
2-
* Copyright (c) 2023 MarkLogic Corporation
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
153
*/
164
package com.marklogic.client.ext.datamovement.job;
175

ml-javaclient-util/src/test/java/com/marklogic/client/ext/datamovement/job/ExportDocumentsToFilesTest.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
/*
2-
* Copyright (c) 2023 MarkLogic Corporation
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
153
*/
164
package com.marklogic.client.ext.datamovement.job;
175

@@ -35,4 +23,3 @@ public void test() {
3523
assertTrue(new File(exportDir, SECOND_URI).exists());
3624
}
3725
}
38-

0 commit comments

Comments
 (0)