From 24236867804e74f3660e9076522de9bf7c29a99b Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Fri, 12 Jul 2024 23:50:24 +0200 Subject: [PATCH 01/57] pool manager: retry request on pool up Motivation: If a pool with the file is online and a tape copy available, then dCache will trigger stage and wait until file is restored on disk. However, if pool becomes available again, the stage request is not interrupted and client will wait for tape. Modification: Update request container 'onPoolUp' logic to retry the request if the file expected to be on that pool. Added unit test to validate the behavior. Result: pool selection succeeds then a pool with the file becomes online despite the on-going stage request. NOTE (1): the stage request is not interrupted NOTE (2): if newly enabled pool doesn't contains the expected file, then double stage is very likely. Target: master Acked-by: Lea Morschel Require-book: no Require-notes: yes (cherry picked from commit f945c3db9875fb5e322aa3f3ede97a229591be81) Signed-off-by: Tigran Mkrtchyan --- .../dcache/util/FileAttributesBuilder.java | 9 ++- .../poolManager/RequestContainerV5.java | 15 +++- .../poolManager/RequestContainerV5Test.java | 72 +++++++++++++++++++ 3 files changed, 94 insertions(+), 2 deletions(-) diff --git a/modules/dcache-vehicles/src/main/java/org/dcache/util/FileAttributesBuilder.java b/modules/dcache-vehicles/src/main/java/org/dcache/util/FileAttributesBuilder.java index d02e18a8aad..76b6d9976d4 100644 --- a/modules/dcache-vehicles/src/main/java/org/dcache/util/FileAttributesBuilder.java +++ b/modules/dcache-vehicles/src/main/java/org/dcache/util/FileAttributesBuilder.java @@ -1,7 +1,7 @@ /* * dCache - http://www.dcache.org/ * - * Copyright (C) 2021-2022 Deutsches Elektronen-Synchrotron + * Copyright (C) 2021-2024 Deutsches Elektronen-Synchrotron * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -20,6 +20,8 @@ import diskCacheV111.util.PnfsId; import diskCacheV111.vehicles.StorageInfo; + +import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -85,6 +87,11 @@ public FileAttributesBuilder withChecksum(Checksum checksum) { return this; } + public FileAttributesBuilder withLocations(String...locations) { + _attributes.setLocations(Arrays.asList(locations)); + return this; + } + public FileAttributes build() { if (!_checksums.isEmpty()) { _attributes.setChecksums(_checksums); diff --git a/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java b/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java index eea738a91d0..c489b6c511d 100644 --- a/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java +++ b/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java @@ -78,6 +78,7 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; import org.dcache.cells.CellStub; +import org.dcache.namespace.FileAttribute; import org.dcache.poolmanager.CostException; import org.dcache.poolmanager.Partition; import org.dcache.poolmanager.PartitionManager; @@ -363,10 +364,12 @@ public void poolStatusChanged(String poolName, int poolStatus) { * * in this construction we will fall down to next case */ - if (rph.getPoolCandidate().equals(POOL_UNKNOWN_STRING)) { + if (rph.getPoolCandidate().equals(POOL_UNKNOWN_STRING) || rph.expectedOnPool(poolName)) { LOGGER.info("Restore Manager : retrying : {}", rph); rph.retry(); } + + // fall through to retry requests scheduled on that pool case PoolStatusChangedMessage.DOWN: /* * if pool is down, re-try all request scheduled to this @@ -1039,6 +1042,16 @@ public String getPoolCandidate() { } } + /** + * Returns true if file is expected to be on specified pool. + * @param poolName pool name to check. + * @return true if file is expected to be on specified pool. + */ + public boolean expectedOnPool(String poolName) { + return _fileAttributes.isDefined(FileAttribute.LOCATIONS) + && _fileAttributes.getLocations().contains(poolName); + } + private String getPoolCandidateState() { if (_stageCandidate.isPresent()) { return _stageCandidate.get().name(); diff --git a/modules/dcache/src/test/java/diskCacheV111/poolManager/RequestContainerV5Test.java b/modules/dcache/src/test/java/diskCacheV111/poolManager/RequestContainerV5Test.java index ffe06bfcc7c..58c1f738470 100644 --- a/modules/dcache/src/test/java/diskCacheV111/poolManager/RequestContainerV5Test.java +++ b/modules/dcache/src/test/java/diskCacheV111/poolManager/RequestContainerV5Test.java @@ -3337,6 +3337,73 @@ public void shouldCancelStageRequestOnFail() throws Exception { is("rh kill 80D1B8B90CED30430608C58002811B3285FC")); } + @Test + public void shouldRetryOnPoolUpEvenForStage() throws Exception { + var stagePool = aPool("stage-pool@dCacheDomain"); + given(aPartitionManager().withDefault(aPartition().withStageAllowed(true))); + given(aPoolSelectionUnit().withNetUnit("all-net", "192.168.1.1") + .withProtocolUnit("HTTP", "http/1")); + given(aPoolMonitor().thatReturns(aPoolSelectorThat() + .onReadThrows(aFileNotInCacheException()) + .onStageSelects(stagePool))); + + given(aContainer("PoolManager@dCacheDomain").thatDoesNotSendHitMessages()); + + whenReceiving(aReadRequest() + .by(ROOT) + .forFile("80D1B8B90CED30430608C58002811B3285FC") + .withBillingPath("/public/test") + .withTransferPath("/uploads/50/test") + .withFileAttributes(fileAttributes().withSize(10, KiB) + .withLocations("some-pool") + .withStorageInfo(aStorageInfo().withLocation("osm://RZ1/bfid1"))) + .withProtocolInfo(aProtocolInfo().withProtocol("http") + .withMajorVersion(1).withIPAddress("192.168.1.1"))); + + container.setPoolMonitor(poolMonitor); + whenReceiving(aPoolStatusChange().thatPool("some-pool").isUp()); + + var reply = replySentWith(endpoint); + + then(reply).should().setFailed(eq(10021), any()); + then(reply).should().setContext(eq(0), any()); + + then(endpoint).shouldHaveNoMoreInteractions(); + } + + @Test + public void shouldIgnoreOnRandomPoolUp() throws Exception { + var stagePool = aPool("stage-pool@dCacheDomain"); + given(aPartitionManager().withDefault(aPartition().withStageAllowed(true))); + given(aPoolSelectionUnit().withNetUnit("all-net", "192.168.1.1") + .withProtocolUnit("HTTP", "http/1")); + given(aPoolMonitor().thatReturns(aPoolSelectorThat() + .onReadThrows(aFileNotInCacheException()) + .onStageSelects(stagePool))); + + given(aContainer("PoolManager@dCacheDomain").thatDoesNotSendHitMessages()); + + whenReceiving(aReadRequest() + .by(ROOT) + .forFile("80D1B8B90CED30430608C58002811B3285FC") + .withBillingPath("/public/test") + .withTransferPath("/uploads/50/test") + .withFileAttributes(fileAttributes().withSize(10, KiB) + .withLocations("some-pool") + .withStorageInfo(aStorageInfo().withLocation("osm://RZ1/bfid1"))) + .withProtocolInfo(aProtocolInfo().withProtocol("http") + .withMajorVersion(1).withIPAddress("192.168.1.1"))); + + container.setPoolMonitor(poolMonitor); + whenReceiving(aPoolStatusChange().thatPool("random-pool").isUp()); + + var message = stageSentWith(endpoint); + + // the only message we have is starting stage + assertThat(message.isReply(), is(false)); + then(endpoint).shouldHaveNoMoreInteractions(); + } + private void given(ContainerBuilder builder) { container = builder.build(); } @@ -3406,6 +3473,11 @@ private static PoolMgrSelectReadPoolMsg replySentWith(CellEndpoint endpointUsed) return (PoolMgrSelectReadPoolMsg) envelope.getMessageObject(); } + private static PoolFetchFileMessage stageSentWith(CellEndpoint endpointUsed) { + var envelope = envelopeSentWith(endpointUsed); + return (PoolFetchFileMessage) envelope.getMessageObject(); + } + private static List allRepliesSentWith(CellEndpoint endpointUsed) { var envelopeArg = ArgumentCaptor.forClass(CellMessage.class); verify(endpointUsed, Mockito.atLeastOnce()).sendMessage(envelopeArg.capture()); From 1e916a95a98e6d7ede023d4b51250d5d87a7340c Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Fri, 27 Sep 2024 11:15:50 +0200 Subject: [PATCH 02/57] dcache: reject access to files with nearline QoS Motivation: If file has QoS policy "HSM-only" then dCache should reject the access to the file, even if file is still available on disk (as transition might take some time). Modification: - Update QoS policy engine to reflect policy in the namespace attributes - Update Transfer to request policy state (as an indicate of applied policy) and reject read transfers if access latency is nearline. Result: dCache behavior compliant with selected QoS policy. Acked-by: Lea Morschel Acked-by: Dmitry Litvintsev Target: master Require-book: no Require-notes: yes (cherry picked from commit 1a3c12e8b6609b4c0350ca5e6a90c1e25dfa7d4d) Signed-off-by: Tigran Mkrtchyan --- .../engine/provider/PolicyBasedQoSProvider.java | 17 +++-------------- .../src/main/java/org/dcache/util/Transfer.java | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules/dcache-qos/src/main/java/org/dcache/qos/services/engine/provider/PolicyBasedQoSProvider.java b/modules/dcache-qos/src/main/java/org/dcache/qos/services/engine/provider/PolicyBasedQoSProvider.java index ca53ee80a6f..23ff30157f0 100644 --- a/modules/dcache-qos/src/main/java/org/dcache/qos/services/engine/provider/PolicyBasedQoSProvider.java +++ b/modules/dcache-qos/src/main/java/org/dcache/qos/services/engine/provider/PolicyBasedQoSProvider.java @@ -203,25 +203,14 @@ public void handleModifiedRequirements(FileQoSRequirements newRequirements, Subj FileAttributes modifiedAttributes = new FileAttributes(); - if (currentAttributes.isDefined(FileAttribute.QOS_POLICY) - && !newRequirements.hasRequiredQoSPolicy()) { - modifiedAttributes.setQosPolicy(null); // remove the policy from the stored state - modifyRequirements(pnfsId, currentAttributes, modifiedAttributes, newRequirements, - subject); - return; - } - if (newRequirements.hasRequiredQoSPolicy()) { modifiedAttributes.setQosPolicy(newRequirements.getRequiredQoSPolicy()); modifiedAttributes.setQosState(newRequirements.getRequiredQoSStateIndex()); - } - - if (canModifyQos(subject, isEnableRoles(), currentAttributes)) { - pnfsHandler().setFileAttributes(pnfsId, modifiedAttributes); } else { - throw new PermissionDeniedCacheException("User does not have permissions to set " - + "attributes for " + newRequirements.getPnfsId()); + modifiedAttributes.setQosPolicy(null); // remove the policy from the stored state } + + modifyRequirements(pnfsId, currentAttributes, modifiedAttributes, newRequirements, subject); } @Required diff --git a/modules/dcache/src/main/java/org/dcache/util/Transfer.java b/modules/dcache/src/main/java/org/dcache/util/Transfer.java index 5e8f85de462..bc477bb47e3 100644 --- a/modules/dcache/src/main/java/org/dcache/util/Transfer.java +++ b/modules/dcache/src/main/java/org/dcache/util/Transfer.java @@ -28,6 +28,7 @@ import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; import diskCacheV111.poolManager.RequestContainerV5.RequestState; +import diskCacheV111.util.AccessLatency; import diskCacheV111.util.CacheException; import diskCacheV111.util.CheckStagePermission; import diskCacheV111.util.FileExistsCacheException; @@ -750,7 +751,7 @@ public ListenableFuture readNameSpaceEntryAsync(boolean allowWrite) { } private ListenableFuture readNameSpaceEntryAsync(boolean allowWrite, long timeout) { - Set attr = EnumSet.of(PNFSID, TYPE, STORAGEINFO, SIZE, CREATION_TIME); + Set attr = EnumSet.of(PNFSID, TYPE, STORAGEINFO, SIZE, CREATION_TIME, QOS_STATE); attr.addAll(_additionalAttributes); attr.addAll(PoolMgrSelectReadPoolMsg.getRequiredAttributes()); Set mask; @@ -925,13 +926,22 @@ protected synchronized void setReadPoolSelectionContext( */ public ListenableFuture selectPoolAsync(long timeout) { + FileAttributes fileAttributes = getFileAttributes(); + + // if this is a read, and the file has QoS policy nearline, + // then read is forbidden independent of is there cached copy or not. + if (!isWrite() && fileAttributes.isDefined(QOS_STATE) && + fileAttributes.getAccessLatency().equals(AccessLatency.NEARLINE)) { + return immediateFailedFuture( + new PermissionDeniedCacheException( + "Read is forbidden for file with QoS policy nearline")); + } + if (getPool() != null) { // we have a valid preselected pool. Let use it as long as clearPoolSelection is not called. return immediateFuture(null); } - FileAttributes fileAttributes = getFileAttributes(); - ProtocolInfo protocolInfo = getProtocolInfoForPoolManager(); ListenableFuture reply; if (isWrite()) { From 9d3eb6e10815ad9c992ffeb64e4a3ee9b4a32510 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 21:16:27 +0000 Subject: [PATCH 03/57] build(deps): bump org.eclipse.jetty:jetty-servlets Bumps org.eclipse.jetty:jetty-servlets from 9.4.52.v20230823 to 9.4.54.v20240208. --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-servlets dependency-type: direct:production ... Signed-off-by: dependabot[bot] (cherry picked from commit c18934e22d973923c725ed6c99b096be78466739) Signed-off-by: Tigran Mkrtchyan --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a01f1a21e82..4c7583c184f 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.9.21.2 6.6.0 2.12.0 - 9.4.52.v20230823 + 9.4.54.v20240208 4.6.0 2.41 3.0.0 From 53173e10a8b40daf1fdf2734eaf743f62067d648 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 08:19:17 +0000 Subject: [PATCH 04/57] build(deps): bump org.eclipse.jetty:jetty-server Bumps org.eclipse.jetty:jetty-server from 9.4.52.v20230823 to 9.4.55.v20240627. --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production ... Signed-off-by: dependabot[bot] (cherry picked from commit 8254b6727b7b8c39986165465e6fcb39e14bf2eb) Signed-off-by: Tigran Mkrtchyan --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c7583c184f..b745919450e 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.9.21.2 6.6.0 2.12.0 - 9.4.54.v20240208 + 9.4.55.v20240627 4.6.0 2.41 3.0.0 From e334fb04c09f5167ccf508c43a8b368a0dcaca02 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Thu, 18 Jul 2024 17:32:09 +0200 Subject: [PATCH 05/57] http(old): modernize color palette Motivation: match dcache.org page colors Modification: pulled colors into css variables synced colors across pages fixed html generation Result: new look-and-feel Acked-by: Lea Morschel Target: master, 10.2 Require-book: no Require-notes: yes (cherry picked from commit 7e2040ecb81a24da4b5b7425d6c8eed213907013) Signed-off-by: Tigran Mkrtchyan --- .../poolManager/HttpPoolMgrEngineV3.java | 32 ++-- .../java/diskCacheV111/util/HTMLWriter.java | 2 +- .../share/httpd/static/images/dCache-logo.svg | 131 ++++++++++++++ .../httpd/static/images/eagleredtrans.gif | Bin 241 -> 0 bytes skel/share/httpd/static/index.html | 68 +++---- skel/share/httpd/static/styles/billing.css | 12 +- skel/share/httpd/static/styles/common.css | 171 ++++++++++++++++-- skel/share/httpd/static/styles/poolinfo.css | 74 +------- skel/share/httpd/static/styles/queueInfo.css | 16 +- .../httpd/static/styles/restoreHandler.css | 6 - skel/share/httpd/static/styles/usageInfo.css | 51 ------ 11 files changed, 343 insertions(+), 220 deletions(-) create mode 100644 skel/share/httpd/static/images/dCache-logo.svg delete mode 100644 skel/share/httpd/static/images/eagleredtrans.gif diff --git a/modules/dcache/src/main/java/diskCacheV111/poolManager/HttpPoolMgrEngineV3.java b/modules/dcache/src/main/java/diskCacheV111/poolManager/HttpPoolMgrEngineV3.java index 77162b1f014..6291d52bee7 100644 --- a/modules/dcache/src/main/java/diskCacheV111/poolManager/HttpPoolMgrEngineV3.java +++ b/modules/dcache/src/main/java/diskCacheV111/poolManager/HttpPoolMgrEngineV3.java @@ -333,7 +333,7 @@ private void printMenu(PrintWriter pw, String sort, String grep) { "Path", "path" }; pw.println("
"); - pw.println("
"); pw.println(" "); pw.println("
"); @@ -364,6 +364,7 @@ private void printMenu(PrintWriter pw, String sort, String grep) { } + // FIXME: REMOVE! private void printCssFile(PrintWriter pw, String filename) { if (filename.equals("test.html")) { // @@ -394,6 +395,7 @@ private void printCssFile(PrintWriter pw, String filename) { } } + // FIXME: REMOVE! private void printInternalCssFile(PrintWriter pw) { pw.println("body { background-color:orange; }"); pw.println( @@ -548,9 +550,14 @@ private void printConfigurationHeader(PrintWriter pw) { pw.println(""); pw.println(""); + pw.println(""); + pw.println(""); pw.println("
"); - pw.println(""); - } private void printConfigurationPages(PrintWriter pw, String[] urlItems, HttpRequest request) @@ -704,7 +711,7 @@ private void printParameterEntry(PrintWriter pw, Partition p) { int column = 0; int maxColumn = 2; - pw.println("
"); + pw.println("
"); pw.print(""); for (int l = 0; l < (maxColumn + 1); l++) { @@ -991,18 +998,11 @@ private void showRestoreInfo(HTMLWriter html, } private void printPoolManagerHeader(PrintWriter pw, String title) { - pw.println("
"); - pw.println("
"); - pw.println(""); - pw.println("
Birds Home"); - pw.println("		"); if (title != null) { pw.println("

" + title + "

"); } else { pw.println("

Pool Manager Database V3

"); } - pw.println("
"); - } private void showDirectory(PrintWriter pw) { @@ -1241,7 +1241,7 @@ private void queryPool(PrintWriter pw, String poolName) boolean enabled = (Boolean) o[3]; boolean rdOnly = (Boolean) o[5]; long active = (Long) o[4]; - pw.println(""); + pw.println("
"); pw.print(""); @@ -1277,7 +1277,7 @@ private void queryUnit(PrintWriter pw, String unitName) String type = o[1].toString(); Object[] groupList = (Object[]) o[2]; - pw.println("
Enabled : "); pw.print(enabled ? "Yes" : "No"); pw.println("
"); + pw.println("
"); pw.print(""); @@ -1367,8 +1367,8 @@ private void queryLinkList(PrintWriter pw) pw.print(""); pw.print(""); pw.println(""); - int row = 0; + int row = 0; for (LinkProperties lp : list) { pw.println(""); printLinkPropertyRow(pw, lp); @@ -1528,7 +1528,7 @@ private void queryUnitGroup(PrintWriter pw, String groupName) Object[] unitList = (Object[]) o[1]; Object[] linkList = (Object[]) o[2]; - pw.println("
Selection Unit : "); pw.print(unitName); pw.println("
ReadWriteCacheP2p
"); + pw.println("
"); pw.print(""); @@ -1560,7 +1560,7 @@ private void queryPoolGroup(PrintWriter pw, String groupName) Object[] poolList = (Object[]) o[1]; Object[] linkList = (Object[]) o[2]; - pw.println("
Unit Group : "); pw.print(groupName); pw.println("
"); + pw.println("
"); pw.print(""); diff --git a/modules/dcache/src/main/java/diskCacheV111/util/HTMLWriter.java b/modules/dcache/src/main/java/diskCacheV111/util/HTMLWriter.java index b105ea61356..7f97ea9a559 100644 --- a/modules/dcache/src/main/java/diskCacheV111/util/HTMLWriter.java +++ b/modules/dcache/src/main/java/diskCacheV111/util/HTMLWriter.java @@ -70,7 +70,7 @@ public void addHeader(String css, String title) { println(""); println(""); diff --git a/skel/share/httpd/static/images/dCache-logo.svg b/skel/share/httpd/static/images/dCache-logo.svg new file mode 100644 index 00000000000..868008b704d --- /dev/null +++ b/skel/share/httpd/static/images/dCache-logo.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/skel/share/httpd/static/images/eagleredtrans.gif b/skel/share/httpd/static/images/eagleredtrans.gif deleted file mode 100644 index ec548cbc854a09f19af8a5f6c14df0744eca23fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmVf0Du4h|NsC008t_N1OWg5001li0000%05Jdn0?34qsmtvT zqnxzbi?iM-cn&h&NQNPamgbhW-a*?NFKud?g;8oQs6QZycY$O2e`(?;2Gsj dCache service - + - +

-

dCache service

+

dCache service

+


-
Pool Group : "); pw.print(groupName); pw.println("
+
-
+

Quick Finder

- +
- - - - - - - - -
+

Cell Services

 +

Pool Usage

 +

Tape Transfer Queue

 +

Detailed Tape Transfer Queue
+

Pool Transfer Queues

 +

Action Log

 + + @@ -79,10 +59,10 @@

History
+

Status

- +
-

Cell Services

@@ -112,10 +92,10 @@

Pool Groups

 +

Various Queues

- +

Tape Transfer Queue

@@ -146,10 +126,10 @@

Active Transfers  +

Statistics Module not installed

- +
-

Statistics

@@ -163,10 +143,10 @@

Statistics

 +

Configuration/Setup

- +
-

Pool Selection Setup

@@ -181,7 +161,7 @@

Pool Selection Setup

+

dCache, the Book

diff --git a/skel/share/httpd/static/styles/billing.css b/skel/share/httpd/static/styles/billing.css index b499e00a23d..2b7bd1ca710 100644 --- a/skel/share/httpd/static/styles/billing.css +++ b/skel/share/httpd/static/styles/billing.css @@ -1,7 +1,3 @@ -#bird_small -{ - float: left; -} #bird_large { @@ -11,7 +7,7 @@ h1, h2 { text-align: center; - color: blue; + color: #3C3633; } table @@ -23,13 +19,13 @@ table tr.total th, tr.total td { - background: #0000FF; - color: white; + background: #747264; + color: #EEEDEB; } a { - color: white; + color: #EEEDEB; } .action diff --git a/skel/share/httpd/static/styles/common.css b/skel/share/httpd/static/styles/common.css index a8d6506cb43..2d20ba0b29f 100644 --- a/skel/share/httpd/static/styles/common.css +++ b/skel/share/httpd/static/styles/common.css @@ -1,23 +1,62 @@ -body -{ +:root { + --v-page-background-color: #f1efed; + --v-page-text-color: #222831; + --v-table-border-color: rgba(64, 60, 56, 0.5); + --v-table-header-background-color: #403c38; + --v-tr-odd-background-color: #e9e9e9; + --v-tr-even-background-color: #f6f6f6; + --v-page-header-background-color: #403c38; + --v-page-header-text-color: #ffffff; + --v-page-header-separator-color: #e3513c; + + --v-index-container-background-color: #e9e9e9; + + --v-link-hover-color: #e3513c; + + --v-space-precious: #F28585; + --v-space-sticky: #FFA447; + --v-space-cached: #FFFC9B; + --v-space-free: #B7E5B4; + +} + +#index-page +{ background: url("/images/bg.svg"); + background-color: var(--v-page-background-color); + color: var(--v-page-text-color); + margin: 0px; } -img -{ + +body +{ + /*background: url("/images/bg.svg"); */ + background-color: var(--v-page-background-color); + color: var(--v-page-text-color); + margin: 0px; +} + +img +{ border: 0; } #bird_small { - color: red; + color: var(--v-page-header-text-color); + background-color: var(--v-page-header-background-color); + padding: 1rem; + border-bottom: 4px solid var(--v-page-header-separator-color); } #bird_large { text-align: center; + display: none; } + #main { margin-left: auto; @@ -30,29 +69,77 @@ img margin-top: 200px; } + +#index-page-table td +{ + text-align: left!important; + padding-left: 1rem; + padding-right: 1rem; +} + +#index-page-table tr +{ + height: 1rem; +} + +#index-container td +{ + background-color: var(--v-index-container-background-color); + a:link { color: var(--v-page-text-color); }; + a:focus { color: var(--v-link-hover-color); }; + a:visited { color: var(--v-page-text-color); }; + a:hover { color: var(--v-link-hover-color); }; +} + +#index-page-table h1 +{ + text-align: center!important; + padding-left: 1rem; + padding-right: 1rem; +} + +#index-page-table +{ + width: 90%; +} + +table, tr, th, td { + border-collapse: collapse; + border: 0px solid; + height: 3rem; +} + table -{ +{ + border-collapse: separate; border-spacing: 0; - border-collapse: collapse; + outline: 1px solid var(--v-table-border-color); + overflow: hidden; width: 100%; -} + color: var(--v-page-text-color); + /*margin: 0 0 40px 0;*/ +}; + td, th { - padding: 4px; - border: 1px solid gray; + padding: .5em 1em; + border: 0px solid gray; + margin-bottom: 10px; + padding: 0; + height: 6px; } th { text-align: center; - background: #115259; - color: white; + background: var(--v-table-header-background-color); + color: #ffffff; } th > a { - color: white; + color: #ffffff; text-decoration: none; } @@ -63,12 +150,66 @@ td tr { - background: #bebebe; + background: var(--v-tr-even-background-color); } tr.odd { - background: #efefef; + background: var(--v-tr-odd-background-color); +} + + +/* used to display pool/poolgroup usage bar and legend*/ + +span.layout_precious +{ + color: var(--v-space-precious); +} + +span.layout_sticky +{ + color: var(--v-space-sticky); +} + +span.layout_cached +{ + color: var(--v-space-cached); } +span.layout_free +{ + color: var(--v-space-free); +} + +div.layout_precious +{ + float: left; + background: var(--v-space-precious); + height: 10px; +} +div.layout_sticky +{ + float: left; + background: var(--v-space-sticky); + height: 10px; +} + +div.layout_cached +{ + float: left; + background: var(--v-space-cached); + height: 10px; +} + +div.layout_free +{ + float: left; + background: var(--v-space-free); + height: 10px; +} + +.errorcode, .errormessage +{ + color: red; +} diff --git a/skel/share/httpd/static/styles/poolinfo.css b/skel/share/httpd/static/styles/poolinfo.css index 833f47d6c27..2e73dc15cb1 100644 --- a/skel/share/httpd/static/styles/poolinfo.css +++ b/skel/share/httpd/static/styles/poolinfo.css @@ -1,8 +1,3 @@ -#bird_small -{ - float: left; -} - #bird_large { display: none; @@ -55,28 +50,6 @@ table.menu .active a:link color: red; } -/* Pool info */ - -span.layout_precious -{ - color: red; -} - -span.layout_sticky -{ - color: magenta; -} - -span.layout_cached -{ - color: green; -} - -span.layout_free -{ - color: yellow; -} - td.layout > div { margin-left: auto; @@ -85,58 +58,21 @@ td.layout > div height: 10px; } -div.layout_precious -{ - float: left; - background: red; - height: 10px; -} - -div.layout_sticky -{ - float: left; - background: #ff00ff; - height: 10px; -} - -div.layout_cached -{ - float: left; - background: green; - height: 10px; -} - -div.layout_free -{ - float: left; - background: yellow; - height: 10px; -} - -.errorcode, .errormessage -{ - color: red; -} - /* Queue info */ th { font-weight: normal; } -th.active, th.max -{ - background: #0099FF; -} - -th.queued +th.active, th.max, th.queued { - background: #00bbFF; + background: #E0CCBE; + color: #3C3633; } td.idle { - color: #008080; + color: #3C3633; } td.queued @@ -146,6 +82,6 @@ td.queued tr.total th, tr.total td { - background: #0000FF; + background: #747264; color: white; } diff --git a/skel/share/httpd/static/styles/queueInfo.css b/skel/share/httpd/static/styles/queueInfo.css index c9f073c44e1..b6528ebd666 100644 --- a/skel/share/httpd/static/styles/queueInfo.css +++ b/skel/share/httpd/static/styles/queueInfo.css @@ -3,19 +3,15 @@ th font-weight: normal; } -th.active, th.max +th.active, th.max, th.queued { - background: #0099FF; -} - -th.queued -{ - background: #00bbFF; + background: #FFA27F; + color: #3C3633; } td.idle { - color: #008080; + color: #3C3633; } td.queued @@ -25,6 +21,6 @@ td.queued tr.total th, tr.total td { - background: #0000FF; - color: white; + background: #FFE8C5; + color: #3C3633; } diff --git a/skel/share/httpd/static/styles/restoreHandler.css b/skel/share/httpd/static/styles/restoreHandler.css index b0f11b00734..732eca6cbd9 100644 --- a/skel/share/httpd/static/styles/restoreHandler.css +++ b/skel/share/httpd/static/styles/restoreHandler.css @@ -1,8 +1,3 @@ -#bird_small -{ - float: left; -} - #bird_large { display: none; @@ -16,7 +11,6 @@ h1, h2 { text-align: center; - color: blue; } h1 diff --git a/skel/share/httpd/static/styles/usageInfo.css b/skel/share/httpd/static/styles/usageInfo.css index 1cadfd5e674..c52936a9b42 100644 --- a/skel/share/httpd/static/styles/usageInfo.css +++ b/skel/share/httpd/static/styles/usageInfo.css @@ -1,22 +1,4 @@ -span.layout_precious -{ - color: red; -} - -span.layout_sticky -{ - color: magenta; -} - -span.layout_cached -{ - color: green; -} -span.layout_free -{ - color: yellow; -} td.layout > div { @@ -25,36 +7,3 @@ td.layout > div width: 300px; height: 10px; } - -div.layout_precious -{ - float: left; - background: red; - height: 10px; -} - -div.layout_sticky -{ - float: left; - background: #ff00ff; - height: 10px; -} - -div.layout_cached -{ - float: left; - background: green; - height: 10px; -} - -div.layout_free -{ - float: left; - background: yellow; - height: 10px; -} - -.errorcode, .errormessage -{ - color: red; -} From 9f6b619b6b972c4c3e92f8a5b64e0669ba73b498 Mon Sep 17 00:00:00 2001 From: lemora Date: Thu, 17 Oct 2024 12:06:45 +0200 Subject: [PATCH 06/57] [maven-release-plugin] prepare release 10.2.0 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 3fc46bd9257..016880a3fe2 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.0-SNAPSHOT + 10.2.0 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 4c5d7da5752..1c0d1daae89 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 5014bf8821b..f1dafa85912 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.0-SNAPSHOT + 10.2.0 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index a16db92649c..67a0c1e57d2 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.0-SNAPSHOT + 10.2.0 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index f01342a6acf..6a124cde2d0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index d9d3522f2df..c3b79b3745d 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 98da2aafd26..5075e41afbe 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 40d77ad87fb..5e63bb99575 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 703eba89e64..865f0efde95 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 56f28b23ab2..17c3c86282c 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index a3390ba4d9f..59b57dcf385 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 564ec308c0e..4c84ff73068 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 0b994ef2bff..d6e676e6eee 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 8c95c12e865..8688b173d31 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 7bb64e0a99b..61b78b993a4 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 38c976663d2..1dbc876ecb3 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 582709cd1cd..aa234e1c913 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index bf466fa01c7..add91f06d27 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index ebb45e0549f..180731c7b29 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 41d4e12ec1d..f5ae22f1aa1 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 0ea49488ffe..b95d0bbcc4c 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 12c6560b3ec..ee308f177f3 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 72a9ff65901..2022824a9f7 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 21754ba7afc..852e88f313c 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index a13c74ad053..e883e01c6f6 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 490dbd8a0af..2908efb022d 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 6c0ea76a9d8..2401e07b8ed 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index be10a3a0f3f..34705fa013b 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 0598a92c73a..fa3a65bb5f6 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index cdb95796cfd..c04ad599601 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 5957306e367..627e1f6b783 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 223038e120b..c64d3793a9c 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 1b7eb2a8f2d..3709437f51e 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 996a035ec49..96a347c92e3 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index eee421a9fac..ba6317ee67f 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.0-SNAPSHOT + 10.2.0 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 7823e8bdaf9..4c600750736 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index e2291e2b7e3..6f213e73b5f 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 4c346a8e3a2..78722c573fd 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 2b818848801..e192af54ac4 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index 242d92ba2b5..b47990983a1 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index be93b6931ba..3c9633c12da 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 40a3677f519..59fa06e7bc3 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index f5eed4793a7..85f016edd16 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 8d7baa3b10f..ddbed95b543 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 5094cc23976..91b14d3a207 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 77764189f29..6eb58446076 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 7fd512a857c..459bdb244f1 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 297a8a00455..486000865c4 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 247bfe7c28c..79a668e31db 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 8feea7ff1ac..aabfbf1583c 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index d746661ec2a..b6e33957fbf 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 5075e6283a8..030aaa1a936 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 1ae86bf85b2..f333b998ab4 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 52a164f280e..b32d79e47a0 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.0-SNAPSHOT + 10.2.0 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 1a186a24f71..a3106c84061 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 02b34958d96..cacbd341dfc 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index e5029aad751..288b548c6e3 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 92b2e4ad021..eb3eceac865 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 9fc4a2733e0..833c16a121e 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.0-SNAPSHOT + 10.2.0 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index b856d0c97d3..7b9fd1b5a2c 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.0-SNAPSHOT + 10.2.0 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 108e4e3d5d1..4eaabc84394 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.0-SNAPSHOT + 10.2.0 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index acdb8be9ba1..6a1a4a00fc4 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.0-SNAPSHOT + 10.2.0 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 76e6e02a016..9f3bff2abf3 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.0-SNAPSHOT + 10.2.0 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 3eda2e1bce1..56b279e26c8 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0-SNAPSHOT + 10.2.0 plugins diff --git a/pom.xml b/pom.xml index b745919450e..d21aa690e4e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.0-SNAPSHOT + 10.2.0 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.0 From 2aa172f661053c19b6d2cfedfde856514461bd94 Mon Sep 17 00:00:00 2001 From: lemora Date: Thu, 17 Oct 2024 12:06:49 +0200 Subject: [PATCH 07/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 016880a3fe2..aab1e65dbeb 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.0 + 10.2.1-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 1c0d1daae89..13596a8d067 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index f1dafa85912..17899355746 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.0 + 10.2.1-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 67a0c1e57d2..8d58c7bef35 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.0 + 10.2.1-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 6a124cde2d0..775179840e9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index c3b79b3745d..54c5ac9f515 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 5075e41afbe..0e40aad7927 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 5e63bb99575..ed02dfb2c2d 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 865f0efde95..e18962cfac0 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 17c3c86282c..fbbe44cfaeb 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 59b57dcf385..f9b1c63cebc 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 4c84ff73068..beaaecaf2a8 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index d6e676e6eee..ad722e08095 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 8688b173d31..d17fc7b8b07 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 61b78b993a4..2de7211c19a 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 1dbc876ecb3..90445243fc6 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index aa234e1c913..38bbb552560 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index add91f06d27..c34f0a02051 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 180731c7b29..3d506080e01 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index f5ae22f1aa1..398358835c9 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index b95d0bbcc4c..e93114c1314 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index ee308f177f3..ef28ff18064 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 2022824a9f7..e1732623864 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 852e88f313c..6b12c3247fc 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index e883e01c6f6..25896c62bcd 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 2908efb022d..9e03c8092a1 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 2401e07b8ed..aa81e8eb415 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 34705fa013b..b88f873d270 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index fa3a65bb5f6..c6821cf2b96 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index c04ad599601..07ed88854a7 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 627e1f6b783..24bac4c73dd 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index c64d3793a9c..b8c66353702 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 3709437f51e..60e4df41c2d 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 96a347c92e3..9ee6fa367c7 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index ba6317ee67f..601ea5b4122 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.0 + 10.2.1-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 4c600750736..f7369234b59 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 6f213e73b5f..1b04a7d2003 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 78722c573fd..51612ecaebb 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index e192af54ac4..12584292f86 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index b47990983a1..ca8dc6d21e8 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 3c9633c12da..aba74763f53 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 59fa06e7bc3..464550e4b6d 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 85f016edd16..9d9f1272934 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index ddbed95b543..e2ae4feeed3 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 91b14d3a207..cb4458a0fcb 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 6eb58446076..8867ed174ff 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 459bdb244f1..2bb3adaeab8 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 486000865c4..c74f41bd22b 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 79a668e31db..f8103e8ebf4 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index aabfbf1583c..d30e93f79cd 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index b6e33957fbf..17ec7e2ff57 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 030aaa1a936..6a081473fd5 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index f333b998ab4..068cec9dd16 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index b32d79e47a0..8a576752c60 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.0 + 10.2.1-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index a3106c84061..9a348155e74 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index cacbd341dfc..40c819b4227 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 288b548c6e3..01470119719 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index eb3eceac865..b3e746cc62b 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 833c16a121e..9ced8bb3402 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.0 + 10.2.1-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 7b9fd1b5a2c..6059d059b1f 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.0 + 10.2.1-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 4eaabc84394..3660e20976f 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.0 + 10.2.1-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 6a1a4a00fc4..7065fa01290 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.0 + 10.2.1-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 9f3bff2abf3..43dc5a66807 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.0 + 10.2.1-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 56b279e26c8..42d12b70031 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.0 + 10.2.1-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index d21aa690e4e..42358e0cef7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.0 + 10.2.1-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.0 + 10.2 From 93c5074d95c58547a3effa3b39b6c62fa63e8e1a Mon Sep 17 00:00:00 2001 From: Dmitry Litvintsev Date: Mon, 28 Oct 2024 10:11:11 -0500 Subject: [PATCH 08/57] xroot: handle haproxy and checksum command Motivation: ---------- When using xrootd doors behind an HAProxy w/ `xrootd.enable.proxy-protocol=true` it has been discovered that ``` xrdcp --cksum adler32: ``` hangs after upload has completed and then eventually fails after a timeout. This is due to xrootd door repoting actual door address to the client. Modification: ------------- Return destination address (that is haproxy address) if `xrootd.enable.proxy-protocol=true` is set. Result: ------- ``` xrdcp --cksum adler32: ``` works as expected (and likely many other similar commands) Target: trunk Request: 10.* Request: 9.2 Patch: https://rb.dcache.org/r/14338/ Acked-by: Tigran Require-book: no Require-notes: yes Signed-off-by: Dmitry Litvintsev (cherry picked from commit e98ab942648f5b9e1eda4e1c08c3b7fe4588b08c) --- .../org/dcache/xrootd/door/NettyXrootdServer.java | 4 +++- .../dcache/xrootd/door/XrootdRedirectHandler.java | 15 +++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/NettyXrootdServer.java b/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/NettyXrootdServer.java index d0be41298ad..5bace62290a 100644 --- a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/NettyXrootdServer.java +++ b/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/NettyXrootdServer.java @@ -1,3 +1,4 @@ + package org.dcache.xrootd.door; import static org.dcache.xrootd.plugins.tls.SSLHandlerFactory.SERVER_TLS; @@ -286,7 +287,8 @@ protected void initChannel(Channel ch) throws Exception { } XrootdRedirectHandler handler = new XrootdRedirectHandler(_door, _rootPath, - _requestExecutor, _queryConfig, _appIoQueues); + _requestExecutor, _queryConfig, + _appIoQueues, _expectProxyProtocol); handler.setSigningPolicy(_signingPolicy); handler.setTlsSessionInfo(tlsSessionInfo); pipeline.addLast("redirector", handler); diff --git a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdRedirectHandler.java b/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdRedirectHandler.java index 3ad10d5aa14..5a3e6ca4ada 100644 --- a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdRedirectHandler.java +++ b/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdRedirectHandler.java @@ -234,6 +234,7 @@ private Restriction computeRestriction(LoginReply reply) { private final Deque _logins; private final FsPath _rootPath; private final AtomicInteger openRetry = new AtomicInteger(0); + private boolean _expectProxy; /** * Custom entries for kXR_Qconfig requests. @@ -247,9 +248,13 @@ private Restriction computeRestriction(LoginReply reply) { */ private volatile Thread onOpenThread; - public XrootdRedirectHandler(XrootdDoor door, FsPath rootPath, ExecutorService executor, - Map queryConfig, - Map appIoQueues) { + public XrootdRedirectHandler(XrootdDoor door, + FsPath rootPath, + ExecutorService executor, + Map queryConfig, + Map appIoQueues, + boolean expectProxy + ) { super(executor); _door = door; _rootPath = rootPath; @@ -257,6 +262,7 @@ public XrootdRedirectHandler(XrootdDoor door, FsPath rootPath, ExecutorService e _appIoQueues = appIoQueues; _defaultLoginSessionInfo = new LoginSessionInfo(Restrictions.denyAll()); _logins = new ArrayDeque<>(2); + _expectProxy = expectProxy; } @Override @@ -516,7 +522,8 @@ private InetSocketAddress localAddress() { * Use the advertised endpoint, if possble, otherwise fall back to the * address to which the client connected. */ - return _door.publicEndpoint().orElse(getDestinationAddress()); + return _expectProxy ? getDestinationAddress() : + _door.publicEndpoint().orElse(getDestinationAddress()); } /** From 81a63e36cd5c28ffb93112e915f543285b5d28aa Mon Sep 17 00:00:00 2001 From: lemora Date: Tue, 29 Oct 2024 14:56:49 +0100 Subject: [PATCH 09/57] [maven-release-plugin] prepare release 10.2.1 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index aab1e65dbeb..02fe290d5df 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.1-SNAPSHOT + 10.2.1 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 13596a8d067..b7eb961b3b1 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 17899355746..2f292a0c540 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.1-SNAPSHOT + 10.2.1 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 8d58c7bef35..42236a9f71b 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.1-SNAPSHOT + 10.2.1 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 775179840e9..e1e5dd90f76 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 54c5ac9f515..ff41a103312 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 0e40aad7927..8405ad654a7 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index ed02dfb2c2d..6a77d0afc98 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index e18962cfac0..b9a1928093d 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index fbbe44cfaeb..08665a68d73 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index f9b1c63cebc..4abce07c83f 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index beaaecaf2a8..b95c50e331a 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index ad722e08095..651ced55a14 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index d17fc7b8b07..5e3599511cf 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 2de7211c19a..7612d1a74d6 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 90445243fc6..8aca8e67e7c 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 38bbb552560..69236283c30 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index c34f0a02051..8f07b143f97 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 3d506080e01..20d4c098689 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 398358835c9..4c5e1c7ab55 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index e93114c1314..80f01c473aa 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index ef28ff18064..2f8585c3bf2 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index e1732623864..abd5c549858 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 6b12c3247fc..fede2846216 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index 25896c62bcd..6f3dff347db 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 9e03c8092a1..69e16f790c4 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index aa81e8eb415..714bb5e7f7f 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index b88f873d270..8ec999fd878 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index c6821cf2b96..fc474b5342e 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 07ed88854a7..55dbbdd8a41 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 24bac4c73dd..b37b933904a 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index b8c66353702..0f9af7365fa 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 60e4df41c2d..f533273fe6c 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 9ee6fa367c7..501ce38dff0 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 601ea5b4122..9c89c308365 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.1-SNAPSHOT + 10.2.1 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index f7369234b59..035333921a4 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 1b04a7d2003..462ac25f758 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 51612ecaebb..bf2e8354a72 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 12584292f86..123736c3706 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index ca8dc6d21e8..59387004e54 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index aba74763f53..deaaff8ea5e 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 464550e4b6d..ee86d544adf 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 9d9f1272934..44b5623a937 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index e2ae4feeed3..5326aeeb702 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index cb4458a0fcb..ebd1e1cd5d3 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 8867ed174ff..2360b8fa968 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 2bb3adaeab8..bbc270227f7 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index c74f41bd22b..23626ce380c 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index f8103e8ebf4..0345cdbfb8e 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index d30e93f79cd..0db3b4d9e33 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 17ec7e2ff57..76153b73ef1 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 6a081473fd5..418a21e08f0 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 068cec9dd16..6e7dc67db05 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 8a576752c60..b6a41a1f009 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.1-SNAPSHOT + 10.2.1 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 9a348155e74..9705e7ef349 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 40c819b4227..f6020ea3ec2 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 01470119719..83629abb1f3 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index b3e746cc62b..a95282d30cf 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 9ced8bb3402..c50c6de9eed 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.1-SNAPSHOT + 10.2.1 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 6059d059b1f..20073030aae 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.1-SNAPSHOT + 10.2.1 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 3660e20976f..db60a76bd5f 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.1-SNAPSHOT + 10.2.1 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 7065fa01290..17b6a89eb81 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.1-SNAPSHOT + 10.2.1 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 43dc5a66807..0d93333e5aa 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.1-SNAPSHOT + 10.2.1 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 42d12b70031..b4337b628ee 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1-SNAPSHOT + 10.2.1 plugins diff --git a/pom.xml b/pom.xml index 42358e0cef7..fe2cde8af84 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.1-SNAPSHOT + 10.2.1 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.1 From 92c11c94d3f9b7ab016a4638bb2670eb0deb49a8 Mon Sep 17 00:00:00 2001 From: lemora Date: Tue, 29 Oct 2024 14:56:52 +0100 Subject: [PATCH 10/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 02fe290d5df..c43d4dbc3b5 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.1 + 10.2.2-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index b7eb961b3b1..81318f3dabe 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 2f292a0c540..2fa87ef2a9c 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.1 + 10.2.2-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 42236a9f71b..90ffafe54e3 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.1 + 10.2.2-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index e1e5dd90f76..e75f4f25aa4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index ff41a103312..8c63bfa86bb 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 8405ad654a7..dc504fbaa35 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 6a77d0afc98..edd39424335 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index b9a1928093d..f88b4d0788d 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 08665a68d73..4f957309a4e 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 4abce07c83f..3885822c5b7 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index b95c50e331a..13262ac888a 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 651ced55a14..4166c538524 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 5e3599511cf..7dd5d84d205 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 7612d1a74d6..6c7ec72a6d7 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 8aca8e67e7c..9400177e560 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 69236283c30..247bc7bb08d 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 8f07b143f97..64f3758bf87 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 20d4c098689..737ea105702 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 4c5e1c7ab55..62b32acc44b 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 80f01c473aa..cca25ebfdf9 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 2f8585c3bf2..d0b66a9baef 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index abd5c549858..85960cfe5aa 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index fede2846216..6b496b20f6a 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index 6f3dff347db..1b0165d0c43 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 69e16f790c4..07480ea138c 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 714bb5e7f7f..89132b00e5b 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 8ec999fd878..401021ceb3b 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index fc474b5342e..74c5cffce39 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 55dbbdd8a41..c5e43769e97 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index b37b933904a..12e30763dbb 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 0f9af7365fa..8098cd4a75d 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index f533273fe6c..9393f1f01f0 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 501ce38dff0..1385e1fded6 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 9c89c308365..240a28b5418 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.1 + 10.2.2-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 035333921a4..6682be248d4 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 462ac25f758..aa866fa2f36 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index bf2e8354a72..072ff209c6b 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 123736c3706..1f995bf94fb 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index 59387004e54..8b7f6f18864 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index deaaff8ea5e..48750b1db39 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index ee86d544adf..e395963069e 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 44b5623a937..af25e7dbd30 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 5326aeeb702..4fe59db27a0 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index ebd1e1cd5d3..37e7a4a60a5 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 2360b8fa968..8a7fafb4dec 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index bbc270227f7..6ad645f8b39 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 23626ce380c..8c13e857d3f 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 0345cdbfb8e..6e20071f34f 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 0db3b4d9e33..038a4a8d57e 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 76153b73ef1..b5ed0699b0b 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 418a21e08f0..8803d71d043 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 6e7dc67db05..1697f37759d 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index b6a41a1f009..1fd5f755091 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.1 + 10.2.2-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 9705e7ef349..145e63bc4cb 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index f6020ea3ec2..e3cc14a58f8 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 83629abb1f3..a5665f74734 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index a95282d30cf..75a69a77558 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index c50c6de9eed..e549cc0e277 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.1 + 10.2.2-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 20073030aae..c6e4621455f 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.1 + 10.2.2-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index db60a76bd5f..4eb1a95e9d5 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.1 + 10.2.2-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 17b6a89eb81..8bf64e78a1a 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.1 + 10.2.2-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 0d93333e5aa..47588a7ddb3 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.1 + 10.2.2-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index b4337b628ee..69efd9e1691 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.1 + 10.2.2-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index fe2cde8af84..6b209a9c8fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.1 + 10.2.2-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.1 + 10.2 From cac439eebec0202959df1f66bc626ac47b7060a8 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Tue, 5 Nov 2024 11:11:41 +0100 Subject: [PATCH 11/57] bulk/qos: shutdown executor services when stopped Motivation: As scheduled executors are not shutdown cleanly, when dcache stops running threads logged. Modification: shutdown ConcurrentRequestManager and adjuster-executor when dcache stopped. Result: less stack traces in logs. Acked-by: Lea Morschel Target: master, 10.2 Require-book: no Require-notes: yes (cherry picked from commit 5f67bddf57ddc6c21e28081509e08305396fd70b) Signed-off-by: Tigran Mkrtchyan --- .../dcache/services/bulk/manager/ConcurrentRequestManager.java | 1 + .../src/main/resources/org/dcache/services/bulk/bulk.xml | 2 +- .../src/main/resources/org/dcache/qos/qos-adjuster.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java index aa7808a04c3..71bba5998ef 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java @@ -405,6 +405,7 @@ public void shutdown() throws Exception { if (processorFuture != null) { processorFuture.cancel(true); } + processorExecutorService.shutdown(); requestJobs = null; cancelledTargets = null; requestStore.clearCache(); diff --git a/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml b/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml index 3635b42f18a..a1b5749835f 100644 --- a/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml +++ b/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml @@ -262,7 +262,7 @@ - + Core of the service which manages the request and target job lifecycle. diff --git a/modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml b/modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml index beab8b448d4..b63015df6e8 100644 --- a/modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml +++ b/modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml @@ -67,7 +67,7 @@ Preserves the QOS session id generated for the task. - + From a1b2a95b698cca83abc87776484efd7ae7a7fd59 Mon Sep 17 00:00:00 2001 From: Dmitry Litvintsev Date: Wed, 6 Nov 2024 12:46:46 -0600 Subject: [PATCH 12/57] tape REST api: additional fix tohandling of prefixed paths Motivation: ----------- Users reported 2 day pin lifetime on staged files (which is a default) despite specifying different values. This is due to failure to match target key on truncated vs prefixed path in target argument map keyed on un-prefixed paths. Modification: ------------- Use full target paths throughout the system. Make sure to strip prefix when exposing paths to users. Result: ------- Observe correct user specified pin lifetime. Ticket: https://github.com/dCache/dcache/issues/7687 Patch: https://rb.dcache.org/r/14339/ Target: trunk Request: 10.2, 10.1, 10.0, 9.2 Require-book: no Require-notes: yes Signed-off-by: Dmitry Litvintsev --- .../restful/resources/tape/ReleaseResources.java | 9 ++++++--- .../restful/resources/tape/StageResources.java | 14 +++++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ReleaseResources.java b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ReleaseResources.java index f278bfacb4c..57750c66a01 100644 --- a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ReleaseResources.java +++ b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ReleaseResources.java @@ -159,6 +159,9 @@ public Response release( JSONArray paths; List targetPaths; + FsPath userRoot = LoginAttributes.getUserRoot(getLoginAttributes(request)); + FsPath rootPath = pathMapper.effectiveRoot(userRoot, ForbiddenException::new); + try { JSONObject reqPayload = new JSONObject(requestPayload); paths = reqPayload.getJSONArray("paths"); @@ -170,7 +173,9 @@ public Response release( int len = paths.length(); targetPaths = new ArrayList<>(); for (int i = 0; i < len; ++i) { - targetPaths.add(paths.getString(i)); + String requestPath = paths.getString(i); + String path = rootPath.chroot(requestPath).toString(); + targetPaths.add(path); } } catch (JSONException e) { throw newBadRequestException(requestPayload, e); @@ -178,8 +183,6 @@ public Response release( Subject subject = getSubject(); Restriction restriction = getRestriction(); - FsPath userRoot = LoginAttributes.getUserRoot(getLoginAttributes(request)); - FsPath rootPath = pathMapper.effectiveRoot(userRoot, ForbiddenException::new); /* * For WLCG, this is a fire-and-forget request, so it does not need to diff --git a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/StageResources.java b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/StageResources.java index 9876209b3e5..72f39bb11a1 100644 --- a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/StageResources.java +++ b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/StageResources.java @@ -167,6 +167,8 @@ public StageRequestInfo getStageInfo(@ApiParam("The unique id of the request.") @PathParam("id") String id) { Subject subject = getSubject(); Restriction restriction = getRestriction(); + FsPath userRoot = LoginAttributes.getUserRoot(getLoginAttributes(request)); + FsPath rootPath = pathMapper.effectiveRoot(userRoot, ForbiddenException::new); BulkRequestInfo lastInfo = null; List targetInfos = new ArrayList<>(); @@ -187,6 +189,7 @@ public StageRequestInfo getStageInfo(@ApiParam("The unique id of the request.") offset = lastInfo.getNextId(); } + targetInfos.forEach(ti -> ti.setTarget(FsPath.create(ti.getTarget()).stripPrefix(rootPath))); lastInfo.setTargets(targetInfos); return new StageRequestInfo(lastInfo); @@ -218,7 +221,9 @@ public Response cancel( + "does not belong to that stage request, this request will fail.", required = true) String requestPayload) { - JSONObject reqPayload; + FsPath userRoot = LoginAttributes.getUserRoot(getLoginAttributes(request)); + FsPath rootPath = pathMapper.effectiveRoot(userRoot, ForbiddenException::new); + JSONObject reqPayload; JSONArray paths; try { reqPayload = new JSONObject(requestPayload); @@ -233,7 +238,9 @@ public Response cancel( List targetPaths = new ArrayList<>(); int len = paths.length(); for (int i = 0; i < len; ++i) { - targetPaths.add(paths.getString(i)); + String requestPath = paths.getString(i); + String path = rootPath.chroot(requestPath).toString(); + targetPaths.add(path); } Subject subject = getSubject(); @@ -390,7 +397,8 @@ private BulkRequest toBulkRequest(String requestPayload, FsPath rootPath) { if (!file.has("path")) { throw new BadRequestException("file object " + i + " has no path."); } - String path = file.getString("path"); + String requestPath = file.getString("path"); + String path = rootPath.chroot(requestPath).toString(); paths.add(path); if (file.has("diskLifetime")) { jsonLifetimes.put(path, From df5eb3b5c7543a8c68cf5bb9d80a8514f71ed34e Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Mon, 11 Nov 2024 10:45:25 +0000 Subject: [PATCH 13/57] [maven-release-plugin] prepare release 10.2.2 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index c43d4dbc3b5..9e805f96233 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.2-SNAPSHOT + 10.2.2 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 81318f3dabe..3137daa0565 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 2fa87ef2a9c..b5b4bbbdf55 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.2-SNAPSHOT + 10.2.2 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 90ffafe54e3..cfcdaed31e1 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.2-SNAPSHOT + 10.2.2 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index e75f4f25aa4..4a3dc69e956 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 8c63bfa86bb..8db42edf05c 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index dc504fbaa35..cdff00340d1 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index edd39424335..309c9b899dd 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index f88b4d0788d..fdd703c42a4 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 4f957309a4e..248992b1286 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 3885822c5b7..62ef9f598b7 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 13262ac888a..f518913ef76 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4166c538524..0a4a11649be 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 7dd5d84d205..72ca95fab2c 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 6c7ec72a6d7..6405bf6ff3d 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 9400177e560..dc63aa81ae3 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 247bc7bb08d..c2afd184ab5 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 64f3758bf87..7c16eec1d66 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 737ea105702..bdf219a4fca 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 62b32acc44b..16c3ab8d86f 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index cca25ebfdf9..d2930630370 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index d0b66a9baef..0b514bda691 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 85960cfe5aa..9083b5b10b2 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 6b496b20f6a..8442ebadea3 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index 1b0165d0c43..ff26481ca9d 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 07480ea138c..04cf3cbf263 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 89132b00e5b..02b4f8f2125 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 401021ceb3b..e23a4c4d990 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 74c5cffce39..6dcfe263a9d 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index c5e43769e97..02160ede7f8 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 12e30763dbb..4084fa7f268 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 8098cd4a75d..e6c91c510d5 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 9393f1f01f0..8b8093e1fbb 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 1385e1fded6..aac7d438071 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 240a28b5418..4cccbf0d9d8 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.2-SNAPSHOT + 10.2.2 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 6682be248d4..0c3b8b26f5e 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index aa866fa2f36..f802650777a 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 072ff209c6b..c04cab02fab 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 1f995bf94fb..a8350d3e8ca 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index 8b7f6f18864..08472896ebc 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 48750b1db39..a61fae2c031 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index e395963069e..98c81eacf84 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index af25e7dbd30..7f0f3932813 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 4fe59db27a0..7ab6783ff9c 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 37e7a4a60a5..bb5fa6ce6d1 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 8a7fafb4dec..6da6546c2e4 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 6ad645f8b39..0ec3cd02f40 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 8c13e857d3f..a5ceb0323fd 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 6e20071f34f..f9baa434bf8 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 038a4a8d57e..0b1ed64d8b4 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index b5ed0699b0b..57dd7edabea 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 8803d71d043..edd0d6f885d 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 1697f37759d..4a6e38244b2 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 1fd5f755091..8682798c18a 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.2-SNAPSHOT + 10.2.2 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 145e63bc4cb..eecc07b8ad3 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index e3cc14a58f8..40aba6c735b 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index a5665f74734..bbf199165c5 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 75a69a77558..4b52ebf8d24 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index e549cc0e277..b0c6c1f1e32 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.2-SNAPSHOT + 10.2.2 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index c6e4621455f..4e917d3ffc6 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.2-SNAPSHOT + 10.2.2 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 4eb1a95e9d5..7d80f6221df 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.2-SNAPSHOT + 10.2.2 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 8bf64e78a1a..6268112e57e 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.2-SNAPSHOT + 10.2.2 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 47588a7ddb3..280988cf0a3 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.2-SNAPSHOT + 10.2.2 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 69efd9e1691..06ed00bd9a5 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2-SNAPSHOT + 10.2.2 plugins diff --git a/pom.xml b/pom.xml index 6b209a9c8fa..480555cc88e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.2-SNAPSHOT + 10.2.2 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.2 From 75b7a8b538ff99402155d140e90d702c36e03370 Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Mon, 11 Nov 2024 10:45:31 +0000 Subject: [PATCH 14/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 9e805f96233..0cf60e52ce6 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.2 + 10.2.3-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 3137daa0565..2b9d618251d 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index b5b4bbbdf55..ccf0a56fb87 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.2 + 10.2.3-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index cfcdaed31e1..883688be745 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.2 + 10.2.3-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 4a3dc69e956..abde919f4c6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 8db42edf05c..7ecce7cd289 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index cdff00340d1..3317063aa1e 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 309c9b899dd..8359d552e42 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index fdd703c42a4..ecaf25c8fde 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 248992b1286..964d36f21c0 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 62ef9f598b7..f7bd3643fe2 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index f518913ef76..602052ad58e 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 0a4a11649be..b7fb61d4b93 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 72ca95fab2c..7e8e19f55f7 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 6405bf6ff3d..96fad67ee1d 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index dc63aa81ae3..37258954261 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index c2afd184ab5..e0087042cbe 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 7c16eec1d66..d283c0d9f17 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index bdf219a4fca..4783abdf0a6 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 16c3ab8d86f..861286746cf 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index d2930630370..a0fafacf05a 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 0b514bda691..0586ad22696 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 9083b5b10b2..2a072cf9986 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 8442ebadea3..e5056f52e49 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index ff26481ca9d..06426b1c814 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 04cf3cbf263..d0a457975fb 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 02b4f8f2125..80b06ffccd2 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index e23a4c4d990..a40f506ae3d 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 6dcfe263a9d..0dfa67f8998 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 02160ede7f8..330ce57fd9f 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 4084fa7f268..a94cf52ee46 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index e6c91c510d5..16aa7e01a1f 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 8b8093e1fbb..f682e1714d0 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index aac7d438071..ab2dcac4003 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 4cccbf0d9d8..f5a719be0d9 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.2 + 10.2.3-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 0c3b8b26f5e..6507f6d299d 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index f802650777a..9790ffc8176 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index c04cab02fab..5962ca1e53f 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index a8350d3e8ca..f67b9f74a24 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index 08472896ebc..db6c6b20e60 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index a61fae2c031..b8f624dc17a 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 98c81eacf84..2b0fff13f55 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 7f0f3932813..c23a3f48ce8 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 7ab6783ff9c..9640e70343a 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index bb5fa6ce6d1..145eecc8e0c 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 6da6546c2e4..af2a036e6a4 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 0ec3cd02f40..db660190a8e 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index a5ceb0323fd..439fc13d9a5 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index f9baa434bf8..f06dae976ad 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 0b1ed64d8b4..8dc340f5b48 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 57dd7edabea..feb09be015a 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index edd0d6f885d..807f21342cc 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 4a6e38244b2..8094b896b2c 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 8682798c18a..87eb0af497f 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.2 + 10.2.3-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index eecc07b8ad3..d6b7718cf00 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 40aba6c735b..d4b6c76e4b5 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index bbf199165c5..2f58a37ac4b 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 4b52ebf8d24..9fae1f42a1f 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index b0c6c1f1e32..9496fef2c1d 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.2 + 10.2.3-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 4e917d3ffc6..4e44ebc149d 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.2 + 10.2.3-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 7d80f6221df..d8c959cf134 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.2 + 10.2.3-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 6268112e57e..d888bc69205 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.2 + 10.2.3-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 280988cf0a3..0cd4c60b6de 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.2 + 10.2.3-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 06ed00bd9a5..e241b784a09 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.2 + 10.2.3-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index 480555cc88e..14880f8a379 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.2 + 10.2.3-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.2 + 10.2 From ef73c01cce69596c5241833790561644057aff90 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Tue, 19 Nov 2024 19:07:10 +0100 Subject: [PATCH 15/57] cells: ignore empty core domain uris propagated by zk Motivation: When Zookeeper updates core domain infos, dCache will first kill the existing cell tunnels and then later try to read and parse the new value. If the new value is an empty string (for whatever reason), parsing will fail, but a new connection will not be established. The corresponding error in the log: 18 Nov 2024 08:45:00 (c-dcache-head-xxx03_messageDomain-AAYmVA1LtnA-AAYmVA16phA) [dcache-head-xxx03_messageDomain,9.2.21,CORE] Error while reading from tunnel: java.net.SocketExceptio> 18 Nov 2024 08:45:43 (c-dcache-head-xxx03_messageDomain-AAYnKxn40fA) [] Uncaught exception in thread TunnelConnector-dcache-head-xxx03_messageDomain java.lang.NullPointerException: null at java.base/java.net.Socket.(Socket.java:448) at java.base/java.net.Socket.(Socket.java:264) at java.base/javax.net.DefaultSocketFactory.createSocket(SocketFactory.java:277) at dmg.cells.network.LocationManagerConnector.connect(LocationManagerConnector.java:64) at dmg.cells.network.LocationManagerConnector.run(LocationManagerConnector.java:94) at dmg.cells.nucleus.CellNucleus.lambda$wrapLoggingContext$2(CellNucleus.java:725) at java.base/java.lang.Thread.run(Thread.java:829) Modification: before killing existing tunnel check that ZK didn't propagate empty data. Result: More roust cell communication NOTE: a non empty invalid data still accepted!!! Fixes: #7696 Acked-by: Lea Morschel Target: master, 10.2, 10.1, 10.0, 9.2 Require-book: no Require-notes: yes (cherry picked from commit 30829c96aa1f14b817d2c2e568d5dadc5d84d530) Signed-off-by: Tigran Mkrtchyan --- .../dmg/cells/services/LocationManager.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/cells/src/main/java/dmg/cells/services/LocationManager.java b/modules/cells/src/main/java/dmg/cells/services/LocationManager.java index a417ddb9561..84900b00790 100644 --- a/modules/cells/src/main/java/dmg/cells/services/LocationManager.java +++ b/modules/cells/src/main/java/dmg/cells/services/LocationManager.java @@ -225,7 +225,7 @@ public CoreDomainInfo(byte[] bytes) { } } catch (IOException ie) { throw new IllegalArgumentException( - "Failed deserializing LocationManager Cores as uri: {}", ie.getCause()); + "Failed deserializing LocationManager Cores as uri", ie); } } @@ -513,6 +513,10 @@ public void close() { public void reset(Mode mode, State state) { } + private boolean hasNoData(ChildData data) { + return data == null || data.getData() == null || data.getData().length == 0; + } + public void update(PathChildrenCacheEvent event) { LOGGER.info("{}", event); String cell; @@ -525,12 +529,22 @@ public void update(PathChildrenCacheEvent event) { } break; case CHILD_UPDATED: - cell = connectors.remove(ZKPaths.getNodeFromPath(event.getData().getPath())); + if (hasNoData(event.getData())) { + LOGGER.warn("Ignoring empty data on UPDATED for {}", event.getData().getPath()); + break; + } + cell = connectors.remove( + ZKPaths.getNodeFromPath(event.getData().getPath())); if (cell != null) { killConnector(cell); } // fall through case CHILD_ADDED: + if (hasNoData(event.getData())) { + LOGGER.warn("Ignoring empty data on ADDED for {}", event.getData().getPath()); + break; + } + //Log if the Core Domain Information received is incompatible with previous CoreDomainInfo info = infoFromZKEvent(event); String domain = ZKPaths.getNodeFromPath(event.getData().getPath()); From 62f7f1968750f3d19007b183d56d230778c6c82a Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Thu, 21 Nov 2024 19:33:18 +0000 Subject: [PATCH 16/57] [maven-release-plugin] prepare release 10.2.3 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 0cf60e52ce6..02e876cddbf 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.3-SNAPSHOT + 10.2.3 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 2b9d618251d..3f3079108eb 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index ccf0a56fb87..a4d8aa0b5a1 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.3-SNAPSHOT + 10.2.3 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 883688be745..210b305c90d 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.3-SNAPSHOT + 10.2.3 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index abde919f4c6..43aaf6686e1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 7ecce7cd289..eeb619a00dd 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 3317063aa1e..de1e649d40e 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 8359d552e42..8454f715df8 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index ecaf25c8fde..6c2968625fc 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 964d36f21c0..c1ad7b720db 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index f7bd3643fe2..ba687149332 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 602052ad58e..39fb0247744 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index b7fb61d4b93..4d71bd2cf51 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 7e8e19f55f7..d447eed67d2 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 96fad67ee1d..3d73448618c 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 37258954261..b07e2cf701f 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index e0087042cbe..cd401673f0a 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index d283c0d9f17..f51ddb13943 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 4783abdf0a6..dae2c4fe144 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 861286746cf..3de74563af9 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index a0fafacf05a..957ab7c970e 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 0586ad22696..a0dc421fbbe 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 2a072cf9986..208020bce24 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index e5056f52e49..4ce2f75ead3 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index 06426b1c814..e3e6f440253 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index d0a457975fb..8db228959ef 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 80b06ffccd2..06fb18209a9 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index a40f506ae3d..efaf0c2bc51 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 0dfa67f8998..8d94d58acaf 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 330ce57fd9f..fad14c0e5e9 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index a94cf52ee46..03d5a28c3d8 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 16aa7e01a1f..d41b784407f 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index f682e1714d0..ac7d6ada88a 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index ab2dcac4003..99e418b562f 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index f5a719be0d9..aceda78b67e 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.3-SNAPSHOT + 10.2.3 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 6507f6d299d..49b4ede5881 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 9790ffc8176..42516d3e66f 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 5962ca1e53f..b83c415a7af 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index f67b9f74a24..1abd4b8225e 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index db6c6b20e60..f750ee87c2b 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index b8f624dc17a..04dc04299fd 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 2b0fff13f55..7a5ddc664f8 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index c23a3f48ce8..d8c7825b0e7 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 9640e70343a..89b0e543852 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 145eecc8e0c..040cb7ab0f9 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index af2a036e6a4..e3f3bf8befd 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index db660190a8e..06b9bb8d469 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 439fc13d9a5..11a73160716 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index f06dae976ad..27056444824 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 8dc340f5b48..9e934555fb1 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index feb09be015a..28973686b78 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 807f21342cc..ccafed1acf2 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 8094b896b2c..a31088ac8ab 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 87eb0af497f..368502b5215 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.3-SNAPSHOT + 10.2.3 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index d6b7718cf00..8f32fd1aeca 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index d4b6c76e4b5..1a53e252785 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 2f58a37ac4b..9358a348846 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 9fae1f42a1f..854f9d5fdda 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 9496fef2c1d..35af271f69c 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.3-SNAPSHOT + 10.2.3 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 4e44ebc149d..5f6bbca89ff 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.3-SNAPSHOT + 10.2.3 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index d8c959cf134..5d8eb813f59 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.3-SNAPSHOT + 10.2.3 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index d888bc69205..d2ff0d61a5a 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.3-SNAPSHOT + 10.2.3 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 0cd4c60b6de..7e3a7d54793 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.3-SNAPSHOT + 10.2.3 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index e241b784a09..9ec03cb826c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3-SNAPSHOT + 10.2.3 plugins diff --git a/pom.xml b/pom.xml index 14880f8a379..dd0d6bfeeaa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.3-SNAPSHOT + 10.2.3 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.3 From 65d4ecad185e1724554fdf6d400eb942916b1bdb Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Thu, 21 Nov 2024 19:33:25 +0000 Subject: [PATCH 17/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 02e876cddbf..2861bf7c71c 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.3 + 10.2.4-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 3f3079108eb..af368cac766 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index a4d8aa0b5a1..e8b55a8ca45 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.3 + 10.2.4-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 210b305c90d..ae49f49d5ed 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.3 + 10.2.4-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 43aaf6686e1..30cd2bab3e5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index eeb619a00dd..a56e72f6ebd 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index de1e649d40e..4b473bf3830 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 8454f715df8..2b395472e15 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 6c2968625fc..792dba5d213 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index c1ad7b720db..cd69f9c86ee 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index ba687149332..076fbd2838b 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 39fb0247744..0f6977c0a37 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4d71bd2cf51..503617e0509 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index d447eed67d2..cf931085522 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 3d73448618c..b9b16f92997 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index b07e2cf701f..83712cfe29f 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index cd401673f0a..ab6073c9325 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index f51ddb13943..7e0d1b53096 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index dae2c4fe144..1e07cd26421 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 3de74563af9..454f77720c9 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 957ab7c970e..e130107f629 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index a0dc421fbbe..fc7f937e6cd 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 208020bce24..3c637a97e31 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 4ce2f75ead3..efe8adc4ca9 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index e3e6f440253..db791d73aaa 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 8db228959ef..b5f1f574f84 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 06fb18209a9..ca1ca7e3e85 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index efaf0c2bc51..0a432f127f7 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 8d94d58acaf..9204c7c82b0 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index fad14c0e5e9..7dd882b4568 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 03d5a28c3d8..6ebac509d31 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index d41b784407f..0ffab4e8ffe 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index ac7d6ada88a..3de34af36a6 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 99e418b562f..6dd1c8002bf 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index aceda78b67e..f3c323a54f2 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.3 + 10.2.4-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 49b4ede5881..fbead3c67fe 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 42516d3e66f..71ab10f7de0 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index b83c415a7af..f302caa1e3b 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 1abd4b8225e..13d6b8b373c 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index f750ee87c2b..32cae11b6eb 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 04dc04299fd..e55666ffa1c 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 7a5ddc664f8..8cbb554d46c 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index d8c7825b0e7..db4de868997 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 89b0e543852..aeba780efd5 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 040cb7ab0f9..1d4247cdac6 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index e3f3bf8befd..e2d4a8dd58c 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 06b9bb8d469..548f16e8cfe 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 11a73160716..5487cf429b2 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 27056444824..2f1cb7d34d6 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 9e934555fb1..6f6b3b9da24 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 28973686b78..60c039b9850 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index ccafed1acf2..711f4eb7b63 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index a31088ac8ab..003ea0dce05 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 368502b5215..f62f2e7792a 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.3 + 10.2.4-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 8f32fd1aeca..98a1ca3e3e5 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 1a53e252785..a42f7984f0a 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 9358a348846..f862e5b2ba9 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 854f9d5fdda..c05598e9b0a 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 35af271f69c..e5d7aca3ca7 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.3 + 10.2.4-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 5f6bbca89ff..7915148fe26 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.3 + 10.2.4-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 5d8eb813f59..75c842630f8 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.3 + 10.2.4-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index d2ff0d61a5a..bf2bda8de27 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.3 + 10.2.4-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 7e3a7d54793..cbf303101b5 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.3 + 10.2.4-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 9ec03cb826c..3c63324e8aa 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.3 + 10.2.4-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index dd0d6bfeeaa..339034f5eb4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.3 + 10.2.4-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.3 + 10.2 From 5ab9a103ef15672460155f0839aec4875d77e6d6 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Tue, 26 Nov 2024 18:32:08 +0100 Subject: [PATCH 18/57] jvm: drop UseCompressedOops JVM option Motivation: Starting java7, the UseCompressedOops is dynamically controed by heap size. ``` $ java -Xmx32g -XX:+PrintFlagsFinal 2>/dev/null | grep UseCompressedOops bool UseCompressedOops = false {product lp64_product} {default} $ java -Xmx28g -XX:+PrintFlagsFinal 2>/dev/null | grep UseCompressedOops bool UseCompressedOops = true {product lp64_product} {ergonomic} ``` The mismatch between UseCompressedOops endup with error: ``` OpenJDK 64-Bit Server VM warning: Max heap size too large for Compressed Oops ***** WARNING! INCORRECT SYSTEM CONFIGURATION DETECTED! ***** The system limit on number of memory mappings per process might be too low for the given [gc] max Java heap size (40960M). Please adjust /proc/sys/vm/max_map_count to allow for at [gc] least 73728 mappings (current limit is 65530). Continuing execution with the current ``` Modification: drop UseCompressedOops JVM option from defaults. Result: correct behavior on JVMs with large heap Acked-by: Lea Morschel Target: master Require-book: no Require-notes: yes (cherry picked from commit 59ea69ff019987bdb30f365b12520b7bc88ef168) Signed-off-by: Tigran Mkrtchyan --- skel/share/defaults/dcache.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/skel/share/defaults/dcache.properties b/skel/share/defaults/dcache.properties index 1d144ad72e9..a27fea6f589 100644 --- a/skel/share/defaults/dcache.properties +++ b/skel/share/defaults/dcache.properties @@ -198,7 +198,6 @@ dcache.log.qos.max-history=30 -XX:HeapDumpPath=${dcache.java.oom.file} \ -XX:+ExitOnOutOfMemoryError \ -XX:+StartAttachListener \ - -XX:+UseCompressedOops \ -javaagent:${dcache.paths.classes}/aspectjweaver-1.9.21.2.jar \ -Djava.net.preferIPv6Addresses=system \ --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.sql/java.sql=ALL-UNNAMED --add-opens=java.base/java.math=ALL-UNNAMED --add-opens java.base/sun.nio.fs=ALL-UNNAMED \ From 37aaa477c53d3278c95143cf81135a78bc50b990 Mon Sep 17 00:00:00 2001 From: khys95 Date: Tue, 3 Dec 2024 16:04:11 +0100 Subject: [PATCH 19/57] [maven-release-plugin] prepare release 10.2.4 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 2861bf7c71c..bed42ec6d82 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.4-SNAPSHOT + 10.2.4 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index af368cac766..9deb0c07590 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index e8b55a8ca45..ca21be8d5b3 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.4-SNAPSHOT + 10.2.4 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index ae49f49d5ed..7040bb5588f 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.4-SNAPSHOT + 10.2.4 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 30cd2bab3e5..f44aba343a5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index a56e72f6ebd..a476417f326 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 4b473bf3830..2773ebcb867 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 2b395472e15..e59d6374596 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 792dba5d213..cee6e2d1967 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index cd69f9c86ee..30a13460d77 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 076fbd2838b..48db7d6665c 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 0f6977c0a37..389b60b7d89 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 503617e0509..5b4d60a1c10 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index cf931085522..6141cf05ec4 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index b9b16f92997..3eb8fd6a4f1 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 83712cfe29f..af210acf577 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index ab6073c9325..bbcbad91005 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 7e0d1b53096..3bf6ae24431 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 1e07cd26421..e55ea1a69f5 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 454f77720c9..45e4e76b603 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index e130107f629..b18003aefdb 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index fc7f937e6cd..4347d87cd58 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 3c637a97e31..01844f167ee 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index efe8adc4ca9..1518b03f200 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index db791d73aaa..bcf6bf4f78e 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index b5f1f574f84..cc72ec951c6 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index ca1ca7e3e85..92a60999dbf 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 0a432f127f7..f82f0dc5dee 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 9204c7c82b0..569f09fb3e8 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 7dd882b4568..f715e8fc14c 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 6ebac509d31..74f8a3daf3d 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 0ffab4e8ffe..672a21408fa 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 3de34af36a6..73e5b566b09 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 6dd1c8002bf..39be285b55c 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index f3c323a54f2..78d94b43a95 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.4-SNAPSHOT + 10.2.4 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index fbead3c67fe..be85462cf70 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 71ab10f7de0..c3d14b184c8 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index f302caa1e3b..8018c3e8045 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 13d6b8b373c..e7e73898639 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index 32cae11b6eb..de16e41eb30 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index e55666ffa1c..89a5eea5649 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 8cbb554d46c..16979134231 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index db4de868997..9eb03f4c100 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index aeba780efd5..bb7faac94f8 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 1d4247cdac6..d42f7b54456 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index e2d4a8dd58c..5b7b68a3528 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 548f16e8cfe..346b42cc04c 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 5487cf429b2..36dd580cdae 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 2f1cb7d34d6..69fd2f248a5 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 6f6b3b9da24..692134c0430 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 60c039b9850..f6922c0e159 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 711f4eb7b63..471b8f62c1d 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 003ea0dce05..018a88a5745 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index f62f2e7792a..e0559cafdc5 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.4-SNAPSHOT + 10.2.4 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 98a1ca3e3e5..b62f16fb524 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index a42f7984f0a..1a90ba444a0 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index f862e5b2ba9..bb47e2ed0e3 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index c05598e9b0a..749bbbfaa27 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index e5d7aca3ca7..30338d85e77 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.4-SNAPSHOT + 10.2.4 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 7915148fe26..2d703633570 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.4-SNAPSHOT + 10.2.4 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 75c842630f8..d8ceb2136f1 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.4-SNAPSHOT + 10.2.4 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index bf2bda8de27..71aee74cf6e 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.4-SNAPSHOT + 10.2.4 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index cbf303101b5..063c90d0351 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.4-SNAPSHOT + 10.2.4 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 3c63324e8aa..0ee6aac35f1 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4-SNAPSHOT + 10.2.4 plugins diff --git a/pom.xml b/pom.xml index 339034f5eb4..afa8f77b686 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.4-SNAPSHOT + 10.2.4 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.4 From 528c0a470d25d40d1b5640b5f28c73df27ecd7e9 Mon Sep 17 00:00:00 2001 From: khys95 Date: Tue, 3 Dec 2024 16:04:16 +0100 Subject: [PATCH 20/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index bed42ec6d82..b97f7c079d1 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.4 + 10.2.5-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 9deb0c07590..963e18d5b06 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index ca21be8d5b3..f3ce4801ac9 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.4 + 10.2.5-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 7040bb5588f..abbabf64579 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.4 + 10.2.5-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index f44aba343a5..6df66888374 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index a476417f326..9ad38abdc54 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 2773ebcb867..d90cc2e6162 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index e59d6374596..14b77538fb6 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index cee6e2d1967..1428994c4e5 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 30a13460d77..981fa7df8cd 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 48db7d6665c..4d0174b3107 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 389b60b7d89..bcb3a477753 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 5b4d60a1c10..53448cb030f 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 6141cf05ec4..0d1b0ad8a15 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 3eb8fd6a4f1..b9a0720379f 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index af210acf577..986471614f2 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index bbcbad91005..f9e6350062a 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 3bf6ae24431..c57760bafc3 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index e55ea1a69f5..8a1210dd79e 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 45e4e76b603..3380e26a536 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index b18003aefdb..7bdc1349f23 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 4347d87cd58..02f28fdd476 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 01844f167ee..7cf47f6e9ef 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 1518b03f200..9ae08b02647 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index bcf6bf4f78e..f141193f17b 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index cc72ec951c6..ee1e8c570fe 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 92a60999dbf..f490d263da0 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index f82f0dc5dee..fb1436b42be 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 569f09fb3e8..18a160ac1ff 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index f715e8fc14c..b085fa2be0c 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 74f8a3daf3d..8e6a853cf04 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 672a21408fa..9a003f37fb1 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 73e5b566b09..c6b659c99cc 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 39be285b55c..451750bd270 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 78d94b43a95..901ce865521 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.4 + 10.2.5-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index be85462cf70..eb4e21ccfb3 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index c3d14b184c8..630944783a0 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 8018c3e8045..ae8bd59af5b 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index e7e73898639..f7629a40f04 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index de16e41eb30..76b02c5a65e 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 89a5eea5649..f6f7f2bcbb6 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 16979134231..2cb68fe5b2f 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 9eb03f4c100..b77ac9ed166 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index bb7faac94f8..234034a9fb4 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index d42f7b54456..39ff0ee8e2c 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 5b7b68a3528..89e0584d7f9 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 346b42cc04c..d03349167ae 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 36dd580cdae..4fb19f44f4a 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 69fd2f248a5..378265e87a6 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 692134c0430..6f0640e0c1e 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index f6922c0e159..68285d92a43 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 471b8f62c1d..431cc8207e4 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 018a88a5745..d9dcd2d1184 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index e0559cafdc5..2560945b6b2 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.4 + 10.2.5-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index b62f16fb524..9f7578c9849 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 1a90ba444a0..b64c7e4ed67 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index bb47e2ed0e3..4cc8c605c08 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 749bbbfaa27..e32e9a83a10 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 30338d85e77..f3e9501d7c6 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.4 + 10.2.5-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 2d703633570..5b61ce8d94b 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.4 + 10.2.5-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index d8ceb2136f1..47214d569cc 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.4 + 10.2.5-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 71aee74cf6e..507debd8bad 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.4 + 10.2.5-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 063c90d0351..e0d949ed0b8 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.4 + 10.2.5-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 0ee6aac35f1..4960ce2d013 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.4 + 10.2.5-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index afa8f77b686..da80da1fe46 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.4 + 10.2.5-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.4 + 10.2 From 342e01032601558f9f06b5101bde430b644639ef Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Wed, 4 Dec 2024 12:31:38 +0100 Subject: [PATCH 21/57] cells: always try to re-establish dead tunnel, unless stopped Motivation: As long as cell tunnel is not explicitly stopped by calling dmg.cells.network.LocationManagerConnector#stopped, other interrupts should be ignored. Modification: Update retry logic to never give up, unless _isRunning flag set to false. Result: More robust tulles in case of network issues. Issue: #7707, #5326 Acked-by: Dmitry Litvintsev Target: master, 10.2, 10.1, 10.0, 9.2 Require-book: no Require-notes: yes (cherry picked from commit 600ed1ff98acf04d02381279e081ccfda7e4cafc) Signed-off-by: Tigran Mkrtchyan --- .../dmg/cells/network/LocationManagerConnector.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java b/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java index 1c299df5074..6b0be280351 100644 --- a/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java +++ b/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java @@ -102,8 +102,8 @@ public void run() { } finally { getNucleus().kill(tunnel.getCellName()); } - } catch (InterruptedIOException | ClosedByInterruptException e) { - throw e; + } catch (InterruptedIOException | InterruptedException | ClosedByInterruptException e) { + _log.warn("Connection to {} ({}) interrupted. Reason: {}", _domain, _address, e.toString()); } catch (ExecutionException | IOException e) { String error = Exceptions.meaningfulMessage(Throwables.getRootCause(e)); _log.warn(AlarmMarkerFactory.getMarker(PredefinedAlarm.LOCATION_MANAGER_FAILURE, @@ -116,11 +116,16 @@ public void run() { _status = "Sleeping"; long sleep = random.nextInt(16000) + 4000; _log.warn("Sleeping {} seconds", sleep / 1000); - Thread.sleep(sleep); + try { + Thread.sleep(sleep); + } catch (InterruptedException e) { + // restore interrupted status + Thread.currentThread().interrupt(); + } } - } catch (InterruptedIOException | InterruptedException | ClosedByInterruptException ignored) { } finally { NDC.pop(); + _thread = null; _status = "Terminated"; } } From 0265bee3c09024817698a4482fa4fe9b2928e78f Mon Sep 17 00:00:00 2001 From: khys95 Date: Fri, 22 Nov 2024 15:15:27 +0100 Subject: [PATCH 22/57] =?UTF-8?q?qos:=20QOS=20fails=20with=C2=A0'Attribute?= =?UTF-8?q?=20is=20not=20defined:=20QOS=5FPOLICY'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Motivation: Find out where in the code we throw the above error and resolve it. Modification: Removal of redundant qos policy logic. Result: Instead of checking if the qos_policy attribute is defined AND null, we will check if it is present using one of the predefined methods. If not, set it to null and resume previous logic. Acked-by: Tigran Mkrtchyan Target: master, 10.2, 10.1, 10.0, 9.2 Require-book: no Require-notes: yes (cherry picked from commit 8b9dfb399767db4c4483ff107a24eed47f633a61) Signed-off-by: khys95 --- .../provider/PolicyBasedQoSProvider.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/modules/dcache-qos/src/main/java/org/dcache/qos/services/engine/provider/PolicyBasedQoSProvider.java b/modules/dcache-qos/src/main/java/org/dcache/qos/services/engine/provider/PolicyBasedQoSProvider.java index 23ff30157f0..2bf9b7cad95 100644 --- a/modules/dcache-qos/src/main/java/org/dcache/qos/services/engine/provider/PolicyBasedQoSProvider.java +++ b/modules/dcache-qos/src/main/java/org/dcache/qos/services/engine/provider/PolicyBasedQoSProvider.java @@ -59,10 +59,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */ package org.dcache.qos.services.engine.provider; -import static org.dcache.qos.util.QoSPermissionUtils.canModifyQos; - import diskCacheV111.util.CacheException; -import diskCacheV111.util.PermissionDeniedCacheException; import diskCacheV111.util.PnfsId; import java.util.Collections; import java.util.EnumSet; @@ -71,6 +68,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import java.util.Optional; import java.util.Set; import javax.security.auth.Subject; + import org.dcache.namespace.FileAttribute; import org.dcache.poolmanager.SerializablePoolMonitor; import org.dcache.qos.QoSDiskSpecification; @@ -115,17 +113,6 @@ public FileQoSRequirements fetchRequirements(FileQoSUpdate update) throws QoSExc return null; } - FileAttributes attributes = descriptor.getAttributes(); - if (attributes.isDefined(FileAttribute.QOS_POLICY) && attributes.getQosPolicy() == null) { - /* - * This is a lazily discovered change, so - * as a matter of consistency it calls for removal - * of the pnfsid from the engine's tracking tables. - */ - engineDao.delete(update.getPnfsId()); - return super.fetchRequirements(update, descriptor); - } - return fetchRequirements(update, descriptor); } @@ -133,9 +120,11 @@ public FileQoSRequirements fetchRequirements(FileQoSUpdate update) throws QoSExc public FileQoSRequirements fetchRequirements(FileQoSUpdate update, FileQoSRequirements descriptor) throws QoSException { FileAttributes attributes = descriptor.getAttributes(); - String name = attributes.getQosPolicy(); + + String name = attributes.getQosPolicyIfPresent().orElse(null); if (name == null) { + engineDao.delete(update.getPnfsId()); return super.fetchRequirements(update, descriptor); } From f67be3b4240df106e52a166fefb1f93a73520f8a Mon Sep 17 00:00:00 2001 From: Dmitry Litvintsev Date: Fri, 6 Dec 2024 10:32:59 -0600 Subject: [PATCH 23/57] bulk: handle absolute/relative paths in uniform fashion Motivation: ----------- Recent change(s) that massaged user input target paths and stored absolute paths on bulk backend lead to ambiguity between user provided and dcache resolved paths and also resulted in inability to use full paths (i.e. only relative paths are supported). At Fermilab we need to use both - relative and absolute paths Modification: ------------- Revert all recent changes that appended prefix to user supplied paths, stored the result and then stripped the prefix so that only "original" paths are exposed to the user. Instead, like before, store user supplied paths but carry over request prefix which is computed from user root and door root. When calling PnfsManager using paths the full paths of the targets are reassembled using the prefix Result: ------ Restored ability to use absolute paths when using REST API. Issue: https://github.com/dCache/dcache/issues/7693 Patch: https://rb.dcache.org/r/14355/ Target: trunk Request: 10.2, 10.1, 10.0, 9.2 Require-book: no Require-notes: yes Acked-by: Lea Morschel, Tigran Mkrtchyan --- .../services/bulk/activity/BulkActivity.java | 5 +- .../plugin/delete/DeleteActivity.java | 5 +- .../plugin/log/LogTargetActivity.java | 2 +- .../bulk/activity/plugin/pin/PinActivity.java | 13 ++-- .../plugin/pin/PinManagerActivity.java | 6 +- .../activity/plugin/pin/ReleaseActivity.java | 6 +- .../activity/plugin/pin/StageActivity.java | 16 ++-- .../activity/plugin/pin/UnpinActivity.java | 6 +- .../plugin/qos/UpdateQoSActivity.java | 28 +++++-- .../bulk/job/BulkRequestContainerJob.java | 76 +++++-------------- .../services/bulk/util/BulkRequestTarget.java | 13 ++-- .../restful/resources/bulk/BulkResources.java | 22 +++++- .../resources/tape/ArchiveInfoResources.java | 12 ++- .../resources/tape/ReleaseResources.java | 3 +- .../resources/tape/StageResources.java | 8 +- .../util/wlcg/ArchiveInfoCollector.java | 23 +++++- .../bulk/BulkRequestJsonParseTest.java | 3 +- 17 files changed, 129 insertions(+), 118 deletions(-) diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/BulkActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/BulkActivity.java index 49f82faabe0..c1e5f00a60a 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/BulkActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/BulkActivity.java @@ -114,7 +114,7 @@ protected BulkActivity(String name, TargetType targetType) { retryPolicy = DEFAULT_RETRY_POLICY; } - public void cancel(BulkRequestTarget target) { + public void cancel(String prefix, BulkRequestTarget target) { target.cancel(); } @@ -173,11 +173,12 @@ public void setDescriptors(Set descriptors) { * * @param rid of the request. * @param tid of the target. + * @param prefix target prefix * @param path of the target on which to perform the activity. * @return future result of the activity. * @throws BulkServiceException */ - public abstract ListenableFuture perform(String rid, long tid, FsPath path, FileAttributes attributes) + public abstract ListenableFuture perform(String rid, long tid, String prefix, FsPath path, FileAttributes attributes) throws BulkServiceException; /** diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/delete/DeleteActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/delete/DeleteActivity.java index 8c3687326b6..7a7d04eae41 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/delete/DeleteActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/delete/DeleteActivity.java @@ -89,9 +89,10 @@ public DeleteActivity(String name, TargetType targetType) { } @Override - public ListenableFuture perform(String rid, long tid, FsPath path, + public ListenableFuture perform(String rid, long tid, String prefix, FsPath path, FileAttributes attributes) { - PnfsDeleteEntryMessage msg = new PnfsDeleteEntryMessage(path.toString()); + FsPath absolutePath = BulkRequestTarget.computeFsPath(prefix, path.toString()); + PnfsDeleteEntryMessage msg = new PnfsDeleteEntryMessage(absolutePath.toString()); msg.setSubject(subject); if (attributes != null && attributes.getFileType() == FileType.DIR && skipDirs) { msg.setSucceeded(); diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/log/LogTargetActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/log/LogTargetActivity.java index 330ac0158ba..fb00b84186a 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/log/LogTargetActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/log/LogTargetActivity.java @@ -89,7 +89,7 @@ protected LogTargetActivity(String name, TargetType targetType) { } @Override - public ListenableFuture perform(String ruid, long tid, FsPath path, + public ListenableFuture perform(String ruid, long tid, String prefix, FsPath path, FileAttributes attributes) { long now = System.currentTimeMillis(); BulkRequestTarget t = BulkRequestTargetBuilder.builder(null).activity(this.getName()).id(tid) diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinActivity.java index 9c237b97cc0..27ed977e9b0 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinActivity.java @@ -91,18 +91,18 @@ public PinActivity(String name, TargetType targetType) { super(name, targetType); } - public void cancel(BulkRequestTarget target) { - super.cancel(target); + public void cancel(String prefix, BulkRequestTarget target) { + super.cancel(prefix, target); try { - pinManager.send(unpinMessage(id, target)); + pinManager.send(unpinMessage(id, prefix, target)); } catch (CacheException e) { - target.setErrorObject(new BulkServiceException("unable to fetch pnfsid of target in " + target.setErrorObject(new BulkServiceException("unable to fetch pnfsid of target in " + "order to cancel pinning.", e)); } } @Override - public ListenableFuture perform(String rid, long tid, FsPath target, + public ListenableFuture perform(String rid, long tid, String prefix, FsPath path, FileAttributes attributes) { if (id == null) { id = rid; @@ -110,7 +110,8 @@ public ListenableFuture perform(String rid, long tid, FsPath target, try { if (attributes == null) { - attributes = getAttributes(target); + FsPath absolutePath = BulkRequestTarget.computeFsPath(prefix, path.toString()); + attributes = getAttributes(absolutePath); } checkPinnable(attributes); diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinManagerActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinManagerActivity.java index 02019cfd741..dcbbd8fbfd9 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinManagerActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinManagerActivity.java @@ -61,6 +61,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly; import static diskCacheV111.util.CacheException.INVALID_ARGS; +import static org.dcache.services.bulk.util.BulkRequestTarget.computeFsPath; import static org.dcache.services.bulk.util.BulkRequestTarget.State.SKIPPED; import com.google.common.util.concurrent.Futures; @@ -130,11 +131,12 @@ protected FileAttributes getAttributes(FsPath path) throws CacheException { return pnfsHandler.getFileAttributes(path, MINIMALLY_REQUIRED_ATTRIBUTES); } - protected PinManagerUnpinMessage unpinMessage(String id, BulkRequestTarget target) + protected PinManagerUnpinMessage unpinMessage(String id, String prefix, BulkRequestTarget target) throws CacheException { PnfsId pnfsId = target.getPnfsId(); if (pnfsId == null) { - pnfsId = getAttributes(target.getPath()).getPnfsId(); + FsPath absolutePath = computeFsPath(prefix, target.getPath().toString()); + pnfsId = getAttributes(absolutePath).getPnfsId(); } return unpinMessage(id, pnfsId); } diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/ReleaseActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/ReleaseActivity.java index be11099b34f..a3e2f157471 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/ReleaseActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/ReleaseActivity.java @@ -60,6 +60,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING package org.dcache.services.bulk.activity.plugin.pin; import static org.dcache.services.bulk.activity.plugin.pin.ReleaseActivityProvider.REQUEST_ID; +import static org.dcache.services.bulk.util.BulkRequestTarget.computeFsPath; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -77,11 +78,12 @@ public ReleaseActivity(String name, TargetType targetType) { } @Override - public ListenableFuture perform(String rid, long tid, FsPath target, + public ListenableFuture perform(String rid, long tid, String prefix, FsPath path, FileAttributes attributes) { try { if (attributes == null) { - attributes = getAttributes(target); + FsPath absolutePath = computeFsPath(prefix, path.toString()); + attributes = getAttributes(absolutePath); } return pinManager.send(unpinMessage(id, attributes.getPnfsId())); } catch (CacheException e) { diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/StageActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/StageActivity.java index b460b261530..d915ec463c1 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/StageActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/StageActivity.java @@ -102,18 +102,18 @@ public StageActivity(String name, TargetType targetType) { super(name, targetType); } - public void cancel(BulkRequestTarget target) { - super.cancel(target); + public void cancel(String prefix, BulkRequestTarget target) { + super.cancel(prefix, target); try { - pinManager.send(unpinMessage(id, target)); + pinManager.send(unpinMessage(id, prefix, target)); } catch (CacheException e) { target.setErrorObject(new BulkServiceException("unable to fetch pnfsid of target in " - + "order to cancel staging.", e)); + + "order to cancel staging.", e)); } } @Override - public ListenableFuture perform(String rid, long tid, FsPath target, + public ListenableFuture perform(String rid, long tid, String prefix, FsPath path, FileAttributes attributes) { id = rid; @@ -121,7 +121,9 @@ public ListenableFuture perform(String rid, long tid, FsPath target, /* * refetch the attributes because RP is not stored in the bulk database. */ - attributes = getAttributes(target); + + FsPath absolutePath = BulkRequestTarget.computeFsPath(prefix, path.toString()); + attributes = getAttributes(absolutePath); checkStageable(attributes); @@ -129,7 +131,7 @@ public ListenableFuture perform(String rid, long tid, FsPath target, = new PinManagerPinMessage(attributes, getProtocolInfo(), pnfsHandler.getRestriction(), id, - getLifetimeInMillis(target)); + getLifetimeInMillis(path)); message.setSubject(subject); Optional> skipOption = skipIfOnline(attributes, message); diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/UnpinActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/UnpinActivity.java index db2106b1b95..44a44473851 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/UnpinActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/UnpinActivity.java @@ -60,6 +60,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING package org.dcache.services.bulk.activity.plugin.pin; import static org.dcache.services.bulk.activity.plugin.pin.UnpinActivityProvider.UNPIN_REQUEST_ID; +import static org.dcache.services.bulk.util.BulkRequestTarget.computeFsPath; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -78,11 +79,12 @@ public UnpinActivity(String name, TargetType targetType) { } @Override - public ListenableFuture perform(String rid, long tid, FsPath target, + public ListenableFuture perform(String rid, long tid, String prefix, FsPath path, FileAttributes attributes) { try { if (attributes == null) { - attributes = getAttributes(target); + FsPath absolutePath = computeFsPath(prefix, path.toString()); + attributes = getAttributes(absolutePath); } return pinManager.send(unpinMessage(id, attributes.getPnfsId())); } catch (CacheException e) { diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/qos/UpdateQoSActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/qos/UpdateQoSActivity.java index e61b169dab0..4df8fb911a3 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/qos/UpdateQoSActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/qos/UpdateQoSActivity.java @@ -112,10 +112,24 @@ public UpdateQoSActivity(String name, TargetType targetType) { } @Override - public synchronized void cancel(BulkRequestTarget target) { + public synchronized void cancel(String prefix, BulkRequestTarget target) { RemoteQoSRequirementsClient client = new RemoteQoSRequirementsClient(); client.setRequirementsService(qosEngine); - PnfsId pnfsId = target.getAttributes().getPnfsId(); + PnfsId pnfsId = null; + if (target.getAttributes() == null) { + FsPath absolutePath = BulkRequestTarget.computeFsPath(prefix, + target.getPath().toString()); + try { + pnfsId = pnfsHandler.getFileAttributes(absolutePath.toString(), + MINIMALLY_REQUIRED_ATTRIBUTES).getPnfsId(); + } catch (CacheException e) { + LOGGER.error("fileQoSRequirementsModifiedCancelled failed: failed to fetch attributes for {} {}.", + target.getPath().toString(), + e.getMessage()); + } + } else { + pnfsId = target.getAttributes().getPnfsId(); + } try { client.fileQoSRequirementsModifiedCancelled(pnfsId, subject); } catch (QoSException e) { @@ -123,19 +137,20 @@ public synchronized void cancel(BulkRequestTarget target) { e.getMessage()); } responseReceiver.cancel(pnfsId.toString()); - super.cancel(target); + super.cancel(prefix, target); } @Override public ListenableFuture perform(String rid, long tid, - FsPath path, FileAttributes attributes) throws BulkServiceException { + String prefix, FsPath path, FileAttributes attributes) throws BulkServiceException { if (targetQos == null && qosPolicy == null) { return Futures.immediateFailedFuture(new IllegalArgumentException("no target qos or policy given.")); } if (attributes == null) { try { - attributes = pnfsHandler.getFileAttributes(path, MINIMALLY_REQUIRED_ATTRIBUTES); + FsPath absolutePath = BulkRequestTarget.computeFsPath(prefix, path.toString()); + attributes = pnfsHandler.getFileAttributes(absolutePath.toString(), MINIMALLY_REQUIRED_ATTRIBUTES); } catch (CacheException e) { throw new BulkServiceException("failed to retrieve file attributes", e); } @@ -232,6 +247,3 @@ public void setNamespaceHandler(PnfsHandler pnfsHandler) { this.pnfsHandler = pnfsHandler; } } - - - diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/job/BulkRequestContainerJob.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/job/BulkRequestContainerJob.java index 7317af31a8d..c7d0269ff24 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/job/BulkRequestContainerJob.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/job/BulkRequestContainerJob.java @@ -120,7 +120,6 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import org.dcache.util.list.ListDirectoryHandler; import org.dcache.vehicles.FileAttributes; import org.dcache.vehicles.PnfsGetFileAttributes; -import org.dcache.vehicles.PnfsResolveSymlinksMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -140,18 +139,7 @@ public final class BulkRequestContainerJob static final AtomicLong taskCounter = new AtomicLong(0L); public static FsPath findAbsolutePath(String prefix, String path) { - FsPath absPath = computeFsPath(null, path); - if (prefix == null) { - return absPath; - } - - FsPath pref = FsPath.create(prefix); - - if (!absPath.hasPrefix(pref)) { - absPath = computeFsPath(prefix, path); - } - - return absPath; + return computeFsPath(prefix, path); } /** @@ -235,7 +223,7 @@ enum ContainerState { * proper paths and attributes from listing. */ enum TaskState { - RESOLVE_PATH, FETCH_ATTRIBUTES, HANDLE_TARGET, HANDLE_DIR_TARGET + FETCH_ATTRIBUTES, HANDLE_TARGET, HANDLE_DIR_TARGET } /** @@ -452,7 +440,7 @@ void cancel() { } if (target != null) { - activity.cancel(target); + activity.cancel(targetPrefix, target); LOGGER.debug("{} - target cancelled for task {}.", ruid, seqNo); } @@ -464,9 +452,6 @@ void doInner() { try { checkForRequestCancellation(); switch (state) { - case RESOLVE_PATH: - resolvePath(); - break; case FETCH_ATTRIBUTES: fetchAttributes(); break; @@ -512,43 +497,15 @@ void performSync() throws InterruptedException { } /** - * (1) symlink resolution on initial targets; bypassed for discovered targets. + * (1) retrieval of required file attributes. */ - private void resolvePath() { - LOGGER.debug("{} - resolvePath, resolving {}", ruid, target.getPath()); - PnfsResolveSymlinksMessage message = new PnfsResolveSymlinksMessage( - target.getPath().toString(), null); - ListenableFuture requestFuture = pnfsHandler.requestAsync( - message); - CellStub.addCallback(requestFuture, new AbstractMessageCallback<>() { - @Override - public void success(PnfsResolveSymlinksMessage message) { - LOGGER.debug("{} - resolvePath {}, callback success.", ruid, target.getPath()); - FsPath path = FsPath.create(message.getResolvedPath()); - if (targetPrefix != null && !path.contains(targetPrefix)) { - path = computeFsPath(targetPrefix, path.toString()); - } - LOGGER.debug("{} - resolvePath, resolved path {}", ruid, path); - target.setPath(path); - state = TaskState.FETCH_ATTRIBUTES; - taskFuture = executor.submit(TargetTask.this); - } + private void fetchAttributes() { + FsPath absolutePath = findAbsolutePath(targetPrefix, + target.getPath().toString()); + LOGGER.debug("{} - fetchAttributes for path {}, prefix {}, absolute path {} ", ruid, target.getPath(), targetPrefix, absolutePath); - @Override - public void failure(int rc, Object error) { - LOGGER.error("{} - resolvePath, callback failure for {}.", ruid, target); - storeOrUpdate(CacheExceptionFactory.exceptionOf( - rc, Objects.toString(error, null))); - } - }, callbackExecutor); - } - /** - * (2) retrieval of required file attributes. - */ - private void fetchAttributes() { - LOGGER.debug("{} - fetchAttributes for path {}", ruid, target.getPath()); - PnfsGetFileAttributes message = new PnfsGetFileAttributes(target.getPath().toString(), + PnfsGetFileAttributes message = new PnfsGetFileAttributes(absolutePath.toString(), MINIMALLY_REQUIRED_ATTRIBUTES); ListenableFuture requestFuture = pnfsHandler.requestAsync( message); @@ -573,7 +530,7 @@ public void failure(int rc, Object error) { } /** - * (3b) either recurs on directory or performs activity on file. + * (2b) either recurs on directory or performs activity on file. */ private void handleTarget() throws InterruptedException { LOGGER.debug("{} - handleTarget for {}, path {}.", ruid, target.getActivity(), @@ -611,17 +568,20 @@ private void performActivity(boolean async) throws InterruptedException { FsPath path = target.getPath(); FileAttributes attributes = target.getAttributes(); LOGGER.debug("{} - performActivity {} on {}.", ruid, activity, path); - storeOrUpdate(null); if (hasBeenSpecificallyCancelled(this)) { LOGGER.debug("{} - performActivity hasBeenSpecificallyCancelled for {}.", ruid, - path); + path); remove(); } try { - activityFuture = activity.perform(ruid, id == null ? seqNo : id, path, attributes); + activityFuture = activity.perform(ruid, + id == null ? seqNo : id, + targetPrefix, + path, + attributes); if (async) { activityFuture.addListener(() -> handleCompletion(), callbackExecutor); permitHolder.throttledRelease(); @@ -1077,7 +1037,7 @@ private void processFileTargets() { for (BulkRequestTarget target : requestTargets) { try { checkForRequestCancellation(); - new TargetTask(target, TaskState.RESOLVE_PATH).submitAsync(); + new TargetTask(target, TaskState.FETCH_ATTRIBUTES).submitAsync(); } catch (InterruptedException e) { /* * Cancel most likely called; stop processing. @@ -1128,4 +1088,4 @@ private void update() { signalStateChange(); } -} \ No newline at end of file +} diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/util/BulkRequestTarget.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/util/BulkRequestTarget.java index de7d3632be0..2bbbd1b56be 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/util/BulkRequestTarget.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/util/BulkRequestTarget.java @@ -87,12 +87,15 @@ public final class BulkRequestTarget { RUNNING}; public static FsPath computeFsPath(String prefix, String target) { - if (prefix == null) { - return FsPath.create(FsPath.ROOT + target); - } else { - return FsPath.create( - FsPath.ROOT + (prefix.endsWith("/") ? prefix : prefix + "/") + target); + FsPath absolutePath = FsPath.create(FsPath.ROOT + target); + if (prefix != null) { + FsPath pref = FsPath.create(prefix); + if (!absolutePath.hasPrefix(pref)) { + absolutePath = FsPath.create( + FsPath.ROOT + (prefix.endsWith("/") ? prefix : prefix + "/") + target); + } } + return absolutePath; } public static final FsPath ROOT_REQUEST_PATH = computeFsPath(null, "=request_target="); diff --git a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/bulk/BulkResources.java b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/bulk/BulkResources.java index 6a0bf16da2d..40f3b5e0a01 100644 --- a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/bulk/BulkResources.java +++ b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/bulk/BulkResources.java @@ -59,6 +59,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */ package org.dcache.restful.resources.bulk; +import static org.dcache.http.AuthenticationHandler.getLoginAttributes; import static org.dcache.restful.util.HttpServletRequests.getUserRootAwareTargetPrefix; import static org.dcache.restful.util.JSONUtils.newBadRequestException; @@ -67,6 +68,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import com.google.common.base.Strings; import com.google.gson.Gson; import com.google.gson.JsonParseException; +import diskCacheV111.util.FsPath; import diskCacheV111.util.PnfsHandler; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -93,6 +95,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; +import javax.ws.rs.ForbiddenException; import javax.ws.rs.NotAuthorizedException; import javax.ws.rs.PATCH; import javax.ws.rs.POST; @@ -103,9 +106,11 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.dcache.auth.attributes.LoginAttributes; import org.dcache.auth.attributes.Restriction; import org.dcache.auth.attributes.Restrictions; import org.dcache.cells.CellStub; +import org.dcache.http.PathMapper; import org.dcache.restful.util.HandlerBuilders; import org.dcache.restful.util.RequestUser; import org.dcache.restful.util.bulk.BulkServiceCommunicator; @@ -144,6 +149,9 @@ public final class BulkResources { @Inject private BulkServiceCommunicator service; + @Inject + private PathMapper pathMapper; + @Inject @Named("pnfs-stub") private CellStub pnfsmanager; @@ -235,11 +243,14 @@ public Response submit( Subject subject = getSubject(); Restriction restriction = getRestriction(); PnfsHandler handler = HandlerBuilders.unrestrictedPnfsHandler(pnfsmanager); - BulkRequest request = toBulkRequest(requestPayload, this.request, handler); + FsPath userRoot = LoginAttributes.getUserRoot(getLoginAttributes(request)); + FsPath rootPath = pathMapper.effectiveRoot(userRoot, ForbiddenException::new); + BulkRequest request = toBulkRequest(requestPayload, this.request, handler, rootPath); /* * Frontend sets the URL. The backend service provides the UUID. */ + request.setUrlPrefix(this.request.getRequestURL().toString()); BulkRequestMessage message = new BulkRequestMessage(request, restriction); @@ -498,7 +509,7 @@ public static Restriction getRestriction() { * they are defined in the Bulk service as well. */ @VisibleForTesting - static BulkRequest toBulkRequest(String requestPayload, HttpServletRequest httpServletRequest, PnfsHandler handler) { + static BulkRequest toBulkRequest(String requestPayload, HttpServletRequest httpServletRequest, PnfsHandler handler, FsPath rootPath) { if (Strings.emptyToNull(requestPayload) == null) { throw new BadRequestException("empty request payload."); } @@ -531,10 +542,13 @@ static BulkRequest toBulkRequest(String requestPayload, HttpServletRequest httpS string = removeEntry(map, String.class, "target_prefix", "target-prefix", "targetPrefix"); + if (httpServletRequest != null) { - request.setTargetPrefix(getUserRootAwareTargetPrefix(httpServletRequest, string, handler)); + request.setTargetPrefix(getUserRootAwareTargetPrefix(httpServletRequest, + string != null ? string : rootPath.toString(), + handler)); } else { - request.setTargetPrefix(string); + request.setTargetPrefix(string != null ? string : rootPath.toString()); } string = removeEntry(map, String.class, "expand_directories", "expand-directories", diff --git a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ArchiveInfoResources.java b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ArchiveInfoResources.java index 718c871a58b..314f9ece1ff 100644 --- a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ArchiveInfoResources.java +++ b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ArchiveInfoResources.java @@ -160,19 +160,17 @@ public List getArchiveInfo( paths = new ArrayList<>(); for (int i = 0; i < len; ++i) { String requestedPath = jsonArray.getString(i); - String dcachePath = rootPath.chroot(requestedPath).toString(); - paths.add(dcachePath); + paths.add(requestedPath); } } catch (JSONException e) { throw newBadRequestException(requestPayload, e); } var archiveInfos = archiveInfoCollector.getInfo(HandlerBuilders.roleAwarePnfsHandler(pnfsManager), - paths); - - archiveInfos.forEach(ai -> - ai.setPath(FsPath.create(ai.getPath()).stripPrefix(rootPath))); - + rootPath.toString(), + paths); return archiveInfos; } + + } diff --git a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ReleaseResources.java b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ReleaseResources.java index 57750c66a01..44bd7a816ae 100644 --- a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ReleaseResources.java +++ b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ReleaseResources.java @@ -173,8 +173,7 @@ public Response release( int len = paths.length(); targetPaths = new ArrayList<>(); for (int i = 0; i < len; ++i) { - String requestPath = paths.getString(i); - String path = rootPath.chroot(requestPath).toString(); + String path = paths.getString(i); targetPaths.add(path); } } catch (JSONException e) { diff --git a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/StageResources.java b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/StageResources.java index 72f39bb11a1..8ac882b6144 100644 --- a/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/StageResources.java +++ b/modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/StageResources.java @@ -127,6 +127,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING @Api(value = "tape", authorizations = {@Authorization("basicAuth")}) @Path("tape/stage") public final class StageResources { + private static final String STAGE = "STAGE"; @Context @@ -189,7 +190,6 @@ public StageRequestInfo getStageInfo(@ApiParam("The unique id of the request.") offset = lastInfo.getNextId(); } - targetInfos.forEach(ti -> ti.setTarget(FsPath.create(ti.getTarget()).stripPrefix(rootPath))); lastInfo.setTargets(targetInfos); return new StageRequestInfo(lastInfo); @@ -238,8 +238,7 @@ public Response cancel( List targetPaths = new ArrayList<>(); int len = paths.length(); for (int i = 0; i < len; ++i) { - String requestPath = paths.getString(i); - String path = rootPath.chroot(requestPath).toString(); + String path = paths.getString(i); targetPaths.add(path); } @@ -397,8 +396,7 @@ private BulkRequest toBulkRequest(String requestPayload, FsPath rootPath) { if (!file.has("path")) { throw new BadRequestException("file object " + i + " has no path."); } - String requestPath = file.getString("path"); - String path = rootPath.chroot(requestPath).toString(); + String path = file.getString("path"); paths.add(path); if (file.has("diskLifetime")) { jsonLifetimes.put(path, diff --git a/modules/dcache-frontend/src/main/java/org/dcache/restful/util/wlcg/ArchiveInfoCollector.java b/modules/dcache-frontend/src/main/java/org/dcache/restful/util/wlcg/ArchiveInfoCollector.java index 67ab5298c50..3298156d8f9 100644 --- a/modules/dcache-frontend/src/main/java/org/dcache/restful/util/wlcg/ArchiveInfoCollector.java +++ b/modules/dcache-frontend/src/main/java/org/dcache/restful/util/wlcg/ArchiveInfoCollector.java @@ -64,6 +64,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import com.google.common.base.Throwables; import diskCacheV111.util.CacheException; import diskCacheV111.util.FileLocality; +import diskCacheV111.util.FsPath; import diskCacheV111.util.PnfsHandler; import dmg.cells.nucleus.CellCommandListener; import dmg.util.command.Argument; @@ -117,12 +118,12 @@ public String call() throws Exception { private ExecutorService service; private int maxPaths; - public List getInfo(PnfsHandler pnfsHandler, List paths) { + public List getInfo(PnfsHandler pnfsHandler, String prefix, List paths) { Map> futures = new HashMap<>(); List infoList = new ArrayList<>(); for (String path : paths) { - futures.put(path, service.submit(() -> getInfo(path, pnfsHandler))); + futures.put(path, service.submit(() -> getInfo(path, prefix, pnfsHandler))); } for (Entry> future : futures.entrySet()) { @@ -162,9 +163,23 @@ public void setService(ExecutorService service) { this.service = service; } - private FileLocality getInfo(String path, PnfsHandler pnfsHandler) throws CacheException { - FileAttributes attributes = pnfsHandler.getFileAttributes(path, REQUIRED_ATTRIBUTES, + private FileLocality getInfo(String path, String prefix, PnfsHandler pnfsHandler) throws CacheException { + String absolutePath = computeFsPath(prefix, path).toString(); + FileAttributes attributes = pnfsHandler.getFileAttributes(absolutePath, REQUIRED_ATTRIBUTES, ACCESS_MASK, false); return poolMonitor.getFileLocality(attributes, "localhost"); } + + public static FsPath computeFsPath(String prefix, String target) { + FsPath absolutePath = FsPath.create(FsPath.ROOT + target); + if (prefix != null) { + FsPath pref = FsPath.create(prefix); + if (!absolutePath.hasPrefix(pref)) { + absolutePath = FsPath.create( + FsPath.ROOT + (prefix.endsWith("/") ? prefix : prefix + "/") + target); + } + } + return absolutePath; + } + } diff --git a/modules/dcache-frontend/src/test/java/org/dcache/restful/resources/bulk/BulkRequestJsonParseTest.java b/modules/dcache-frontend/src/test/java/org/dcache/restful/resources/bulk/BulkRequestJsonParseTest.java index 33e78a20f3f..fb8d8af9ea7 100644 --- a/modules/dcache-frontend/src/test/java/org/dcache/restful/resources/bulk/BulkRequestJsonParseTest.java +++ b/modules/dcache-frontend/src/test/java/org/dcache/restful/resources/bulk/BulkRequestJsonParseTest.java @@ -59,6 +59,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */ package org.dcache.restful.resources.bulk; +import static diskCacheV111.util.FsPath.create; import static org.dcache.restful.resources.bulk.BulkResources.toBulkRequest; import static org.junit.Assert.assertEquals; @@ -182,6 +183,6 @@ private void givenJsonWithArrayTargetAttribute() { } private void whenParsed() { - bulkRequest = toBulkRequest(requestJson, null, handler); + bulkRequest = toBulkRequest(requestJson, null, handler, create("/")); } } From 92ad9eb538165a8dfedbef6c60dc49f9fbacb546 Mon Sep 17 00:00:00 2001 From: khys95 Date: Fri, 13 Dec 2024 10:37:01 +0100 Subject: [PATCH 24/57] [maven-release-plugin] prepare release 10.2.5 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index b97f7c079d1..45aa43d1d6f 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.5-SNAPSHOT + 10.2.5 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 963e18d5b06..8beabdcbbd9 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index f3ce4801ac9..52c7e15991f 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.5-SNAPSHOT + 10.2.5 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index abbabf64579..b6067658902 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.5-SNAPSHOT + 10.2.5 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 6df66888374..93a99c2e984 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 9ad38abdc54..c6936e95b95 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index d90cc2e6162..e0c977b6f1d 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 14b77538fb6..e747ac69702 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 1428994c4e5..72f0a445dfc 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 981fa7df8cd..c3ba8132830 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 4d0174b3107..4aeeb765684 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index bcb3a477753..7a20be645f1 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 53448cb030f..871b582fcd0 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 0d1b0ad8a15..1755d94d2ed 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index b9a0720379f..c989566521d 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 986471614f2..2af44ba6fce 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index f9e6350062a..edc0aa436a4 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index c57760bafc3..11c02d8fc92 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 8a1210dd79e..bb23bba92f4 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 3380e26a536..209f5fe7759 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 7bdc1349f23..c107af35572 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 02f28fdd476..84e4391a9b1 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 7cf47f6e9ef..0fa19f668af 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 9ae08b02647..dd9316393b9 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index f141193f17b..a60ffd8ebf3 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index ee1e8c570fe..7670e366043 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index f490d263da0..b841ca029f6 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index fb1436b42be..6dbc3ae2eb3 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 18a160ac1ff..d9279754956 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index b085fa2be0c..a10c01dcf76 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 8e6a853cf04..b0565a5b5ea 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 9a003f37fb1..b76a2e413d9 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index c6b659c99cc..305a7a09078 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 451750bd270..f005e0c0adf 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 901ce865521..bd6376037a7 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.5-SNAPSHOT + 10.2.5 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index eb4e21ccfb3..5c181afd25a 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 630944783a0..9637d6121b4 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index ae8bd59af5b..d3c440f5e68 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index f7629a40f04..a1a5810fcb6 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index 76b02c5a65e..e49faeac53a 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index f6f7f2bcbb6..75c82702533 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 2cb68fe5b2f..e9301dfbc6a 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index b77ac9ed166..98aac28e432 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 234034a9fb4..974462749d5 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 39ff0ee8e2c..e1feeacc411 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 89e0584d7f9..44cbbdba6d8 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index d03349167ae..3ca65c6c861 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 4fb19f44f4a..4fb5355c083 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 378265e87a6..a5ac811478e 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 6f0640e0c1e..178777a3186 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 68285d92a43..dd07e72f585 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 431cc8207e4..f7529dfafb2 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index d9dcd2d1184..573ffc3b62e 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 2560945b6b2..72933394cbd 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.5-SNAPSHOT + 10.2.5 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 9f7578c9849..446021ce4d3 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index b64c7e4ed67..a77881720ab 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 4cc8c605c08..2159a2c8741 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index e32e9a83a10..067452470c5 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index f3e9501d7c6..79da5119db1 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.5-SNAPSHOT + 10.2.5 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 5b61ce8d94b..2338859ad77 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.5-SNAPSHOT + 10.2.5 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 47214d569cc..fc0d0dd1265 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.5-SNAPSHOT + 10.2.5 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 507debd8bad..e113b555ca7 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.5-SNAPSHOT + 10.2.5 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index e0d949ed0b8..72da6539cd1 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.5-SNAPSHOT + 10.2.5 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 4960ce2d013..f36fcc26df3 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5-SNAPSHOT + 10.2.5 plugins diff --git a/pom.xml b/pom.xml index da80da1fe46..f5679ecf5f9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.5-SNAPSHOT + 10.2.5 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.5 From 54f4a14873e9a8cad364c1272f62b9cac322a9c5 Mon Sep 17 00:00:00 2001 From: khys95 Date: Fri, 13 Dec 2024 10:37:05 +0100 Subject: [PATCH 25/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 45aa43d1d6f..492b5db7e5e 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.5 + 10.2.6-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 8beabdcbbd9..9cf42e8670d 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 52c7e15991f..b00ee224624 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.5 + 10.2.6-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index b6067658902..6e78cdc5b60 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.5 + 10.2.6-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 93a99c2e984..d667ce9440d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index c6936e95b95..01e3be16bc4 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index e0c977b6f1d..6bb3749a6a2 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index e747ac69702..a2479adee01 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 72f0a445dfc..eee6b2ad035 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index c3ba8132830..6911f3c361d 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 4aeeb765684..5c531a3ccbb 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 7a20be645f1..92b8a6b34c7 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 871b582fcd0..12c26e1f5ec 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 1755d94d2ed..c4c0e365444 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index c989566521d..72eb8d0e696 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 2af44ba6fce..a82975c2b43 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index edc0aa436a4..463aedcb94b 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 11c02d8fc92..1432e3193bc 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index bb23bba92f4..97a40f54927 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 209f5fe7759..4914a82d577 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index c107af35572..933dc263c13 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 84e4391a9b1..a3239fe303c 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 0fa19f668af..5e3106d527b 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index dd9316393b9..618b7228960 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index a60ffd8ebf3..b32d0978d10 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 7670e366043..b2a691c1f8c 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index b841ca029f6..ebdd0bb0b3a 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 6dbc3ae2eb3..f35c201645c 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index d9279754956..c2b1ce456d7 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index a10c01dcf76..c1f0ed8bdfd 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index b0565a5b5ea..eb73aaa94a1 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index b76a2e413d9..d77ee350e11 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 305a7a09078..6b4d0fbc79c 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index f005e0c0adf..a8bf8c3742c 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index bd6376037a7..d59560faeef 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.5 + 10.2.6-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 5c181afd25a..db5331578b4 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 9637d6121b4..640935a00a9 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index d3c440f5e68..a8a3ca6a4b2 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index a1a5810fcb6..498ffb99513 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index e49faeac53a..351c44d0f8b 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 75c82702533..0477d044a1d 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index e9301dfbc6a..31f1dc734f1 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 98aac28e432..68c35e358b0 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 974462749d5..5c12d7d0a8a 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index e1feeacc411..5512dd524ad 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 44cbbdba6d8..fece50a8a65 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 3ca65c6c861..b1dbf6ff839 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 4fb5355c083..9151090e514 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index a5ac811478e..f6e2cf57a06 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 178777a3186..ac172210fc6 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index dd07e72f585..e4cd073c13f 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index f7529dfafb2..1c494fba734 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 573ffc3b62e..a42b13273f7 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 72933394cbd..ce170c3a396 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.5 + 10.2.6-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 446021ce4d3..472843c9378 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index a77881720ab..896e02d83b2 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 2159a2c8741..ac4460d6ee6 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 067452470c5..09c4f576bce 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 79da5119db1..11bfd1f1a80 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.5 + 10.2.6-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 2338859ad77..ced53dc3f04 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.5 + 10.2.6-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index fc0d0dd1265..b1934f5a6f0 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.5 + 10.2.6-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index e113b555ca7..186ede92b31 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.5 + 10.2.6-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 72da6539cd1..9ecb4c0c8b1 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.5 + 10.2.6-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index f36fcc26df3..1786aed8f3f 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.5 + 10.2.6-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index f5679ecf5f9..b77a90a4e9f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.5 + 10.2.6-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.5 + 10.2 From 6d235e37ff080c178eeac71cb019c0ce639d4a3b Mon Sep 17 00:00:00 2001 From: sahakya Date: Fri, 29 Nov 2024 14:20:33 +0100 Subject: [PATCH 26/57] pool: separate cases for disk error and no space available Motivation when there are no avvailable space on a pool, the pool will go to DISABLED mode and no data could be read anymore. This is wrong we still want to be able to read data from the file. Modification this is a temp change, trying to get the info from the eroor message, sice therer is no a specific error code, and then based on that info separate two cases DISABLED AND READONLY Acked-by: Tigran Mkrtchyan Target: master. 10.2, 10.1, 10.0, 9.2 Require-book: no Require-notes: yes Commited:master@862963e --- .../util/DiskErrorCacheException.java | 14 +++++++++++ .../pool/classic/MoverRequestScheduler.java | 24 +++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/modules/dcache-vehicles/src/main/java/diskCacheV111/util/DiskErrorCacheException.java b/modules/dcache-vehicles/src/main/java/diskCacheV111/util/DiskErrorCacheException.java index 2545d2452fe..5429cb86c9a 100644 --- a/modules/dcache-vehicles/src/main/java/diskCacheV111/util/DiskErrorCacheException.java +++ b/modules/dcache-vehicles/src/main/java/diskCacheV111/util/DiskErrorCacheException.java @@ -14,8 +14,13 @@ */ public class DiskErrorCacheException extends CacheException { + private static final long serialVersionUID = -5386946146340646052L; + public enum FileStoreState { + READ_ONLY, FAILED + } + public DiskErrorCacheException(String msg) { super(CacheException.ERROR_IO_DISK, msg); } @@ -23,4 +28,13 @@ public DiskErrorCacheException(String msg) { public DiskErrorCacheException(String message, Throwable cause) { super(CacheException.ERROR_IO_DISK, message, cause); } + + public FileStoreState checkStatus(String message) { + if (message.contains("No space available.")) { + return FileStoreState.READ_ONLY; + } else { + return FileStoreState.FAILED; + } + } + } diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/MoverRequestScheduler.java b/modules/dcache/src/main/java/org/dcache/pool/classic/MoverRequestScheduler.java index 7504d09c647..dde02e9cd52 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/MoverRequestScheduler.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/MoverRequestScheduler.java @@ -513,8 +513,19 @@ public void failed(Throwable exc, Void attachment) { .setTransferStatus(CacheException.DEFAULT_ERROR_CODE, "Transfer was killed"); } else if (exc instanceof DiskErrorCacheException) { + FaultAction faultAction = null; + //TODO this is done because the FileStoreState is in another module + // to be improved + switch (((DiskErrorCacheException) exc).checkStatus(exc.getMessage())){ + case READ_ONLY: + faultAction = FaultAction.READONLY; + break; + default: + faultAction = FaultAction.DISABLED; + break; + } FaultEvent faultEvent = new FaultEvent("transfer", - FaultAction.DISABLED, exc.getMessage(), exc); + faultAction, exc.getMessage(), exc); _faultListeners.forEach(l -> l.faultOccurred(faultEvent)); } postprocess(); @@ -532,9 +543,18 @@ public void completed(Void result, Void attachment) { @Override public void failed(Throwable exc, Void attachment) { if (exc instanceof DiskErrorCacheException) { + FaultAction faultAction = null; + switch (((DiskErrorCacheException) exc).checkStatus(exc.getMessage())){ + case READ_ONLY: + faultAction = FaultAction.READONLY; + break; + default: + faultAction = FaultAction.DISABLED; + break; + } FaultEvent faultEvent = new FaultEvent( "post-processing", - FaultAction.DISABLED, + faultAction, exc.getMessage(), exc); _faultListeners.forEach( l -> l.faultOccurred(faultEvent)); From f046d0f8e2da16f0c218c8316416d31223cc02ac Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Fri, 10 Jan 2025 19:19:41 +0000 Subject: [PATCH 27/57] [maven-release-plugin] prepare release 10.2.6 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 492b5db7e5e..8f80876c307 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.6-SNAPSHOT + 10.2.6 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 9cf42e8670d..d5d9814bbc9 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index b00ee224624..20828f04487 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.6-SNAPSHOT + 10.2.6 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 6e78cdc5b60..2cc3320e0c3 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.6-SNAPSHOT + 10.2.6 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index d667ce9440d..f6310e8dea7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 01e3be16bc4..99f42b621b8 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 6bb3749a6a2..c66d9347ff5 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index a2479adee01..1c79a011536 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index eee6b2ad035..a3db5c63b10 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 6911f3c361d..22a0c36b48a 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 5c531a3ccbb..81c7a5ab548 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 92b8a6b34c7..d67379b775f 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 12c26e1f5ec..f35d37432b6 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index c4c0e365444..f3af077dce7 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 72eb8d0e696..7375f506245 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index a82975c2b43..4cd20ee3673 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 463aedcb94b..07585b3c9c0 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 1432e3193bc..0bd91682497 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 97a40f54927..f14e73288c5 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 4914a82d577..a48f3e82f3d 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 933dc263c13..82973fa2660 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index a3239fe303c..61040a1ebda 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 5e3106d527b..4bbd5c1f86d 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 618b7228960..a065ad1c232 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index b32d0978d10..5bced560a79 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index b2a691c1f8c..071856d9dd7 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index ebdd0bb0b3a..54a85491710 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index f35c201645c..9a829f67c8d 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index c2b1ce456d7..f637426ed78 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index c1f0ed8bdfd..81b60ee0d5d 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index eb73aaa94a1..9bbe3ae9de2 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index d77ee350e11..b3eee03e93e 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 6b4d0fbc79c..c53030d8dad 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index a8bf8c3742c..f577b008d4b 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index d59560faeef..bcf69e8a2e6 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.6-SNAPSHOT + 10.2.6 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index db5331578b4..b94e3321f4d 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 640935a00a9..92a282a5a3f 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index a8a3ca6a4b2..6510c02b61b 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 498ffb99513..be2b0dc5167 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index 351c44d0f8b..cad291cc6e5 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 0477d044a1d..bba60f90194 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 31f1dc734f1..412e2500a92 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 68c35e358b0..edd88dd75ca 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 5c12d7d0a8a..440e2fb9dc5 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 5512dd524ad..4080be9df78 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index fece50a8a65..76e18ea1779 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index b1dbf6ff839..19ef84fa766 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 9151090e514..b824594e2d5 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index f6e2cf57a06..69f1f611efd 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index ac172210fc6..2c995c849d4 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index e4cd073c13f..8127e21f927 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 1c494fba734..a3360c97858 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index a42b13273f7..62d85474bd1 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index ce170c3a396..d85c5caf87e 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.6-SNAPSHOT + 10.2.6 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 472843c9378..8d4cd05533d 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 896e02d83b2..792b053a206 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index ac4460d6ee6..57089b0eec9 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 09c4f576bce..4f22a2efb2e 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 11bfd1f1a80..eaf41c90330 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.6-SNAPSHOT + 10.2.6 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index ced53dc3f04..fbca08ed73f 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.6-SNAPSHOT + 10.2.6 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index b1934f5a6f0..f3fb30de474 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.6-SNAPSHOT + 10.2.6 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 186ede92b31..1580f528150 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.6-SNAPSHOT + 10.2.6 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 9ecb4c0c8b1..be5059623b0 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.6-SNAPSHOT + 10.2.6 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 1786aed8f3f..2ee09f43444 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6-SNAPSHOT + 10.2.6 plugins diff --git a/pom.xml b/pom.xml index b77a90a4e9f..c7653afde43 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.6-SNAPSHOT + 10.2.6 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.6 From c87dacb6e450b9987cc34de1d99f6b3781483a97 Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Fri, 10 Jan 2025 19:19:48 +0000 Subject: [PATCH 28/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 8f80876c307..d9d9aa5b8ce 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.6 + 10.2.7-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index d5d9814bbc9..5b33959b7e3 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 20828f04487..4687671fbc0 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.6 + 10.2.7-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 2cc3320e0c3..7369966984e 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.6 + 10.2.7-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index f6310e8dea7..94dfac6e395 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 99f42b621b8..3956e790521 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index c66d9347ff5..d5d5c5782ab 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 1c79a011536..3440f48123f 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index a3db5c63b10..12a65aeb541 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 22a0c36b48a..651e3f6b61f 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 81c7a5ab548..4c68701ca89 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index d67379b775f..397766edb6a 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index f35d37432b6..a5efa442091 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index f3af077dce7..c7f4c21407f 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 7375f506245..f7a0ec21ad8 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 4cd20ee3673..2313f960ed7 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 07585b3c9c0..6bddc3b0711 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 0bd91682497..b16b999acfe 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index f14e73288c5..d95978846d5 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index a48f3e82f3d..47f1c7ad9e7 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 82973fa2660..7fcbbb8bd79 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 61040a1ebda..a78c01eb533 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 4bbd5c1f86d..c31f757b985 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index a065ad1c232..a05ece4c0a5 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index 5bced560a79..9549da344b6 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 071856d9dd7..2662afb1e8a 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 54a85491710..c0e2c62d4fc 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 9a829f67c8d..95cd9f97376 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index f637426ed78..0696ec937f7 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 81b60ee0d5d..8226a856467 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 9bbe3ae9de2..ecc69ec7968 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index b3eee03e93e..7b71ebb18ad 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index c53030d8dad..04ef4067ec3 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index f577b008d4b..cc67527df6b 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index bcf69e8a2e6..552f91b0c6c 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.6 + 10.2.7-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index b94e3321f4d..8c91202ad9f 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 92a282a5a3f..b46365916ee 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 6510c02b61b..0c8fbdf586a 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index be2b0dc5167..dd03964e581 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index cad291cc6e5..c5280127b09 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index bba60f90194..e20fcbb7156 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 412e2500a92..6f7d2203451 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index edd88dd75ca..0af4ca69bc3 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 440e2fb9dc5..440eaba4d40 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 4080be9df78..25483b6fae0 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 76e18ea1779..3a4af7691cc 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 19ef84fa766..9065f81003c 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index b824594e2d5..c1ad0688268 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 69f1f611efd..17b158f46b6 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 2c995c849d4..c397eaf84a8 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 8127e21f927..f8c622a697c 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index a3360c97858..7b89ca24445 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 62d85474bd1..de8a068a1ad 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index d85c5caf87e..6812a49a08f 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.6 + 10.2.7-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 8d4cd05533d..00d88d6e4d2 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 792b053a206..76277a55c6a 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 57089b0eec9..3d5fd85b8bb 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 4f22a2efb2e..5d2e0db12bf 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index eaf41c90330..8beb6e8ec86 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.6 + 10.2.7-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index fbca08ed73f..7e2e9e094ab 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.6 + 10.2.7-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index f3fb30de474..5129bdc5256 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.6 + 10.2.7-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 1580f528150..196caaad64a 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.6 + 10.2.7-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index be5059623b0..f26edad3fbc 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.6 + 10.2.7-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 2ee09f43444..284cfe40c20 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.6 + 10.2.7-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index c7653afde43..9e85d1a1cd5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.6 + 10.2.7-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.6 + 10.2 From 4ea4d6f1b5e48f92363cd41bbe6222211de07c5c Mon Sep 17 00:00:00 2001 From: Dmitry Litvintsev Date: Mon, 27 Jan 2025 15:55:42 -0600 Subject: [PATCH 29/57] Bulk: PinManagerActivity do not set state of files that are pinned indefinitely to SKIPPED Motivaton: ---------- Setting files having infinite pin to state SKIPPED seems to prevents them from being staged if pool goes down. Modification: ------------- Set state to COMPLETED if pin lifetime is infinite. Result: ------ As tested and reported by DESY, the staging of files that happen to be on offline pools works properly Target: trunk Request: 10.2 Request: 9.2 Patch: https://rb.dcache.org/r/14365/ Require-notes: yes Require-book: no --- .../services/bulk/activity/plugin/pin/PinManagerActivity.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinManagerActivity.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinManagerActivity.java index dcbbd8fbfd9..c8a95205245 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinManagerActivity.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinManagerActivity.java @@ -112,9 +112,6 @@ public void handleCompletion(BulkRequestTarget target, Future future) { reply = getUninterruptibly(future); if (reply.getReturnCode() != 0) { target.setErrorObject(reply.getErrorObject()); - } else if (reply instanceof PinManagerPinMessage - && ((PinManagerPinMessage) reply).getLifetime() == -1L) { - target.setState(SKIPPED); } else { target.setState(State.COMPLETED); } From 90984db935cb3d9abdcb841367cadec23af9710f Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Fri, 31 Jan 2025 10:49:37 +0100 Subject: [PATCH 30/57] cells: fix race condition between thread start and flag check Motivation: If newly started thread runs before `running` flag is set, then tunnel with shutdown instantly. Thread-1: Create T2 --> | T2.start() | --> set running flag Thread-2: | check flag; exit | Modification: set `running` before thread starts. Result: race is fixed Issue: #5326 Acked-by: Paul Millar Target: master, 10.2 Require-book: no Require-notes: yes (cherry picked from commit 2440b2227727c929132919f569a643083efc9138) Signed-off-by: Tigran Mkrtchyan --- .../main/java/dmg/cells/network/LocationManagerConnector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java b/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java index 6b0be280351..b1a200b272b 100644 --- a/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java +++ b/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java @@ -54,8 +54,8 @@ public LocationManagerConnector(String cellName, String args, SocketFactory sock @Override protected void started() { _thread = getNucleus().newThread(this, "TunnelConnector-" + _domain); - _thread.start(); _isRunning = true; + _thread.start(); } private StreamEngine connect() From 6277047ffca0ff2e13488cd37ba44cd45c9d7427 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Thu, 30 Jan 2025 10:26:30 +0100 Subject: [PATCH 31/57] dcache-billing-indexer: add explicit dependency on commons-io Motivation: the dcache-billing-indexer uses commons-compress to handle bz2 files, and has non-optional dependency on commons-io, which is missing. So we get: ``` /usr/sbin/dcache-billing-indexer -index /var/lib/dcache/billing/2025/01/billing-2025.01.27.bz2 ERROR - Uncaught exception java.lang.NoClassDefFoundError: org/apache/commons/io/input/CloseShieldInputStream at org.dcache.services.billing.text.Indexer$7.openStream(Indexer.java:526) at com.google.common.io.ByteSource$AsCharSource.openStream(ByteSource.java:474) at com.google.common.io.CharSource.readLines(CharSource.java:371) at org.dcache.services.billing.text.Indexer.produceIndex(Indexer.java:510) at org.dcache.services.billing.text.Indexer.index(Indexer.java:396) at org.dcache.services.billing.text.Indexer.(Indexer.java:211) at org.dcache.services.billing.text.Indexer.main(Indexer.java:686) Caused by: java.lang.ClassNotFoundException: org.apache.commons.io.input.CloseShieldInputStream at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:641) at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:188) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:525) ... 7 common frames omitted ``` Modification: explicitly add commons-io into dcache-billing-indexer classpath. Result: dcache-billing-indexer can process compressed files. Fixes: #7738 Acked-by: Lea Morschel Tested-by: Ville Salmela Target: master, 10.2 Require-book: no Require-notes: yes (cherry picked from commit 153a018b0687e501c1b104e5fb36a2cddb166373) Signed-off-by: Tigran Mkrtchyan --- skel/share/lib/billing.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skel/share/lib/billing.sh b/skel/share/lib/billing.sh index a619e87c609..5ae4c87bfa9 100644 --- a/skel/share/lib/billing.sh +++ b/skel/share/lib/billing.sh @@ -2,7 +2,7 @@ billing_indexer() # $* = arguments { CLASSPATH="$(printLimitedClassPath slf4j-api logback-classic logback-core logback-console-config \ - jul-to-slf4j commons-compress gson spring-core guava dcache-common common-cli cells dcache-core \ + jul-to-slf4j commons-compress commons-io gson spring-core guava dcache-common common-cli cells dcache-core \ curator-client)" \ quickJava \ "-Ddcache.home=${DCACHE_HOME}" \ From af9200c84fac72bc1431e95f65d08b598052f11e Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Mon, 3 Feb 2025 15:31:47 +0000 Subject: [PATCH 32/57] [maven-release-plugin] prepare release 10.2.7 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index d9d9aa5b8ce..e1ff815b779 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.7-SNAPSHOT + 10.2.7 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 5b33959b7e3..993f6374ece 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 4687671fbc0..5959c04050e 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.7-SNAPSHOT + 10.2.7 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 7369966984e..8d4910118ba 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.7-SNAPSHOT + 10.2.7 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 94dfac6e395..dd89c9a75ef 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 3956e790521..8762984dbef 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index d5d5c5782ab..bd3b69ecd02 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 3440f48123f..d4628093737 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 12a65aeb541..c97f1b1b26f 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 651e3f6b61f..a92cb4409d5 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 4c68701ca89..7302d195749 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 397766edb6a..7d6181e08d4 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index a5efa442091..15c7b28da70 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index c7f4c21407f..dd4066eabb3 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index f7a0ec21ad8..0482f7ea6ca 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 2313f960ed7..b06a9487a5e 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 6bddc3b0711..6aa3c308b5c 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index b16b999acfe..b28439bc596 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index d95978846d5..13d7cca9b3d 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 47f1c7ad9e7..859088fd9df 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 7fcbbb8bd79..9f044733b35 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index a78c01eb533..5c221e7386b 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index c31f757b985..96b26794080 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index a05ece4c0a5..51c9bc9d713 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index 9549da344b6..2971dd7c945 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 2662afb1e8a..767d647a8c9 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index c0e2c62d4fc..acb52a1cd80 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 95cd9f97376..82a6201edcc 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 0696ec937f7..0b148827353 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 8226a856467..394e32cdb52 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index ecc69ec7968..17f2bea1b94 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 7b71ebb18ad..992606b482b 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 04ef4067ec3..c1d16057033 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index cc67527df6b..83a57d86942 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 552f91b0c6c..dd84fd125d0 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.7-SNAPSHOT + 10.2.7 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 8c91202ad9f..fcabeef1af9 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index b46365916ee..df3fed2d353 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 0c8fbdf586a..9d42abe02e8 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index dd03964e581..74f8f45b4dd 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index c5280127b09..ad96020e22a 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index e20fcbb7156..7c51fb580a1 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 6f7d2203451..658643ccad0 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 0af4ca69bc3..652e5ce3a67 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 440eaba4d40..841e4c1fb93 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 25483b6fae0..8f6db7af8aa 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 3a4af7691cc..4164699375d 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 9065f81003c..7a1febc7ad7 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index c1ad0688268..d4bf5b813ed 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 17b158f46b6..94f8605ea3a 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index c397eaf84a8..6668fdb7342 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index f8c622a697c..40f8e3a8c4f 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 7b89ca24445..ff3dea7afb6 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index de8a068a1ad..47a3f8bd976 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 6812a49a08f..68b36c588c8 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.7-SNAPSHOT + 10.2.7 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 00d88d6e4d2..e134497e603 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 76277a55c6a..f3ab11a3840 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 3d5fd85b8bb..f2fcd37bebf 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 5d2e0db12bf..2ed37aff9af 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 8beb6e8ec86..8c5485a9870 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.7-SNAPSHOT + 10.2.7 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 7e2e9e094ab..cfbdff8c565 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.7-SNAPSHOT + 10.2.7 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 5129bdc5256..aa6d7ad9b18 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.7-SNAPSHOT + 10.2.7 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 196caaad64a..25353bae389 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.7-SNAPSHOT + 10.2.7 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index f26edad3fbc..3241cde3a1b 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.7-SNAPSHOT + 10.2.7 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 284cfe40c20..83d7c841173 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7-SNAPSHOT + 10.2.7 plugins diff --git a/pom.xml b/pom.xml index 9e85d1a1cd5..b2affa73610 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.7-SNAPSHOT + 10.2.7 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.7 From 501fc7e6287a55d7d72929cf6ab93505ce0b4308 Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Mon, 3 Feb 2025 15:31:57 +0000 Subject: [PATCH 33/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index e1ff815b779..f087b7e4fc2 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.7 + 10.2.8-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 993f6374ece..a281beccf1c 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 5959c04050e..8c39686a9b2 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.7 + 10.2.8-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 8d4910118ba..57c4394578e 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.7 + 10.2.8-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index dd89c9a75ef..1e8997359df 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 8762984dbef..d1a1b4ddc39 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index bd3b69ecd02..3801c42d4b1 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index d4628093737..bc3da0c4e5f 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index c97f1b1b26f..30b2e8e0f49 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index a92cb4409d5..36d104020ae 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 7302d195749..eb2c945cd1b 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 7d6181e08d4..4df6999fcea 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 15c7b28da70..44ba929109e 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index dd4066eabb3..a3795fbe2e5 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 0482f7ea6ca..252ee85f79a 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index b06a9487a5e..31e0699a4c4 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 6aa3c308b5c..8289424f337 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index b28439bc596..55ebab919d0 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 13d7cca9b3d..b14cb9e4c31 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 859088fd9df..e927dca2d54 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 9f044733b35..15ac0e33895 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 5c221e7386b..1e671b5c4a5 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 96b26794080..cbcc38b7357 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 51c9bc9d713..78fc2053816 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index 2971dd7c945..c131ada08b1 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 767d647a8c9..4b8929310f1 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index acb52a1cd80..8d3c9fbd0e1 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 82a6201edcc..3c3cbd0daf1 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 0b148827353..8f53dbffc33 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 394e32cdb52..fc625ca5bab 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 17f2bea1b94..899cdb16662 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 992606b482b..971c234ba5d 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index c1d16057033..d01128a0dd2 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 83a57d86942..9d182fa2dab 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index dd84fd125d0..59ed95f7c91 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.7 + 10.2.8-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index fcabeef1af9..17ff41f084a 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index df3fed2d353..c85982e4659 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 9d42abe02e8..548042d9942 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 74f8f45b4dd..339fdd02809 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index ad96020e22a..a2997fc1126 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 7c51fb580a1..86cf189b0a8 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 658643ccad0..1859a6f473e 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 652e5ce3a67..f2ab22ba1fa 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 841e4c1fb93..2bf11343c3a 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 8f6db7af8aa..46b99a4d258 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 4164699375d..72de1ed1198 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 7a1febc7ad7..f132d6800b7 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index d4bf5b813ed..3b4f6f02d3c 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 94f8605ea3a..fdf1a9db17a 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 6668fdb7342..5072c63d917 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 40f8e3a8c4f..bb1d4d51a2b 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index ff3dea7afb6..ba73e2095c1 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 47a3f8bd976..933ad04e09b 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 68b36c588c8..6aa468b5cc6 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.7 + 10.2.8-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index e134497e603..16283b99d3b 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index f3ab11a3840..eab1f087ac2 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index f2fcd37bebf..d897aa50181 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 2ed37aff9af..1e41b2d0eb1 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 8c5485a9870..76e5e13f0c9 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.7 + 10.2.8-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index cfbdff8c565..2e5fe0d0693 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.7 + 10.2.8-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index aa6d7ad9b18..7422e15806d 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.7 + 10.2.8-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 25353bae389..e67c0e98988 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.7 + 10.2.8-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 3241cde3a1b..abca5af17fe 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.7 + 10.2.8-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 83d7c841173..26fb2b3aed5 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.7 + 10.2.8-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index b2affa73610..c3b5456bfe4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.7 + 10.2.8-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.7 + 10.2 From 59a628dcfb84123605e621dd7c676568985e1410 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Thu, 6 Feb 2025 10:24:41 +0100 Subject: [PATCH 34/57] pool: add workaround space mismanagementd by XFS (and others?) Motivation: Some filesystems miscalculate/report free space in respect tu used space: ``` $ df /dcache/pool-a Filesystem 1K-blocks Used Available Use% Mounted on /dev/sda1 558602657792 558397210232 205447560 100% /dcache/pool-a $ du -s /dcache/pool-a 554502450484 /dcache/pool-a $ bc 558602657792 - 554502450484 4100207308 ``` File system reports 200GB of the free space, however, total - real used gives ~4TB. Thus dCache assumes 4TB and write the file system full... ==> IO error Modification: use an `effective` free space, which is the minimum between disk reported and internal accounting free spaces. Result: Pool uses the effective free space instead of mathematically correct value. Acked-by: Dmitry Litvintsev Target: master, 10.2 Require-book: no Require-notes: yes (cherry picked from commit 208bfbe64aed53dba865a497903e83c0573dad89) Signed-off-by: Tigran Mkrtchyan --- .../dcache/pool/repository/v5/ReplicaRepository.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/dcache/src/main/java/org/dcache/pool/repository/v5/ReplicaRepository.java b/modules/dcache/src/main/java/org/dcache/pool/repository/v5/ReplicaRepository.java index 12aa4f1524e..a00c41f02bc 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/repository/v5/ReplicaRepository.java +++ b/modules/dcache/src/main/java/org/dcache/pool/repository/v5/ReplicaRepository.java @@ -838,8 +838,16 @@ public SpaceRecord getSpaceRecord() { SpaceRecord space = _account.getSpaceRecord(); long lru = (System.currentTimeMillis() - _sweeper.getLru()) / 1000L; long gap = _gap.orElse(Math.min(space.getTotalSpace() / 4, DEFAULT_GAP)); + + // REVISIT: This workaround addresses a filesystem behavior where the effective free space + // may be smaller than the total - used. + // To ensure correctness, we take the minimum of the disk reported and + // the dCache accounting expected free spaces. + long storeFreeSpace = _store.getFreeSpace(); + long effectiveFreeSpace = Math.min(storeFreeSpace, space.getFreeSpace()); + return new SpaceRecord(space.getTotalSpace(), - space.getFreeSpace(), + effectiveFreeSpace, space.getPreciousSpace(), space.getRemovableSpace(), lru, From dfc5d6990131d1af28ba5428c6d90561041c76b1 Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Tue, 11 Feb 2025 10:17:08 +0000 Subject: [PATCH 35/57] [maven-release-plugin] prepare release 10.2.8 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index f087b7e4fc2..18f1685f533 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.8-SNAPSHOT + 10.2.8 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index a281beccf1c..9962f55ed21 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 8c39686a9b2..12027a3152a 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.8-SNAPSHOT + 10.2.8 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 57c4394578e..0a016a9b4ef 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.8-SNAPSHOT + 10.2.8 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 1e8997359df..ebfeec21ed7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index d1a1b4ddc39..c4d89c2ec92 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 3801c42d4b1..327b6103626 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index bc3da0c4e5f..180ce407e8c 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 30b2e8e0f49..dc47c4abc01 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 36d104020ae..0b2217ce77c 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index eb2c945cd1b..228e07805a1 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 4df6999fcea..a9f68d24070 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 44ba929109e..b87a1fcdfce 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index a3795fbe2e5..f582f38f5a3 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 252ee85f79a..724a8eba369 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 31e0699a4c4..d6b83f38202 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 8289424f337..cefc09f3b60 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 55ebab919d0..49cba765360 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index b14cb9e4c31..e721b5cd038 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index e927dca2d54..6eef7f6ff34 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 15ac0e33895..1165361ff72 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 1e671b5c4a5..beecf6eed05 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index cbcc38b7357..36a827a7e1d 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 78fc2053816..276a8dfe326 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index c131ada08b1..aae27354dcd 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 4b8929310f1..e19ce7f471e 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 8d3c9fbd0e1..e698f61dbdc 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 3c3cbd0daf1..aae35a35817 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 8f53dbffc33..8c6f3510ed3 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index fc625ca5bab..55aa8faead2 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 899cdb16662..25eaf7eb9bc 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 971c234ba5d..9b147fb796a 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index d01128a0dd2..4b283f7be18 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 9d182fa2dab..0c44b3e9119 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 59ed95f7c91..515765dbdc8 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.8-SNAPSHOT + 10.2.8 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 17ff41f084a..845d5745771 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index c85982e4659..ab03224612b 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 548042d9942..9bf4ae37cff 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 339fdd02809..80258648cbb 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index a2997fc1126..bdb196e1555 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 86cf189b0a8..e7b1c8e706a 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 1859a6f473e..f73aafaa3a1 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index f2ab22ba1fa..e4a79710edf 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 2bf11343c3a..f80a17f3181 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 46b99a4d258..1c664f03b86 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 72de1ed1198..b74a106b408 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index f132d6800b7..52a56a5aac5 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 3b4f6f02d3c..ff217305b03 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index fdf1a9db17a..dde7c2f4299 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 5072c63d917..0c4df3023d4 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index bb1d4d51a2b..56d97c7456a 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index ba73e2095c1..59d49f08f2d 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 933ad04e09b..078ac9720e4 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 6aa468b5cc6..84478ebe860 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.8-SNAPSHOT + 10.2.8 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 16283b99d3b..d36f20b653c 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index eab1f087ac2..7b88845bb32 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index d897aa50181..18a0fe9deaf 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 1e41b2d0eb1..83a021d392c 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 76e5e13f0c9..953a1f03db1 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.8-SNAPSHOT + 10.2.8 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 2e5fe0d0693..2f73f89d35a 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.8-SNAPSHOT + 10.2.8 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 7422e15806d..1e1ef176d6b 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.8-SNAPSHOT + 10.2.8 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index e67c0e98988..6b7d044f7ae 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.8-SNAPSHOT + 10.2.8 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index abca5af17fe..eb290de356c 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.8-SNAPSHOT + 10.2.8 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 26fb2b3aed5..de23571d3a8 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8-SNAPSHOT + 10.2.8 plugins diff --git a/pom.xml b/pom.xml index c3b5456bfe4..ab72c272144 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.8-SNAPSHOT + 10.2.8 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.8 From 744e4a94f898a1fe3975a933ebd3f19103d683ce Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Tue, 11 Feb 2025 10:17:15 +0000 Subject: [PATCH 36/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 18f1685f533..a446bcec3bb 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.8 + 10.2.9-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 9962f55ed21..6e5ef33dff7 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 12027a3152a..93ee52a8d02 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.8 + 10.2.9-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 0a016a9b4ef..8ca90e903fb 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.8 + 10.2.9-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index ebfeec21ed7..2b1ad056f08 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index c4d89c2ec92..b124922097b 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 327b6103626..90d1cd4b7e9 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 180ce407e8c..6592a65b72d 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index dc47c4abc01..a79d5d1e0e6 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 0b2217ce77c..0af000f2556 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 228e07805a1..a0800137b3b 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index a9f68d24070..1396dfa9440 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index b87a1fcdfce..40342f540e1 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index f582f38f5a3..17e34f6d3b1 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 724a8eba369..03e7d2aea26 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index d6b83f38202..8b7d8a5a378 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index cefc09f3b60..f31e671d60b 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 49cba765360..1ec895bccdb 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index e721b5cd038..035d11c0602 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 6eef7f6ff34..31eb911828c 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 1165361ff72..265ecc2148b 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index beecf6eed05..a3a014f6f91 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 36a827a7e1d..8988c3f51d9 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 276a8dfe326..7fe029643ee 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index aae27354dcd..e0f90f30e2d 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index e19ce7f471e..a503390572c 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index e698f61dbdc..1d4617d5ee2 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index aae35a35817..241616b7228 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 8c6f3510ed3..f8b2f23a710 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 55aa8faead2..bb83508c68e 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 25eaf7eb9bc..700d2d6eb74 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 9b147fb796a..51157c4b080 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 4b283f7be18..e7752ba216d 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 0c44b3e9119..08ac680e002 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 515765dbdc8..9f6530b8524 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.8 + 10.2.9-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 845d5745771..4a3afab154b 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index ab03224612b..d74e3f1f453 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 9bf4ae37cff..b58ae8344af 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 80258648cbb..07326919a17 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index bdb196e1555..b434ec73f20 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index e7b1c8e706a..83225e1f063 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index f73aafaa3a1..2e880739345 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index e4a79710edf..a11883c33b5 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index f80a17f3181..2e40ec2bdab 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 1c664f03b86..fb3a30df311 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index b74a106b408..eed06f0b9fb 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 52a56a5aac5..95e2d5fa621 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index ff217305b03..9e4e28ddcea 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index dde7c2f4299..5f958be6b1f 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 0c4df3023d4..a635e880d78 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 56d97c7456a..822e7f170e5 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 59d49f08f2d..a760cdfb31e 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 078ac9720e4..50ed8f8b5ac 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 84478ebe860..2e78ea1a71b 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.8 + 10.2.9-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index d36f20b653c..82af3d72e39 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 7b88845bb32..0600bd80235 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 18a0fe9deaf..bf0c7d0982c 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 83a021d392c..a54aa331d6a 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 953a1f03db1..040db5d7068 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.8 + 10.2.9-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 2f73f89d35a..ba82a13d77b 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.8 + 10.2.9-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 1e1ef176d6b..9fc1733b24b 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.8 + 10.2.9-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 6b7d044f7ae..f063c4ee031 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.8 + 10.2.9-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index eb290de356c..26a58ae57d7 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.8 + 10.2.9-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index de23571d3a8..8ac44f3bde4 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.8 + 10.2.9-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index ab72c272144..8db8fadae96 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.8 + 10.2.9-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.8 + 10.2 From b679ea08c4e2e9a21e55624cf9e250439cf89bd3 Mon Sep 17 00:00:00 2001 From: khys95 Date: Fri, 7 Feb 2025 11:41:14 +0100 Subject: [PATCH 37/57] qos: Uncaught NullPointerException due to QoS being set to null MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Motivation: null is a valid value for FileAttribute.QOS_POLICY, however, it is not a valid value to be encapsulated within an Optional. Modification: Update Optional.of for Optional.ofNullable since the later will take into account null as a value and return Optional.empty() where Optional.of will not and hence throw the NPE. Result: QosPolicy can still be set to null and we will no longer show a NPE. Acked-by: Dmitry Litvintsev Target: master, 10.2, 10.1, 10.0 and 9.2 Require-book: no Require-notes: no (cherry picked from commit 466c97e39033d718e97c73a38a0b902f4007d537) Signed-off-by: khys95 --- .../src/main/java/org/dcache/vehicles/FileAttributes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java b/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java index a448fb0b892..e523e7b3059 100644 --- a/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java +++ b/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java @@ -831,7 +831,7 @@ public String toString() { @Nonnull private Optional toOptional(FileAttribute attribute, T value) { - return isDefined(attribute) ? Optional.of(value) : Optional.empty(); + return isDefined(attribute) ? Optional.ofNullable(value) : Optional.empty(); } private void readObject(ObjectInputStream stream) From 4c0254ddfb74ac2fda42e4d9c41f131330fddbd1 Mon Sep 17 00:00:00 2001 From: khys95 Date: Thu, 20 Feb 2025 11:11:56 +0100 Subject: [PATCH 38/57] [maven-release-plugin] prepare release 10.2.9 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index a446bcec3bb..473598d6483 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.9-SNAPSHOT + 10.2.9 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 6e5ef33dff7..14a94d999b5 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 93ee52a8d02..7e0132f1ac9 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.9-SNAPSHOT + 10.2.9 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 8ca90e903fb..7c126366da2 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.9-SNAPSHOT + 10.2.9 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 2b1ad056f08..7a98a65cf57 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index b124922097b..3ae38c1774a 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 90d1cd4b7e9..ef277121f6d 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 6592a65b72d..fc8099c6775 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index a79d5d1e0e6..a10f5d23497 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 0af000f2556..3479878bfa0 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index a0800137b3b..e4a6b9e06b7 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 1396dfa9440..8941882c51c 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 40342f540e1..d3b1998afa1 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 17e34f6d3b1..1f8c79a2382 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 03e7d2aea26..893f2c42561 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 8b7d8a5a378..d88dc2784d4 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index f31e671d60b..bf738e0c672 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 1ec895bccdb..ff4efc1aa96 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 035d11c0602..de1a8cfa051 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 31eb911828c..669b1fae7fe 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 265ecc2148b..d37d3ce314e 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index a3a014f6f91..b7748a31cc0 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 8988c3f51d9..74bafa27922 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 7fe029643ee..db4ebc6d923 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index e0f90f30e2d..a9e09a47477 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index a503390572c..5ffea36928e 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 1d4617d5ee2..ff4fc031d8b 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 241616b7228..2d28b52bb91 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index f8b2f23a710..bf05ff05ef0 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index bb83508c68e..5822062e6cc 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 700d2d6eb74..2f77d2a68e6 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 51157c4b080..c5e7e7f82d2 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index e7752ba216d..d13e694fd42 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 08ac680e002..6a752225924 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 9f6530b8524..ce3b8e4c5e3 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.9-SNAPSHOT + 10.2.9 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 4a3afab154b..6df9e1aac6f 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index d74e3f1f453..353aa7df11a 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index b58ae8344af..9a5298c18af 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 07326919a17..d9f6bc743b0 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index b434ec73f20..a62c47661da 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 83225e1f063..8c661e9a448 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 2e880739345..b90c0dfbe5f 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index a11883c33b5..aa7073b9eb9 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 2e40ec2bdab..bf6e3fa0061 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index fb3a30df311..52dc0ed9ad0 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index eed06f0b9fb..1819b22b7de 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 95e2d5fa621..05097117594 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 9e4e28ddcea..6b644a4e02b 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 5f958be6b1f..9da8acb35e3 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index a635e880d78..4d3d3a769fd 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 822e7f170e5..bca6c248a35 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index a760cdfb31e..6ee36d8ed2b 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 50ed8f8b5ac..cfeafc5fb00 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 2e78ea1a71b..d76be5c734a 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.9-SNAPSHOT + 10.2.9 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 82af3d72e39..438d4c9e248 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 0600bd80235..34c8c922a71 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index bf0c7d0982c..e27a8905dec 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index a54aa331d6a..1884e949686 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 040db5d7068..d02915c9d09 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.9-SNAPSHOT + 10.2.9 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index ba82a13d77b..a4ebd289ee2 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.9-SNAPSHOT + 10.2.9 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 9fc1733b24b..e5bac37fa8e 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.9-SNAPSHOT + 10.2.9 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index f063c4ee031..659b43bc8fa 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.9-SNAPSHOT + 10.2.9 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 26a58ae57d7..ee661294098 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.9-SNAPSHOT + 10.2.9 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 8ac44f3bde4..f620e83b1b3 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9-SNAPSHOT + 10.2.9 plugins diff --git a/pom.xml b/pom.xml index 8db8fadae96..aa449366f29 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.9-SNAPSHOT + 10.2.9 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.9 From d2bbc9fa45b6d0e3f236199b3722928edc2bd007 Mon Sep 17 00:00:00 2001 From: khys95 Date: Thu, 20 Feb 2025 11:12:00 +0100 Subject: [PATCH 39/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 473598d6483..07662673701 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.9 + 10.2.10-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 14a94d999b5..fc88337c034 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 7e0132f1ac9..139de886e1e 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.9 + 10.2.10-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 7c126366da2..65dc95384f3 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.9 + 10.2.10-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 7a98a65cf57..5c2e4f445fe 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 3ae38c1774a..67f263d3bae 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index ef277121f6d..53597ba8b44 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index fc8099c6775..11cb5d86b6a 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index a10f5d23497..d12c402b8ca 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 3479878bfa0..347eb9ba1b3 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index e4a6b9e06b7..318f0b3fdd5 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 8941882c51c..766ca5c3c2d 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index d3b1998afa1..68b91ddad44 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 1f8c79a2382..a729bde14b8 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 893f2c42561..27a5feb47c0 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index d88dc2784d4..a2412999df1 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index bf738e0c672..2caaefc07e3 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index ff4efc1aa96..b1eeeebd9eb 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index de1a8cfa051..345d3f67e55 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 669b1fae7fe..800fb759839 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index d37d3ce314e..c2890ddb39f 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index b7748a31cc0..b94763b5638 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 74bafa27922..c43a4ad0ca1 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index db4ebc6d923..20c3b098fa4 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index a9e09a47477..4a491917464 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 5ffea36928e..f36ed2a48be 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index ff4fc031d8b..1bb028bebe3 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 2d28b52bb91..d1645e99f37 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index bf05ff05ef0..0bc89ea3ab1 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 5822062e6cc..038e27b351c 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 2f77d2a68e6..02cdf584646 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index c5e7e7f82d2..9b84e01da8e 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index d13e694fd42..8db4ccc81a0 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 6a752225924..d8a656bfef8 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index ce3b8e4c5e3..c947d357855 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.9 + 10.2.10-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 6df9e1aac6f..2182928f3ef 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 353aa7df11a..744733c01c8 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 9a5298c18af..ab0d07ed5f8 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index d9f6bc743b0..7f17b9c9a5c 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index a62c47661da..1eb16e3dc6d 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 8c661e9a448..d1a33da4302 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index b90c0dfbe5f..64c0d56a078 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index aa7073b9eb9..ae12b9ffc6e 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index bf6e3fa0061..3d5ec284ce2 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 52dc0ed9ad0..9f3227d408f 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 1819b22b7de..9e7ea54fd91 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 05097117594..fb49515878c 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 6b644a4e02b..eeee1010d77 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 9da8acb35e3..5d2b8d5b339 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 4d3d3a769fd..1657b925a8b 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index bca6c248a35..fe193ebd6c2 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 6ee36d8ed2b..cf89a9a459d 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index cfeafc5fb00..a6c19566174 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index d76be5c734a..8ce233f8f70 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.9 + 10.2.10-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 438d4c9e248..cf9d114b3bd 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 34c8c922a71..939bce7afe1 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index e27a8905dec..6925fb97585 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 1884e949686..4f95ac9ac3c 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index d02915c9d09..61dc1996bb0 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.9 + 10.2.10-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index a4ebd289ee2..232299a86bf 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.9 + 10.2.10-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index e5bac37fa8e..9fccd6b6353 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.9 + 10.2.10-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 659b43bc8fa..36a91af56d6 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.9 + 10.2.10-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index ee661294098..2a74859be36 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.9 + 10.2.10-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index f620e83b1b3..185f5fffbcc 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.9 + 10.2.10-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index aa449366f29..e3333e3bfa5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.9 + 10.2.10-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.9 + 10.2 From 18601a941d9471893936001ebbebb4874a6dece1 Mon Sep 17 00:00:00 2001 From: Marina Sahakyan Date: Sat, 1 Feb 2025 12:56:43 +0100 Subject: [PATCH 40/57] pool:fix outofspace error sending pool into diasbled mode Motivation we are seeing the this error wen there is no space on the pool left, and pool goes into disabled mode, AB56598C55] WRITE failed : IOError AB56598C55] Transfer failed due to a disk error: CacheException(rc=204;msg=Disk I/O Error ) AB56598C55] Pool mode changed to disabled(fetch,store,stage,p2p-client,p2p-server): Pool disabled: Disk I/O Error AB56598C55] Pool: dcache-xfel487-01, fault occurred in transfer: Disk I/O Error . Pool disabled: , cause: CacheException(rc=204;msg=Disk I/O Error ) however we want it to go into READ-ONLY mode and files could stay accesable. the privous patch (https://rb.dcache.org/r/14357/diff/3/#index_header) did not fix the issue. so the new changes are still a try to fix the issue. Acked-by: Dmitry Litvintsev Target: master. 10.2, 10.1, 10.0, 9.2 Require-book: no Require-notes: yes Patch: https://rb.dcache.org/r/14368/ --- .../pool/movers/DCapProtocol_3_nio.java | 31 +++++++++++++++---- .../pool/classic/MoverRequestScheduler.java | 15 +++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/modules/dcache-dcap/src/main/java/org/dcache/pool/movers/DCapProtocol_3_nio.java b/modules/dcache-dcap/src/main/java/org/dcache/pool/movers/DCapProtocol_3_nio.java index c4b7c4422ac..97633103d4a 100644 --- a/modules/dcache-dcap/src/main/java/org/dcache/pool/movers/DCapProtocol_3_nio.java +++ b/modules/dcache-dcap/src/main/java/org/dcache/pool/movers/DCapProtocol_3_nio.java @@ -367,7 +367,12 @@ public void runIO(FileAttributes fileAttributes, String errmsg = "WRITE failed : " + (ioException == null ? "IOError" : Exceptions.messageOrClassName(ioException)); int rc; - if (ioException instanceof OutOfDiskException) { + // TODO: To be checked (in production) if the error is an IOException; + // we can check it only by the error message. + if (ioException instanceof OutOfDiskException || + (ioException != null && ioException.getCause().getMessage() + .contains("No space available.")) + ) { _log.debug(errmsg); rc = CacheException.RESOURCE; } else { @@ -535,7 +540,11 @@ public void runIO(FileAttributes fileAttributes, "SEEK_AND_WRITE failed : " + (ioException == null ? "IOError" : Exceptions.messageOrClassName(ioException)); int rc; - if (ioException instanceof OutOfDiskException) { + // TODO: To be checked (in production) if the error is an IOException; + // we can check it only by the error message. + if (ioException instanceof OutOfDiskException || + (ioException != null && ioException.getCause().getMessage() + .contains("No space available."))) { _log.debug(errmsg); rc = CacheException.RESOURCE; } else { @@ -678,10 +687,19 @@ public void runIO(FileAttributes fileAttributes, if (ioException instanceof OutOfDiskException) { throw ioException; } else { - throw new - DiskErrorCacheException( - "Disk I/O Error " + - (ioException != null ? ioException.toString() : "")); + //TODO since the OutOfDiskException is not catched the error ist IOexception + // this is a workaround + if (ioException != null && ioException.getCause().getMessage().contains("No space available.")) { + throw new + OutOfDiskException( + "No space available." + + ioException.toString()); + } else { + throw new + DiskErrorCacheException( + "Disk I/O Error " + + (ioException != null ? ioException.toString() : "")); + } } } else { if (ioException != null && !(ioException instanceof EOFException)) { @@ -922,6 +940,7 @@ private void doTheWrite(RepositoryChannel fileChannel, // clear interrupted state Thread.interrupted(); throw new InterruptedException(ee.getMessage()); + // TODO: In the case of a "no space left" error message, this will not work. } catch (OutOfDiskException e) { _io_ok = false; ioException = e; diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/MoverRequestScheduler.java b/modules/dcache/src/main/java/org/dcache/pool/classic/MoverRequestScheduler.java index dde02e9cd52..30f678cab77 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/MoverRequestScheduler.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/MoverRequestScheduler.java @@ -41,6 +41,7 @@ import org.dcache.pool.movers.Mover; import org.dcache.pool.movers.json.MoverData; import org.dcache.pool.repository.FileStore; +import org.dcache.pool.repository.OutOfDiskException; import org.dcache.util.AdjustableSemaphore; import org.dcache.util.IoPrioritizable; import org.dcache.util.IoPriority; @@ -527,6 +528,13 @@ public void failed(Throwable exc, Void attachment) { FaultEvent faultEvent = new FaultEvent("transfer", faultAction, exc.getMessage(), exc); _faultListeners.forEach(l -> l.faultOccurred(faultEvent)); + } else if (exc instanceof OutOfDiskException) { + FaultEvent faultEvent = new FaultEvent( + "post-processing", + FaultAction.READONLY, + exc.getMessage(), exc); + _faultListeners.forEach( + l -> l.faultOccurred(faultEvent)); } postprocess(); } @@ -558,6 +566,13 @@ public void failed(Throwable exc, Void attachment) { exc.getMessage(), exc); _faultListeners.forEach( l -> l.faultOccurred(faultEvent)); + } else if (exc instanceof OutOfDiskException) { + FaultEvent faultEvent = new FaultEvent( + "post-processing", + FaultAction.READONLY, + exc.getMessage(), exc); + _faultListeners.forEach( + l -> l.faultOccurred(faultEvent)); } release(); } From 4ff5dc3b060be9a078a9861daf213be5765965a5 Mon Sep 17 00:00:00 2001 From: khys95 Date: Tue, 25 Feb 2025 14:25:04 +0100 Subject: [PATCH 41/57] [maven-release-plugin] prepare release 10.2.10 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 07662673701..7f6a177dd50 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.10-SNAPSHOT + 10.2.10 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index fc88337c034..1e70555998e 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 139de886e1e..5db2c927922 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.10-SNAPSHOT + 10.2.10 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 65dc95384f3..479a768407e 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.10-SNAPSHOT + 10.2.10 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 5c2e4f445fe..fda09cb29ab 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 67f263d3bae..b178ca6af99 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index 53597ba8b44..fd3a5c4230b 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 11cb5d86b6a..4722d23b593 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index d12c402b8ca..a6d092a548e 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 347eb9ba1b3..b9cdd73e17d 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 318f0b3fdd5..cc42265da63 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 766ca5c3c2d..7c1ad222f08 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 68b91ddad44..55ee771791c 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index a729bde14b8..99b290ea5db 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 27a5feb47c0..caf644b1195 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index a2412999df1..0a9e3d90c61 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 2caaefc07e3..c1869b8afbc 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index b1eeeebd9eb..4d9359dd40c 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 345d3f67e55..7e05e8c4f20 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 800fb759839..19e26acba9a 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index c2890ddb39f..f45d16136d7 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index b94763b5638..07c3b984055 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index c43a4ad0ca1..993365e2f91 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 20c3b098fa4..7624d2fc4f2 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index 4a491917464..c4d7f1e9892 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index f36ed2a48be..32341038375 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 1bb028bebe3..207f41e00ed 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index d1645e99f37..29cb2bbbc72 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 0bc89ea3ab1..c1798976b4c 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 038e27b351c..c3a3c51cac1 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 02cdf584646..8d6c640c434 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index 9b84e01da8e..dd0dea77b44 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 8db4ccc81a0..ee50c991b35 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index d8a656bfef8..448be9db650 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index c947d357855..54d0c811e0d 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.10-SNAPSHOT + 10.2.10 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 2182928f3ef..3d4d1e509a0 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 744733c01c8..f1e98b786af 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index ab0d07ed5f8..3ad9ae43051 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 7f17b9c9a5c..1e69cca6e0f 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index 1eb16e3dc6d..b5a587a834f 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index d1a33da4302..e2fb14c8bae 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index 64c0d56a078..f327c20ae38 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index ae12b9ffc6e..0fa31db2728 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 3d5ec284ce2..0d3e385ddd9 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 9f3227d408f..886e1cbf66a 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 9e7ea54fd91..7fde9acaa5e 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index fb49515878c..2531672af14 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index eeee1010d77..8b4bc4f7ca9 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 5d2b8d5b339..658ca3c9cb7 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 1657b925a8b..edde6f2586f 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index fe193ebd6c2..1db21e2f87a 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index cf89a9a459d..b7cebb6fd1e 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index a6c19566174..b0d36fbc75b 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 8ce233f8f70..ea67d1788bd 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.10-SNAPSHOT + 10.2.10 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index cf9d114b3bd..f3154f487b7 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 939bce7afe1..6c671fdff29 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 6925fb97585..4eef6ca90f4 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 4f95ac9ac3c..8776c118c8a 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 61dc1996bb0..9eacfb818c2 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.10-SNAPSHOT + 10.2.10 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 232299a86bf..e64d5bca0ba 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.10-SNAPSHOT + 10.2.10 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 9fccd6b6353..e30599361af 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.10-SNAPSHOT + 10.2.10 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 36a91af56d6..488b01a5716 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.10-SNAPSHOT + 10.2.10 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 2a74859be36..f5619fc28f4 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.10-SNAPSHOT + 10.2.10 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 185f5fffbcc..17c93a86637 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10-SNAPSHOT + 10.2.10 plugins diff --git a/pom.xml b/pom.xml index e3333e3bfa5..e863981325a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.10-SNAPSHOT + 10.2.10 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.10 From 53fc7f2ec01194f0a596d9cc618f2bbc6bbc88d5 Mon Sep 17 00:00:00 2001 From: khys95 Date: Tue, 25 Feb 2025 14:25:08 +0100 Subject: [PATCH 42/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 7f6a177dd50..1c8a8440344 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.10 + 10.2.11-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 1e70555998e..54735c9044e 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index 5db2c927922..be5d4277e32 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.10 + 10.2.11-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index 479a768407e..b78c4297ce0 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.10 + 10.2.11-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index fda09cb29ab..076b150f22f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index b178ca6af99..9e3f2f1fca0 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index fd3a5c4230b..bc18551907d 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 4722d23b593..4def682e1ae 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index a6d092a548e..9eb8ab0133c 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index b9cdd73e17d..3ccc85135a1 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index cc42265da63..d1baa4719eb 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 7c1ad222f08..81b78082e4a 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 55ee771791c..7776bd65b6f 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 99b290ea5db..48b1a0db827 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index caf644b1195..e12f4051092 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 0a9e3d90c61..53b542fde0b 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index c1869b8afbc..320a7160bbe 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 4d9359dd40c..d2047caa717 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 7e05e8c4f20..bae49cd8f0b 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 19e26acba9a..a0a04f27383 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index f45d16136d7..1f9d7b62a96 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 07c3b984055..07e80c1449c 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 993365e2f91..affe37f161d 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 7624d2fc4f2..9e604fee94e 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index c4d7f1e9892..080f039fbfd 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 32341038375..7a88922eb61 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 207f41e00ed..02a6650e268 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 29cb2bbbc72..424637b792c 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index c1798976b4c..a9b04ff2940 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index c3a3c51cac1..43137f1cd23 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 8d6c640c434..a1820f49029 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index dd0dea77b44..cb8c3f90f47 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index ee50c991b35..963347e00b5 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 448be9db650..0fcb0d40cf5 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 54d0c811e0d..e7d016b17ed 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.10 + 10.2.11-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 3d4d1e509a0..6c2f5b97fa0 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index f1e98b786af..a4efa254b85 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 3ad9ae43051..7b8ab020488 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 1e69cca6e0f..2add96571da 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index b5a587a834f..4014ca776e5 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index e2fb14c8bae..a3a7b6061b1 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index f327c20ae38..d5550b0294e 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 0fa31db2728..a65a9f9b733 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 0d3e385ddd9..136e85c0672 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 886e1cbf66a..09625456ffa 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 7fde9acaa5e..045400e948b 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 2531672af14..2a1f0e7a1ac 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 8b4bc4f7ca9..3bd032224c5 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 658ca3c9cb7..652ccbd2e2a 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index edde6f2586f..467129789bd 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 1db21e2f87a..684c0c467eb 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index b7cebb6fd1e..b6a137c4f4c 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index b0d36fbc75b..3d4bfd9210c 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index ea67d1788bd..2f3c3e29fd3 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.10 + 10.2.11-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index f3154f487b7..4ea7ffa9d13 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 6c671fdff29..29dbda00139 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index 4eef6ca90f4..a020346e531 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 8776c118c8a..8bff93e343b 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 9eacfb818c2..309ba43e050 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.10 + 10.2.11-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index e64d5bca0ba..1d4635aa647 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.10 + 10.2.11-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index e30599361af..65828987552 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.10 + 10.2.11-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 488b01a5716..ffe38af5ceb 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.10 + 10.2.11-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index f5619fc28f4..7cd0af2d6e2 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.10 + 10.2.11-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 17c93a86637..2bd20912008 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.10 + 10.2.11-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index e863981325a..92ab2644439 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.10 + 10.2.11-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.10 + 10.2 From 533ea41515cf6a389fe29bacc482726e5be2426f Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Tue, 25 Mar 2025 18:06:53 +0100 Subject: [PATCH 43/57] libs: use jetty 9.4.57.v20241219 Motivation: latest version in 9.4 series Acked-by: Dmitry Litvintsev Target: master, 10.2, 10.1, 10.0, 9.2 Require-book: no Require-notes: yes (cherry picked from commit f6d6e31dc69c90472b891186809174803e777465) Signed-off-by: Tigran Mkrtchyan --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92ab2644439..a404a3d6479 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.9.21.2 6.6.0 2.12.0 - 9.4.55.v20240627 + 9.4.57.v20241219 4.6.0 2.41 3.0.0 From 894e3e25733a13c45d9e7defa725f465c607fed4 Mon Sep 17 00:00:00 2001 From: Tiramisu Mokka Date: Fri, 28 Mar 2025 10:08:18 +0100 Subject: [PATCH 44/57] Merge pull request #7768 from onnozweers/patch-15 Update webdav.md: add STAGE to table of activities --- docs/UserGuide/src/main/markdown/webdav.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/UserGuide/src/main/markdown/webdav.md b/docs/UserGuide/src/main/markdown/webdav.md index 7b3845592fb..e09c87237dd 100644 --- a/docs/UserGuide/src/main/markdown/webdav.md +++ b/docs/UserGuide/src/main/markdown/webdav.md @@ -1354,7 +1354,8 @@ activities are defined: | DELETE | Delete a file or directory or overwrite an existing file | MANAGE | Rename and move files or directories | READ_METADATA | Obtain file metadata -| UPDATE_METADATA | Modify file metadata, stage a file or change its QoS +| UPDATE_METADATA | Modify file metadata, change its QoS +| STAGE | Stage (restore) a file from tape The READ_METADATA is implied if any other activity is specified. For example, the caveat activity:LIST,DOWNLOAD restricts the From 4625ff08865e40f51d8ffb1a240d2a93b1c9fe7d Mon Sep 17 00:00:00 2001 From: Tiramisu Mokka Date: Fri, 28 Mar 2025 10:07:39 +0100 Subject: [PATCH 45/57] Merge pull request #7767 from onnozweers/patch-14 Update macaroons.md: add STAGE to list of activities --- docs/UserGuide/src/main/markdown/macaroons.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/UserGuide/src/main/markdown/macaroons.md b/docs/UserGuide/src/main/markdown/macaroons.md index 3f01557ba00..ab13e47cd2a 100644 --- a/docs/UserGuide/src/main/markdown/macaroons.md +++ b/docs/UserGuide/src/main/markdown/macaroons.md @@ -168,8 +168,8 @@ has a couple of important consequences: dCache defines seven activities that describe what someone using the macaroon is allowed to do. These are `READ_METADATA`, -`UPDATE_METADATA`, `LIST`, `DOWNLOAD`, `MANAGE`, `UPLOAD` and -`DELETE`, +`UPDATE_METADATA`, `LIST`, `DOWNLOAD`, `MANAGE`, `UPLOAD`, +`DELETE` and `STAGE`.
READ_METADATA
@@ -186,7 +186,7 @@ macaroon is allowed to do. These are `READ_METADATA`,

Any request that attempts to update the metadata about the file: modifying the POSIX permissions, updating ACLs, updating - extended attributes, updating QoS or locality (staging).

+ extended attributes, updating QoS.

LIST
@@ -231,6 +231,12 @@ macaroon is allowed to do. These are `READ_METADATA`, inaccessible from one path but accessible from another is namespace management (see MANAGE activity).

+ +
STAGE
+ +
+

Any request that stages (restores) files from tape.

+
The following describes how HTTP requests are mapped to different From 8d458d9dde564c3ed0a26294424a776fd177a0c3 Mon Sep 17 00:00:00 2001 From: Lea Morschel Date: Fri, 28 Mar 2025 21:23:48 +0100 Subject: [PATCH 46/57] [maven-release-plugin] prepare release 10.2.11 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 1c8a8440344..7a28e4739d9 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.11-SNAPSHOT + 10.2.11 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 54735c9044e..3a49b949b82 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index be5d4277e32..b304f27927e 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.11-SNAPSHOT + 10.2.11 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index b78c4297ce0..a9f60b1f460 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.11-SNAPSHOT + 10.2.11 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index 076b150f22f..d1b44496250 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 9e3f2f1fca0..067110934c5 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index bc18551907d..edbe02bb00b 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 4def682e1ae..5a945315272 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 9eb8ab0133c..cea6b3f4512 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 3ccc85135a1..de5d5a29488 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index d1baa4719eb..5351d98cbb1 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index 81b78082e4a..a54fc0c6674 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 7776bd65b6f..08309b57cd7 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 48b1a0db827..0d94f4a2ed4 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index e12f4051092..67473eff8c5 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 53b542fde0b..0d2e30983ef 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 320a7160bbe..f933487ea41 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index d2047caa717..0fde67e7296 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index bae49cd8f0b..3e180d3ac69 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index a0a04f27383..4251c570821 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 1f9d7b62a96..f78705e44dd 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 07e80c1449c..3852c225c70 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index affe37f161d..a167a54d550 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index 9e604fee94e..a8ad6608d43 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index 080f039fbfd..dd7091326f4 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 7a88922eb61..daf2df43458 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 02a6650e268..754c5930802 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 424637b792c..d96f0a0b750 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index a9b04ff2940..13907f8db9e 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 43137f1cd23..4ae0113f40b 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index a1820f49029..0d434980a6d 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index cb8c3f90f47..cbd07be4851 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 963347e00b5..3fe90d4c50d 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 0fcb0d40cf5..e495a8c2b2c 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index e7d016b17ed..ea0f964c3bd 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.11-SNAPSHOT + 10.2.11 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 6c2f5b97fa0..56df2b27a2d 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index a4efa254b85..3492a02dcaa 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 7b8ab020488..166f7619822 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 2add96571da..867a43ff66f 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index 4014ca776e5..e20f81487fc 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index a3a7b6061b1..8cdfe1ee6b0 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index d5550b0294e..ae9f7152481 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index a65a9f9b733..5dd02fe1eb8 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 136e85c0672..9a578c27b56 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 09625456ffa..fa29e2da981 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index 045400e948b..db1d58f725f 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 2a1f0e7a1ac..3b6bd1e8072 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 3bd032224c5..e3145ddbef7 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 652ccbd2e2a..350c7f4a813 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 467129789bd..f56d1ef0076 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 684c0c467eb..bac9bd5aea1 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index b6a137c4f4c..ae4b280f669 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 3d4bfd9210c..ff262a1a6bf 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 2f3c3e29fd3..f37c687a4ac 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.11-SNAPSHOT + 10.2.11 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 4ea7ffa9d13..61103190034 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 29dbda00139..0125a0468c3 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index a020346e531..edb48ba144b 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 8bff93e343b..017dfb3c40f 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 309ba43e050..6fe337e2cc4 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.11-SNAPSHOT + 10.2.11 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 1d4635aa647..405336d2948 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.11-SNAPSHOT + 10.2.11 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 65828987552..707371b4276 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.11-SNAPSHOT + 10.2.11 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index ffe38af5ceb..83dcd614250 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.11-SNAPSHOT + 10.2.11 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 7cd0af2d6e2..f66d6778d09 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.11-SNAPSHOT + 10.2.11 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index 2bd20912008..cb2ebefc0b5 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11-SNAPSHOT + 10.2.11 plugins diff --git a/pom.xml b/pom.xml index a404a3d6479..b09e4e133a4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.11-SNAPSHOT + 10.2.11 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.11 From 5986f59f2e52b096357229ad3e6ec4bdf68551b3 Mon Sep 17 00:00:00 2001 From: Lea Morschel Date: Fri, 28 Mar 2025 21:23:52 +0100 Subject: [PATCH 47/57] [maven-release-plugin] prepare for next development iteration --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 7a28e4739d9..728319159b5 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.11 + 10.2.12-SNAPSHOT dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 3a49b949b82..39dce00deb9 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index b304f27927e..c6b98a6640a 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.11 + 10.2.12-SNAPSHOT TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index a9f60b1f460..f865460fb87 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.11 + 10.2.12-SNAPSHOT UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index d1b44496250..a3e8817da5b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 067110934c5..25d862ec2c7 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index edbe02bb00b..d83468e36a9 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index 5a945315272..d00a08f34ba 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index cea6b3f4512..0314460ad73 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index de5d5a29488..83785ae1fd6 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index 5351d98cbb1..a33128b62ef 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index a54fc0c6674..e6935692079 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 08309b57cd7..5b030202f05 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 0d94f4a2ed4..45073af682f 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index 67473eff8c5..f7c956c76e3 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index 0d2e30983ef..ea6bb5ff096 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index f933487ea41..050eb93e6ac 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index 0fde67e7296..a70333586f1 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 3e180d3ac69..2d1da94a18d 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 4251c570821..843752d57e6 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index f78705e44dd..5c8f28da862 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 3852c225c70..3e4ec4b1584 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index a167a54d550..46f131f1a71 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index a8ad6608d43..b1c40c82f52 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index dd7091326f4..ce8ca1a6d3b 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index daf2df43458..422e5aca192 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 754c5930802..561d4e5845c 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index d96f0a0b750..2da22882942 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index 13907f8db9e..a088b2bec1b 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 4ae0113f40b..2a194d93bef 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 0d434980a6d..58ec4f79876 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index cbd07be4851..d0941d77348 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 3fe90d4c50d..05b0dcaf9c6 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index e495a8c2b2c..4c9eb04d75b 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index ea0f964c3bd..3807a15eef4 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.11 + 10.2.12-SNAPSHOT com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index 56df2b27a2d..b80d1fd83b0 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 3492a02dcaa..38739350234 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 166f7619822..3f76a02e529 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index 867a43ff66f..d0494076b50 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index e20f81487fc..e48210ef579 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 8cdfe1ee6b0..1809a00c246 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index ae9f7152481..e1d81b238c6 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 5dd02fe1eb8..54d23a7aea0 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index 9a578c27b56..d9dd1f5ac5d 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index fa29e2da981..14da632f9ed 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index db1d58f725f..c8a1f7f1d99 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 3b6bd1e8072..7009fd5c3d8 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index e3145ddbef7..55b0b657a64 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index 350c7f4a813..fad1b57fe2d 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index f56d1ef0076..07ca371f34d 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index bac9bd5aea1..605edf52fba 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index ae4b280f669..31fb1fe802f 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index ff262a1a6bf..19e8dfbd4a8 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index f37c687a4ac..64953ddb929 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.11 + 10.2.12-SNAPSHOT jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 61103190034..87a928b8d0d 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index 0125a0468c3..defc537b7cb 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index edb48ba144b..f4464b1a492 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index 017dfb3c40f..aa00b162c0f 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 6fe337e2cc4..9c31101de8d 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.11 + 10.2.12-SNAPSHOT dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 405336d2948..5d6f8ecc14a 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.11 + 10.2.12-SNAPSHOT org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index 707371b4276..a157609adbf 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.11 + 10.2.12-SNAPSHOT system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 83dcd614250..42ab5e027fc 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.11 + 10.2.12-SNAPSHOT dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index f66d6778d09..000acdde280 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.11 + 10.2.12-SNAPSHOT dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index cb2ebefc0b5..d3ea88aa867 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.11 + 10.2.12-SNAPSHOT plugins diff --git a/pom.xml b/pom.xml index b09e4e133a4..d2a38f7e1f6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.11 + 10.2.12-SNAPSHOT dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2.11 + 10.2 From 14ecd2cd4849f0208b1f7e8bd3c653f60a15f6b7 Mon Sep 17 00:00:00 2001 From: Onno Zweers Date: Thu, 3 Apr 2025 16:47:32 +0200 Subject: [PATCH 48/57] Changing jdk to 17, because dCache now requires it; also, jcmd is in java-17-openjdk-headless --- docs/TheBook/src/main/markdown/cookbook-debugging.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/TheBook/src/main/markdown/cookbook-debugging.md b/docs/TheBook/src/main/markdown/cookbook-debugging.md index 3ec4a4b7213..93c621ce229 100644 --- a/docs/TheBook/src/main/markdown/cookbook-debugging.md +++ b/docs/TheBook/src/main/markdown/cookbook-debugging.md @@ -4,7 +4,7 @@ This chapter provides an information on how to exam running dCache system, ident ## Java Flight recorder -When debugging an issue on a running system often we need to collect jvm performance stats with `Java flight recorder`. Starting from release 7.2 the Java flight recorder attach listener is enabled by default. Site admins can collect and provide developers with additional information when high CPU load, memory consumption or file descriptor leaks are observed. To enable the `flight recorder` _jcmd_ command is used, which is typically provided as a part of `java-11-openjdk-devel` (on RHEL and clones). +When debugging an issue on a running system often we need to collect jvm performance stats with `Java flight recorder`. Starting from release 7.2 the Java flight recorder attach listener is enabled by default. Site admins can collect and provide developers with additional information when high CPU load, memory consumption or file descriptor leaks are observed. To enable the `flight recorder` _jcmd_ command is used, which is typically provided as a part of `java-17-openjdk-headless` (on RHEL and clones). To control recoding the following subcommands of _jcmd_ available: @@ -111,4 +111,4 @@ Overhead Shared Object Symbol 0.74% [kernel] [k] entry_SYSCALL_64 ``` -More info on usage perf usage at [perf Examples](https://www.brendangregg.com/perf.html) by Brendan Gregg. \ No newline at end of file +More info on usage perf usage at [perf Examples](https://www.brendangregg.com/perf.html) by Brendan Gregg. From 623f1a12fc1f0d5d5e8de5b4fdc393d148def9c7 Mon Sep 17 00:00:00 2001 From: Onno Zweers Date: Thu, 3 Apr 2025 17:40:17 +0200 Subject: [PATCH 49/57] Changed OpenJDK 11 to 17, because dCache now requires it. Updated dCache version example. --- .../src/main/markdown/dcache-minimal-installation.md | 8 ++++---- docs/TheBook/src/main/markdown/install.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/TheBook/src/main/markdown/dcache-minimal-installation.md b/docs/TheBook/src/main/markdown/dcache-minimal-installation.md index 84fda59d8c2..2a79172ccc8 100644 --- a/docs/TheBook/src/main/markdown/dcache-minimal-installation.md +++ b/docs/TheBook/src/main/markdown/dcache-minimal-installation.md @@ -29,7 +29,7 @@ For a minimal test installation: - At least 500 MiB free disk space - Software: - - OpenJDK 11 + - OpenJDK 17 - Postgres SQL Server 9.5 or later - ZooKeeper version 3.5 (in case of a standalone ZooKeeper installation) @@ -40,11 +40,11 @@ help you with your system specifications. Just contact us: . #### Software: -- OpenJDK 11 (java 11 , and java 17 for dCache staring from version 10.1) +- OpenJDK 17 (or OpenJDK 11 for dCache versions before 10.1) - > yum install java-11-openjdk + > yum install java-17-openjdk > - > dnf install java-11-openjdk-devel + > dnf install java-17-openjdk-devel - ZooKeeper version 3.7 (in case of a standalone ZooKeeper installation) diff --git a/docs/TheBook/src/main/markdown/install.md b/docs/TheBook/src/main/markdown/install.md index 8f8a57ef007..44c115541c1 100644 --- a/docs/TheBook/src/main/markdown/install.md +++ b/docs/TheBook/src/main/markdown/install.md @@ -74,14 +74,14 @@ rpm -ivh https://www.dcache.org/old/downloads/1.9/repo/##SERIES##/dcache-##VERSI | 1:dcache-##VERSION##-1 ################################# [100%] ``` -For example, `##SERIES##` could be `9.1` and `##VERSION##` could be `9.1.1`. +For example, `##SERIES##` could be `10.1` and `##VERSION##` could be `10.1.1`. ### Installing prerequisite packages First, install OpenJDK and httpd-tools packages. ```console-root -yum install java-11-openjdk-headless httpd-tools +dnf install java-17-openjdk-headless httpd-tools ``` ### Installing PostgreSQL From e8554f93ab48453326e6738a389d952caf74b863 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Wed, 2 Apr 2025 09:20:42 +0200 Subject: [PATCH 50/57] cells: use core domain endpoint only if hostname resolable Motivation: Recently we have observe cases whee tunnel connections failed with: java.lang.NullPointerException: null at java.base/java.net.Socket.(Socket.java:501) at java.base/java.net.Socket.(Socket.java:319) at java.base/javax.net.DefaultSocketFactory.createSocket(SocketFactory.java:277) at dmg.cells.network.LocationManagerConnector.connect(LocationManagerConnector.java:66) at dmg.cells.network.LocationManagerConnector.run(LocationManagerConnector.java:96) at dmg.cells.nucleus.CellNucleus.lambda$wrapLoggingContext$2(CellNucleus.java:725) at java.base/java.lang.Thread.run(Thread.java:840) This is possible only if hostname can't be resolve. Such tunnels die and never re-connect. Modification: Update zookeeper node update logic to ensure that we accept endpoint only if hostname is resolvable. Result: More robust tunnel handling. Issue: #5326 Acked-by: Marina Sahakyan Target: master, 10.2 Require-book: no Require-notes: yes (cherry picked from commit 543bfc57112d8e0f659210dc92a25febd2a75b78) Signed-off-by: Tigran Mkrtchyan --- .../dmg/cells/services/LocationManager.java | 69 +++++++++++-------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/modules/cells/src/main/java/dmg/cells/services/LocationManager.java b/modules/cells/src/main/java/dmg/cells/services/LocationManager.java index 84900b00790..653f431c1d3 100644 --- a/modules/cells/src/main/java/dmg/cells/services/LocationManager.java +++ b/modules/cells/src/main/java/dmg/cells/services/LocationManager.java @@ -67,6 +67,7 @@ import org.apache.curator.framework.recipes.cache.NodeCacheListener; import org.apache.curator.framework.recipes.cache.PathChildrenCache; import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent; +import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type; import org.apache.curator.utils.CloseableUtils; import org.apache.curator.utils.ZKPaths; import org.apache.zookeeper.CreateMode; @@ -216,7 +217,9 @@ public CoreDomainInfo(byte[] bytes) { switch (entry.getScheme()) { case "tls": case "tcp": - endpoints.add(entry); + if (canResoveHost(entry)) { + endpoints.add(entry); + } break; default: LOGGER.warn("Unknown Scheme for LocationManager Cores: {}", entry); @@ -229,6 +232,26 @@ public CoreDomainInfo(byte[] bytes) { } } + /** + * Check if hostname provided by urc can be resolved. + * @param endpoint core domain endpoint + * @return true it host name can be resolved. Otherwise false. + */ + private boolean canResoveHost(URI endpoint) { + var h = endpoint.getHost(); + if (h == null) { + LOGGER.warn("Ignoring URL without host: {}", endpoint); + return false; + } + try { + var ip = java.net.InetAddress.getByName(h); + } catch (UnknownHostException e) { + LOGGER.warn("Ignoring unknown host: {} : {}", endpoint, e.toString()); + return false; + } + return true; + } + void addCore(String scheme, String host, int port) { switch (scheme) { case "tls": @@ -521,46 +544,38 @@ public void update(PathChildrenCacheEvent event) { LOGGER.info("{}", event); String cell; + if (hasNoData(event.getData())) { + LOGGER.warn("Ignoring empty event {}", event.getType()); + return; + } + + String domain = ZKPaths.getNodeFromPath(event.getData().getPath()); + switch (event.getType()) { case CHILD_REMOVED: - cell = connectors.remove(ZKPaths.getNodeFromPath(event.getData().getPath())); + cell = connectors.remove(domain); if (cell != null) { killConnector(cell); } break; case CHILD_UPDATED: - if (hasNoData(event.getData())) { - LOGGER.warn("Ignoring empty data on UPDATED for {}", event.getData().getPath()); - break; - } - cell = connectors.remove( - ZKPaths.getNodeFromPath(event.getData().getPath())); - if (cell != null) { - killConnector(cell); - } - // fall through case CHILD_ADDED: - if (hasNoData(event.getData())) { - LOGGER.warn("Ignoring empty data on ADDED for {}", event.getData().getPath()); + + CoreDomainInfo info = infoFromZKEvent(event); + if (info.endpoints.isEmpty()) { + LOGGER.warn("Ignoring invalid core URI", domain); break; } - //Log if the Core Domain Information received is incompatible with previous - CoreDomainInfo info = infoFromZKEvent(event); - String domain = ZKPaths.getNodeFromPath(event.getData().getPath()); + if (event.getType() == Type.CHILD_UPDATED) { + cell = connectors.remove(domain); + if (cell != null) { + killConnector(cell); + } + } try { if (shouldConnectTo(domain)) { - cell = connectors.remove(domain); - if (cell != null) { - LOGGER.error( - "About to create tunnel to core domain {}, but to my surprise " - + - "a tunnel called {} already exists. Will kill it. Please contact " - + - "support@dcache.org.", domain, cell); - killConnector(cell); - } cell = connectors.put(domain, startConnector(domain, info)); if (cell != null) { LOGGER.error( From d059a7458366eee468089de3add3ce994bcbb737 Mon Sep 17 00:00:00 2001 From: Dmitry Litvintsev Date: Mon, 14 Apr 2025 15:42:20 -0500 Subject: [PATCH 51/57] jetty: disable sending version number Motivation ---------- Security scans flag dCache application as non-compliant because it reports Jetty version number Modification ------------ Disable reporting Jetty version Result ------ Baseline security compliant Target: trunk Request: 10.2, 10.1, 10.0, 9.2 Acked-by: Tigran Patch: https://rb.dcache.org/r/14383/ Signed-off-by: Dmitry Litvintsev --- .../java/org/dcache/util/jetty/ConnectorFactoryBean.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/dcache/src/main/java/org/dcache/util/jetty/ConnectorFactoryBean.java b/modules/dcache/src/main/java/org/dcache/util/jetty/ConnectorFactoryBean.java index 69b9fce49ee..72470789b90 100644 --- a/modules/dcache/src/main/java/org/dcache/util/jetty/ConnectorFactoryBean.java +++ b/modules/dcache/src/main/java/org/dcache/util/jetty/ConnectorFactoryBean.java @@ -308,6 +308,10 @@ public ServerConnector getObject() throws Exception { checkState(protocol == PLAIN || certificateAuthorityPath != null); HttpConnectionFactory httpConnectionFactory = new HttpConnectionFactory(); + /* + * disable reporting of Jetty version + */ + httpConnectionFactory.getHttpConfiguration().setSendServerVersion(false); switch (protocol) { case PLAIN: @@ -362,4 +366,4 @@ public boolean isSingleton() { public enum Protocol { PLAIN, TLS, GSI } -} \ No newline at end of file +} From 1fbfd8f86dc7a8c64915f748001eb21ed2442850 Mon Sep 17 00:00:00 2001 From: Paul Millar Date: Fri, 25 Oct 2024 10:55:14 +0200 Subject: [PATCH 52/57] vehicles: support door requesting multiple checksums Motivation: A client that is uploading a file or initiating an HTTP TPC pull transfer may wish to validate the transfer did not result in data corruption, using the new file's checksum / digest value. When receiving a file, the pool will calculate a set of checksums (from different checksum algorithms) based on the pool's configuration. This configured list of checksum algorithms might not include the client's desired checksum algorithm. One solution would be for the pool configuration to be updated, to include the client's desired checksum. Although technically possible, this is impractical, as it would require the person transferring the data to negotiate with the dCache admins, asking them to update the pool configuration for all pools their transfer might use. Such support operations are undesirable. As an alternative approach, the WebDAV door accepts a `Want-Digest` HTTP request header on PUT and COPY (HTTP-TPC) requests. The door uses this header to select a single desired checksum algorithm. This algorithm (if provided) is transferred to the pool, which then ensures that this algorithm is calculated during the file upload. A dCache instance may provide storage to multiple communities, with different conventions on which algorithm is use for data integrety. A client initiating a transfer between these communities (using dCache as an intermediate) would require two checksums: one to verify data integrety of the transfer to dCache and another to validate transferred within the second community. Modification: The ProtocolInfo subclasses are updated to carry a collection of algorithms, taking care to maintain backwards compatibility. Result: No user- or admin observable change, but dCache now supports a door requesting multiple checksum algorithms when a pool receives a file. Target: master Request: 10.2 Requires-notes: yes Requires-book: no Patch: https://rb.dcache.org/r/14341/ Acked-by: Tigran Mkrtchyan --- .../diskCacheV111/srm/dcache/Storage.java | 5 +- .../vehicles/HttpProtocolInfo.java | 42 +++++++++++++--- .../RemoteHttpDataTransferProtocolInfo.java | 48 +++++++++++++++---- .../RemoteHttpsDataTransferProtocolInfo.java | 36 ++++++++++---- .../dcache/webdav/DcacheResourceFactory.java | 5 +- .../transfer/RemoteTransferHandler.java | 11 +++-- .../java/diskCacheV111/doors/CopyManager.java | 3 +- .../dcache/http/HttpPoolRequestHandler.java | 2 +- .../RemoteHttpDataTransferProtocol.java | 2 +- 9 files changed, 122 insertions(+), 32 deletions(-) diff --git a/modules/dcache-srm/src/main/java/diskCacheV111/srm/dcache/Storage.java b/modules/dcache-srm/src/main/java/diskCacheV111/srm/dcache/Storage.java index bb3132bd30e..05409d0487b 100644 --- a/modules/dcache-srm/src/main/java/diskCacheV111/srm/dcache/Storage.java +++ b/modules/dcache-srm/src/main/java/diskCacheV111/srm/dcache/Storage.java @@ -151,6 +151,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.EnumSet; import java.util.HashMap; @@ -1784,7 +1785,7 @@ private String performRemoteTransfer(SRMUser srmUser, remoteTURL.toString(), isVerifyRequired(extraInfo), httpHeaders(extraInfo), credential, - Optional.empty()); + Collections.emptyList()); break; case "http": @@ -1792,7 +1793,7 @@ private String performRemoteTransfer(SRMUser srmUser, 1, 1, remoteAddr, remoteTURL.toString(), isVerifyRequired(extraInfo), httpHeaders(extraInfo), - Optional.empty()); + Collections.emptyList()); break; default: diff --git a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/HttpProtocolInfo.java b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/HttpProtocolInfo.java index 8e1cd76d557..ae4aa13ab2f 100644 --- a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/HttpProtocolInfo.java +++ b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/HttpProtocolInfo.java @@ -1,8 +1,13 @@ package diskCacheV111.vehicles; +import java.io.IOException; import java.net.InetSocketAddress; import java.net.URI; -import java.util.Optional; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.dcache.util.ChecksumType; /** @@ -42,7 +47,10 @@ public enum Disposition { private final String httpDoorDomainName; private final String path; private final URI _location; + @Nullable private final ChecksumType _wantedChecksum; + @Nonnull + private Set _wantedChecksums; private final Disposition _disposition; @@ -55,7 +63,7 @@ public HttpProtocolInfo(String protocol, int major, int minor, String path, URI location) { this(protocol, major, minor, clientSocketAddress, httpDoorCellName, - httpDoorDomainName, path, location, null, null); + httpDoorDomainName, path, location, null, Collections.emptyList()); } public HttpProtocolInfo(String protocol, int major, int minor, @@ -66,9 +74,15 @@ public HttpProtocolInfo(String protocol, int major, int minor, URI location, Disposition disposition) { this(protocol, major, minor, clientSocketAddress, httpDoorCellName, - httpDoorDomainName, path, location, disposition, null); + httpDoorDomainName, path, location, disposition, + Collections.emptyList()); } + /** + * @param wantedChecksums Desired checksum to calculate for this transfer. + * The first checksum is used as a fall-back for old pools that only support + * a single checksum. + */ public HttpProtocolInfo(String protocol, int major, int minor, InetSocketAddress clientSocketAddress, String httpDoorCellName, @@ -76,7 +90,8 @@ public HttpProtocolInfo(String protocol, int major, int minor, String path, URI location, Disposition disposition, - ChecksumType wantedChecksum) { + @Nonnull + List wantedChecksums) { _name = protocol; _minor = minor; _major = major; @@ -86,7 +101,8 @@ public HttpProtocolInfo(String protocol, int major, int minor, this.path = path; _location = location; _disposition = disposition; - _wantedChecksum = wantedChecksum; + _wantedChecksum = wantedChecksums.isEmpty() ? null : wantedChecksums.get(0); + _wantedChecksums = Set.copyOf(wantedChecksums); } public String getHttpDoorCellName() { @@ -109,8 +125,8 @@ public void setSessionId(int sessionId) { _sessionId = sessionId; } - public Optional getWantedChecksum() { - return Optional.ofNullable(_wantedChecksum); + public Set getWantedChecksums() { + return _wantedChecksums; } // @@ -197,6 +213,18 @@ public URI getLocation() { public Disposition getDisposition() { return _disposition != null ? _disposition : Disposition.ATTACHMENT; } + + private void readObject(java.io.ObjectInputStream stream) + throws ClassNotFoundException, IOException { + stream.defaultReadObject(); + + // Handle objects sent from old doors. + if (_wantedChecksums == null) { + _wantedChecksums = _wantedChecksum == null + ? Collections.emptySet() + : Set.of(_wantedChecksum); + } + } } diff --git a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpDataTransferProtocolInfo.java b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpDataTransferProtocolInfo.java index 724cacc519a..faa20ca1905 100644 --- a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpDataTransferProtocolInfo.java +++ b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpDataTransferProtocolInfo.java @@ -3,9 +3,14 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableMap; +import java.io.IOException; import java.net.InetSocketAddress; import java.net.URI; -import java.util.Optional; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.dcache.auth.OpenIdCredential; import org.dcache.util.ChecksumType; @@ -24,22 +29,36 @@ public class RemoteHttpDataTransferProtocolInfo implements IpProtocolInfo { private final boolean isVerificationRequired; private final ImmutableMap headers; private final OpenIdCredential openIdCredential; + @Nullable private final ChecksumType desiredChecksum; + @Nonnull + private Set desiredChecksums; private static final long serialVersionUID = 4482469147378465931L; + /** + * @param desiredChecksums Desired checksum to calculate for this transfer. + * The first checksum is used as a fall-back for old pools that only support + * a single checksum. + */ public RemoteHttpDataTransferProtocolInfo(String protocol, int major, int minor, InetSocketAddress addr, String url, boolean isVerificationRequired, ImmutableMap headers, - Optional desiredChecksum) { - this(protocol, minor, major, addr, url, isVerificationRequired, headers, desiredChecksum, - null); + List desiredChecksums) { + this(protocol, minor, major, addr, url, isVerificationRequired, headers, + desiredChecksums, null); } + /** + * @param desiredChecksums Desired checksum to calculate for this transfer. + * The first checksum is used as a fall-back for old pools that only support + * a single checksum. + */ public RemoteHttpDataTransferProtocolInfo(String protocol, int major, int minor, InetSocketAddress addr, String url, boolean isVerificationRequired, ImmutableMap headers, - Optional desiredChecksum, + @Nonnull + List desiredChecksums, OpenIdCredential openIdCredential) { this.name = protocol; this.minor = minor; @@ -49,7 +68,8 @@ public RemoteHttpDataTransferProtocolInfo(String protocol, int major, this.isVerificationRequired = isVerificationRequired; this.headers = requireNonNull(headers); this.openIdCredential = openIdCredential; - this.desiredChecksum = desiredChecksum.orElse(null); + this.desiredChecksum = desiredChecksums.isEmpty() ? null : desiredChecksums.get(0); + this.desiredChecksums = Set.copyOf(desiredChecksums); } public URI getUri() { @@ -102,7 +122,19 @@ public boolean hasTokenCredential() { return openIdCredential != null; } - public Optional getDesiredChecksum() { - return Optional.ofNullable(desiredChecksum); + public Set getDesiredChecksums() { + return desiredChecksums; + } + + private void readObject(java.io.ObjectInputStream stream) + throws ClassNotFoundException, IOException { + stream.defaultReadObject(); + + // Handle objects sent from old doors. + if (desiredChecksums == null) { + desiredChecksums = desiredChecksum == null + ? Collections.emptySet() + : Set.of(desiredChecksum); + } } } diff --git a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpsDataTransferProtocolInfo.java b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpsDataTransferProtocolInfo.java index b6795a73eda..e24ec389ee3 100644 --- a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpsDataTransferProtocolInfo.java +++ b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpsDataTransferProtocolInfo.java @@ -7,11 +7,12 @@ import java.security.KeyStoreException; import java.security.PrivateKey; import java.security.cert.X509Certificate; -import java.util.Optional; +import java.util.List; import org.dcache.auth.OpenIdCredential; import org.dcache.util.ChecksumType; import static java.util.Objects.requireNonNull; +import javax.annotation.Nonnull; /** * Provides information for HTTP transfer of a file using SSL/TLS encryption. @@ -23,34 +24,53 @@ public class RemoteHttpsDataTransferProtocolInfo extends RemoteHttpDataTransferP private final PrivateKey key; private final X509Certificate[] certChain; + /** + * @param desiredChecksums Desired checksum to calculate for this transfer. + * The first checksum is used as a fall-back for old pools that only support + * a single checksum. + */ public RemoteHttpsDataTransferProtocolInfo(String protocol, int major, int minor, InetSocketAddress addr, String url, boolean isVerificationRequired, ImmutableMap headers, X509Credential credential, - Optional desiredChecksum) { + @Nonnull + List desiredChecksums) { this(protocol, major, minor, addr, url, isVerificationRequired, headers, credential == null ? null : credential.getKey(), credential == null ? null : credential.getCertificateChain(), - desiredChecksum); + desiredChecksums); } + /** + * @param desiredChecksums Desired checksum to calculate for this transfer. + * The first checksum is used as a fall-back for old pools that only support + * a single checksum. + */ public RemoteHttpsDataTransferProtocolInfo(String protocol, int major, int minor, InetSocketAddress addr, String url, boolean isVerificationRequired, ImmutableMap headers, PrivateKey privateKey, X509Certificate[] certificateChain, - Optional desiredChecksum) { - super(protocol, major, minor, addr, url, isVerificationRequired, headers, desiredChecksum); + @Nonnull + List desiredChecksums) { + super(protocol, major, minor, addr, url, isVerificationRequired, headers, + desiredChecksums); key = privateKey; certChain = certificateChain; } + /** + * @param desiredChecksums Desired checksum to calculate for this transfer. + * The first checksum is used as a fall-back for old pools that only support + * a single checksum. + */ public RemoteHttpsDataTransferProtocolInfo(String protocol, int major, int minor, InetSocketAddress addr, String url, boolean isVerificationRequired, ImmutableMap headers, - Optional desiredChecksum, + @Nonnull + List desiredChecksums, OpenIdCredential token) { - super(protocol, major, minor, addr, url, isVerificationRequired, headers, desiredChecksum, - token); + super(protocol, major, minor, addr, url, isVerificationRequired, headers, + desiredChecksums, token); key = null; certChain = null; } diff --git a/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java b/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java index c9f966f38ad..ad2136fb2be 100644 --- a/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java +++ b/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java @@ -1696,6 +1696,9 @@ public HttpTransfer(PnfsHandler pnfs, Subject subject, } protected ProtocolInfo createProtocolInfo(InetSocketAddress address) { + List wantedChecksums = _wantedChecksum == null + ? Collections.emptyList() + : List.of(_wantedChecksum); HttpProtocolInfo protocolInfo = new HttpProtocolInfo( _isSSL ? PROTOCOL_INFO_SSL_NAME : PROTOCOL_INFO_NAME, @@ -1706,7 +1709,7 @@ protected ProtocolInfo createProtocolInfo(InetSocketAddress address) { _requestPath, _location, _disposition, - _wantedChecksum); + wantedChecksums); protocolInfo.setSessionId((int) getId()); return protocolInfo; } diff --git a/modules/dcache-webdav/src/main/java/org/dcache/webdav/transfer/RemoteTransferHandler.java b/modules/dcache-webdav/src/main/java/org/dcache/webdav/transfer/RemoteTransferHandler.java index fa5b1765433..3e75f221c2c 100644 --- a/modules/dcache-webdav/src/main/java/org/dcache/webdav/transfer/RemoteTransferHandler.java +++ b/modules/dcache-webdav/src/main/java/org/dcache/webdav/transfer/RemoteTransferHandler.java @@ -151,6 +151,7 @@ import static diskCacheV111.services.TransferManagerHandler.RECEIVED_FIRST_POOL_REPLY_STATE; import static dmg.util.CommandException.checkCommand; +import java.util.Collections; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.summingInt; @@ -1030,6 +1031,9 @@ private IpProtocolInfo buildProtocolInfo() throws ErrorResponseException { Optional desiredChecksum = _wantDigest.flatMap( Checksums::parseWantDigest); + var desiredChecksums = desiredChecksum + .map(List::of) + .orElseGet(Collections::emptyList); switch (_type) { case GSIFTP: @@ -1042,20 +1046,21 @@ private IpProtocolInfo buildProtocolInfo() throws ErrorResponseException { return new RemoteHttpDataTransferProtocolInfo("RemoteHttpDataTransfer", 1, 1, address, _destination.toASCIIString(), _flags.contains(TransferFlag.REQUIRE_VERIFICATION), - _transferHeaders, desiredChecksum); + _transferHeaders, desiredChecksums); case HTTPS: if (_source == CredentialSource.OIDC) { return new RemoteHttpsDataTransferProtocolInfo("RemoteHttpsDataTransfer", 1, 1, address, _destination.toASCIIString(), _flags.contains(TransferFlag.REQUIRE_VERIFICATION), - _transferHeaders, desiredChecksum, _oidCredential); + _transferHeaders, desiredChecksums, + _oidCredential); } else { return new RemoteHttpsDataTransferProtocolInfo("RemoteHttpsDataTransfer", 1, 1, address, _destination.toASCIIString(), _flags.contains(TransferFlag.REQUIRE_VERIFICATION), _transferHeaders, _privateKey, _certificateChain, - desiredChecksum); + desiredChecksums); } } diff --git a/modules/dcache/src/main/java/diskCacheV111/doors/CopyManager.java b/modules/dcache/src/main/java/diskCacheV111/doors/CopyManager.java index 129c7c25e1c..d3fb3635e1e 100644 --- a/modules/dcache/src/main/java/diskCacheV111/doors/CopyManager.java +++ b/modules/dcache/src/main/java/diskCacheV111/doors/CopyManager.java @@ -26,6 +26,7 @@ import java.net.InetSocketAddress; import java.net.URI; import java.util.ArrayDeque; +import java.util.Collections; import java.util.Map; import java.util.Optional; import java.util.Queue; @@ -460,7 +461,7 @@ private RemoteHttpDataTransferProtocolInfo createTargetProtocolInfo(String urlRe urlRemote, false, ImmutableMap.of(), - Optional.empty()); + Collections.emptyList()); } diff --git a/modules/dcache/src/main/java/org/dcache/http/HttpPoolRequestHandler.java b/modules/dcache/src/main/java/org/dcache/http/HttpPoolRequestHandler.java index 3208ee7d039..726d3c2ec2d 100644 --- a/modules/dcache/src/main/java/org/dcache/http/HttpPoolRequestHandler.java +++ b/modules/dcache/src/main/java/org/dcache/http/HttpPoolRequestHandler.java @@ -521,7 +521,7 @@ protected ChannelFuture doOnPut(ChannelHandlerContext context, HttpRequest reque file.truncate(file.getFileAttributes().getSize()); } - file.getProtocolInfo().getWantedChecksum().ifPresent(file::addChecksumType); + file.getProtocolInfo().getWantedChecksums().forEach(file::addChecksumType); _wantedDigest = wantDigest(request).flatMap(Checksums::parseWantDigest); _wantedDigest.ifPresent(file::addChecksumType); diff --git a/modules/dcache/src/main/java/org/dcache/pool/movers/RemoteHttpDataTransferProtocol.java b/modules/dcache/src/main/java/org/dcache/pool/movers/RemoteHttpDataTransferProtocol.java index 8fe1b2949b3..47d5f7eda11 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/movers/RemoteHttpDataTransferProtocol.java +++ b/modules/dcache/src/main/java/org/dcache/pool/movers/RemoteHttpDataTransferProtocol.java @@ -238,7 +238,7 @@ public void runIO(FileAttributes attributes, RepositoryChannel channel, _channel = new MoverChannel<>(access, attributes, info, channel); channel.optionallyAs(ChecksumChannel.class).ifPresent(c -> { - info.getDesiredChecksum().ifPresent(t -> { + info.getDesiredChecksums().forEach(t -> { try { c.addType(t); } catch (IOException e) { From d72198756fa4fbca69e7c8a0572092c6449791d3 Mon Sep 17 00:00:00 2001 From: Svenja Meyer Date: Wed, 23 Apr 2025 14:25:24 +0000 Subject: [PATCH 53/57] [maven-release-plugin] prepare release 10.2.12 --- archetypes/dcache-nearline-plugin-archetype/pom.xml | 2 +- archetypes/pom.xml | 2 +- docs/TheBook/pom.xml | 2 +- docs/UserGuide/pom.xml | 2 +- docs/pom.xml | 2 +- modules/acl-vehicles/pom.xml | 2 +- modules/acl/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/cells/pom.xml | 2 +- modules/chimera/pom.xml | 2 +- modules/common-cli/pom.xml | 2 +- modules/common-security/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/dcache-bulk/pom.xml | 2 +- modules/dcache-chimera/pom.xml | 2 +- modules/dcache-dcap/pom.xml | 2 +- modules/dcache-frontend/pom.xml | 2 +- modules/dcache-ftp/pom.xml | 2 +- modules/dcache-gplazma/pom.xml | 2 +- modules/dcache-history/pom.xml | 2 +- modules/dcache-info/pom.xml | 2 +- modules/dcache-nearline-spi/pom.xml | 2 +- modules/dcache-nfs/pom.xml | 2 +- modules/dcache-qos/pom.xml | 2 +- modules/dcache-resilience/pom.xml | 2 +- modules/dcache-spacemanager/pom.xml | 2 +- modules/dcache-srm/pom.xml | 2 +- modules/dcache-vehicles/pom.xml | 2 +- modules/dcache-webdav/pom.xml | 2 +- modules/dcache-xrootd/pom.xml | 2 +- modules/dcache/pom.xml | 2 +- modules/ftp-client/pom.xml | 2 +- modules/gplazma2-alise/pom.xml | 2 +- modules/gplazma2-banfile/pom.xml | 2 +- modules/gplazma2-fermi/pom.xml | 4 ++-- modules/gplazma2-grid/pom.xml | 2 +- modules/gplazma2-htpasswd/pom.xml | 2 +- modules/gplazma2-jaas/pom.xml | 2 +- modules/gplazma2-kpwd/pom.xml | 2 +- modules/gplazma2-krb5/pom.xml | 2 +- modules/gplazma2-ldap/pom.xml | 2 +- modules/gplazma2-multimap/pom.xml | 2 +- modules/gplazma2-nis/pom.xml | 2 +- modules/gplazma2-nsswitch/pom.xml | 2 +- modules/gplazma2-oidc-te/pom.xml | 2 +- modules/gplazma2-oidc/pom.xml | 2 +- modules/gplazma2-omnisession/pom.xml | 2 +- modules/gplazma2-pyscript/pom.xml | 2 +- modules/gplazma2-roles/pom.xml | 2 +- modules/gplazma2-scitoken/pom.xml | 2 +- modules/gplazma2-voms/pom.xml | 2 +- modules/gplazma2/pom.xml | 2 +- modules/logback-console-config/pom.xml | 2 +- modules/logback-test-config/pom.xml | 2 +- modules/missingfiles-semsg/pom.xml | 2 +- modules/srm-client/pom.xml | 2 +- modules/srm-common/pom.xml | 2 +- modules/srm-server/pom.xml | 2 +- packages/fhs/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/system-test/pom.xml | 2 +- packages/tar/pom.xml | 2 +- plugins/hsqldb/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 4 ++-- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml index 728319159b5..63e15e5d67c 100644 --- a/archetypes/dcache-nearline-plugin-archetype/pom.xml +++ b/archetypes/dcache-nearline-plugin-archetype/pom.xml @@ -5,7 +5,7 @@ org.dcache archetypes - 10.2.12-SNAPSHOT + 10.2.12 dcache-nearline-plugin-archetype diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 39dce00deb9..f5f6dad6476 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 archetypes diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml index c6b98a6640a..97e330cbb06 100644 --- a/docs/TheBook/pom.xml +++ b/docs/TheBook/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.12-SNAPSHOT + 10.2.12 TheBook diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml index f865460fb87..7f4226cdce4 100644 --- a/docs/UserGuide/pom.xml +++ b/docs/UserGuide/pom.xml @@ -4,7 +4,7 @@ org.dcache documentation - 10.2.12-SNAPSHOT + 10.2.12 UserGuide diff --git a/docs/pom.xml b/docs/pom.xml index a3e8817da5b..fc5d9ab9713 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 documentation diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml index 25d862ec2c7..010338ea4a6 100644 --- a/modules/acl-vehicles/pom.xml +++ b/modules/acl-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml index d83468e36a9..095262a517d 100644 --- a/modules/acl/pom.xml +++ b/modules/acl/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index d00a08f34ba..2d84c7db2d1 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml index 0314460ad73..3ac3c1dc2cb 100644 --- a/modules/cells/pom.xml +++ b/modules/cells/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml index 83785ae1fd6..f2e53d3edf6 100644 --- a/modules/chimera/pom.xml +++ b/modules/chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml index a33128b62ef..40a4b8f0bb7 100644 --- a/modules/common-cli/pom.xml +++ b/modules/common-cli/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml index e6935692079..1b4325b439a 100644 --- a/modules/common-security/pom.xml +++ b/modules/common-security/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 5b030202f05..3c6b407740a 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml index 45073af682f..8b7eff8b3e7 100644 --- a/modules/dcache-bulk/pom.xml +++ b/modules/dcache-bulk/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml index f7c956c76e3..9bde197db79 100644 --- a/modules/dcache-chimera/pom.xml +++ b/modules/dcache-chimera/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml index ea6bb5ff096..ef9085208f9 100644 --- a/modules/dcache-dcap/pom.xml +++ b/modules/dcache-dcap/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml index 050eb93e6ac..e399cbcb73b 100644 --- a/modules/dcache-frontend/pom.xml +++ b/modules/dcache-frontend/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml index a70333586f1..01dcc42e07e 100644 --- a/modules/dcache-ftp/pom.xml +++ b/modules/dcache-ftp/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml index 2d1da94a18d..378db2a99c5 100644 --- a/modules/dcache-gplazma/pom.xml +++ b/modules/dcache-gplazma/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml index 843752d57e6..d4072619129 100644 --- a/modules/dcache-history/pom.xml +++ b/modules/dcache-history/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml index 5c8f28da862..90469b5a9b5 100644 --- a/modules/dcache-info/pom.xml +++ b/modules/dcache-info/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml index 3e4ec4b1584..b00bd389476 100644 --- a/modules/dcache-nearline-spi/pom.xml +++ b/modules/dcache-nearline-spi/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-nfs/pom.xml b/modules/dcache-nfs/pom.xml index 46f131f1a71..967f9297465 100644 --- a/modules/dcache-nfs/pom.xml +++ b/modules/dcache-nfs/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-qos/pom.xml b/modules/dcache-qos/pom.xml index b1c40c82f52..778c1343ada 100644 --- a/modules/dcache-qos/pom.xml +++ b/modules/dcache-qos/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-resilience/pom.xml b/modules/dcache-resilience/pom.xml index ce8ca1a6d3b..19ac1a99f3c 100644 --- a/modules/dcache-resilience/pom.xml +++ b/modules/dcache-resilience/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-spacemanager/pom.xml b/modules/dcache-spacemanager/pom.xml index 422e5aca192..40a235df10c 100644 --- a/modules/dcache-spacemanager/pom.xml +++ b/modules/dcache-spacemanager/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml index 561d4e5845c..a654a6e2494 100644 --- a/modules/dcache-srm/pom.xml +++ b/modules/dcache-srm/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml index 2da22882942..50997210fa5 100644 --- a/modules/dcache-vehicles/pom.xml +++ b/modules/dcache-vehicles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-webdav/pom.xml b/modules/dcache-webdav/pom.xml index a088b2bec1b..985963d16d5 100644 --- a/modules/dcache-webdav/pom.xml +++ b/modules/dcache-webdav/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache-xrootd/pom.xml b/modules/dcache-xrootd/pom.xml index 2a194d93bef..fc549cf726d 100644 --- a/modules/dcache-xrootd/pom.xml +++ b/modules/dcache-xrootd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml index 58ec4f79876..974238430ca 100644 --- a/modules/dcache/pom.xml +++ b/modules/dcache/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/ftp-client/pom.xml b/modules/ftp-client/pom.xml index d0941d77348..5f044753dc1 100644 --- a/modules/ftp-client/pom.xml +++ b/modules/ftp-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-alise/pom.xml b/modules/gplazma2-alise/pom.xml index 05b0dcaf9c6..4346387aebc 100644 --- a/modules/gplazma2-alise/pom.xml +++ b/modules/gplazma2-alise/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-banfile/pom.xml b/modules/gplazma2-banfile/pom.xml index 4c9eb04d75b..43e18c069ab 100644 --- a/modules/gplazma2-banfile/pom.xml +++ b/modules/gplazma2-banfile/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-fermi/pom.xml b/modules/gplazma2-fermi/pom.xml index 3807a15eef4..c3a3bddc5e5 100644 --- a/modules/gplazma2-fermi/pom.xml +++ b/modules/gplazma2-fermi/pom.xml @@ -5,7 +5,7 @@ dcache-parent org.dcache - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml @@ -18,7 +18,7 @@ org.dcache gplazma2 - 10.2.12-SNAPSHOT + 10.2.12 com.google.code.gson diff --git a/modules/gplazma2-grid/pom.xml b/modules/gplazma2-grid/pom.xml index b80d1fd83b0..2903a87b283 100644 --- a/modules/gplazma2-grid/pom.xml +++ b/modules/gplazma2-grid/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-htpasswd/pom.xml b/modules/gplazma2-htpasswd/pom.xml index 38739350234..2b4f58011c9 100644 --- a/modules/gplazma2-htpasswd/pom.xml +++ b/modules/gplazma2-htpasswd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-jaas/pom.xml b/modules/gplazma2-jaas/pom.xml index 3f76a02e529..45fbe1be276 100644 --- a/modules/gplazma2-jaas/pom.xml +++ b/modules/gplazma2-jaas/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-kpwd/pom.xml b/modules/gplazma2-kpwd/pom.xml index d0494076b50..0dd640dc842 100644 --- a/modules/gplazma2-kpwd/pom.xml +++ b/modules/gplazma2-kpwd/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-krb5/pom.xml b/modules/gplazma2-krb5/pom.xml index e48210ef579..16d180f8c9e 100644 --- a/modules/gplazma2-krb5/pom.xml +++ b/modules/gplazma2-krb5/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-ldap/pom.xml b/modules/gplazma2-ldap/pom.xml index 1809a00c246..c54c155e306 100644 --- a/modules/gplazma2-ldap/pom.xml +++ b/modules/gplazma2-ldap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-multimap/pom.xml b/modules/gplazma2-multimap/pom.xml index e1d81b238c6..94ad223b313 100644 --- a/modules/gplazma2-multimap/pom.xml +++ b/modules/gplazma2-multimap/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-nis/pom.xml b/modules/gplazma2-nis/pom.xml index 54d23a7aea0..cfe412000aa 100644 --- a/modules/gplazma2-nis/pom.xml +++ b/modules/gplazma2-nis/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-nsswitch/pom.xml b/modules/gplazma2-nsswitch/pom.xml index d9dd1f5ac5d..715a87a5720 100644 --- a/modules/gplazma2-nsswitch/pom.xml +++ b/modules/gplazma2-nsswitch/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-oidc-te/pom.xml b/modules/gplazma2-oidc-te/pom.xml index 14da632f9ed..3b95d14ab8a 100644 --- a/modules/gplazma2-oidc-te/pom.xml +++ b/modules/gplazma2-oidc-te/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-oidc/pom.xml b/modules/gplazma2-oidc/pom.xml index c8a1f7f1d99..b5c62fa9582 100644 --- a/modules/gplazma2-oidc/pom.xml +++ b/modules/gplazma2-oidc/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-omnisession/pom.xml b/modules/gplazma2-omnisession/pom.xml index 7009fd5c3d8..4314ced72bc 100644 --- a/modules/gplazma2-omnisession/pom.xml +++ b/modules/gplazma2-omnisession/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-pyscript/pom.xml b/modules/gplazma2-pyscript/pom.xml index 55b0b657a64..d9b88bcb0e2 100644 --- a/modules/gplazma2-pyscript/pom.xml +++ b/modules/gplazma2-pyscript/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-roles/pom.xml b/modules/gplazma2-roles/pom.xml index fad1b57fe2d..2aecf23ae55 100644 --- a/modules/gplazma2-roles/pom.xml +++ b/modules/gplazma2-roles/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-scitoken/pom.xml b/modules/gplazma2-scitoken/pom.xml index 07ca371f34d..df6670ecff4 100644 --- a/modules/gplazma2-scitoken/pom.xml +++ b/modules/gplazma2-scitoken/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2-voms/pom.xml b/modules/gplazma2-voms/pom.xml index 605edf52fba..3b70261c6b6 100644 --- a/modules/gplazma2-voms/pom.xml +++ b/modules/gplazma2-voms/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/gplazma2/pom.xml b/modules/gplazma2/pom.xml index 31fb1fe802f..6d6718f968b 100644 --- a/modules/gplazma2/pom.xml +++ b/modules/gplazma2/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/logback-console-config/pom.xml b/modules/logback-console-config/pom.xml index 19e8dfbd4a8..c1a215ef5dc 100644 --- a/modules/logback-console-config/pom.xml +++ b/modules/logback-console-config/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/logback-test-config/pom.xml b/modules/logback-test-config/pom.xml index 64953ddb929..a67bd3d5bc3 100644 --- a/modules/logback-test-config/pom.xml +++ b/modules/logback-test-config/pom.xml @@ -3,7 +3,7 @@ org.dcache logback-test-config - 10.2.12-SNAPSHOT + 10.2.12 jar Logback config for building and testing diff --git a/modules/missingfiles-semsg/pom.xml b/modules/missingfiles-semsg/pom.xml index 87a928b8d0d..a80c452b58f 100644 --- a/modules/missingfiles-semsg/pom.xml +++ b/modules/missingfiles-semsg/pom.xml @@ -5,7 +5,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/srm-client/pom.xml b/modules/srm-client/pom.xml index defc537b7cb..6e470558705 100644 --- a/modules/srm-client/pom.xml +++ b/modules/srm-client/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/srm-common/pom.xml b/modules/srm-common/pom.xml index f4464b1a492..d766d912a72 100644 --- a/modules/srm-common/pom.xml +++ b/modules/srm-common/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/modules/srm-server/pom.xml b/modules/srm-server/pom.xml index aa00b162c0f..614ef575c18 100644 --- a/modules/srm-server/pom.xml +++ b/modules/srm-server/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 ../../pom.xml diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index 9c31101de8d..a417f76bab4 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.12-SNAPSHOT + 10.2.12 dcache-fhs diff --git a/packages/pom.xml b/packages/pom.xml index 5d6f8ecc14a..5fbef727439 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 packaging @@ -198,7 +198,7 @@ org.dcache gplazma2-pyscript - 10.2.12-SNAPSHOT + 10.2.12 org.dcache diff --git a/packages/system-test/pom.xml b/packages/system-test/pom.xml index a157609adbf..b3024740678 100644 --- a/packages/system-test/pom.xml +++ b/packages/system-test/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.12-SNAPSHOT + 10.2.12 system-test diff --git a/packages/tar/pom.xml b/packages/tar/pom.xml index 42ab5e027fc..0288f17e9e3 100644 --- a/packages/tar/pom.xml +++ b/packages/tar/pom.xml @@ -4,7 +4,7 @@ org.dcache packaging - 10.2.12-SNAPSHOT + 10.2.12 dcache-tar diff --git a/plugins/hsqldb/pom.xml b/plugins/hsqldb/pom.xml index 000acdde280..554a6bc2f8b 100644 --- a/plugins/hsqldb/pom.xml +++ b/plugins/hsqldb/pom.xml @@ -4,7 +4,7 @@ org.dcache plugins - 10.2.12-SNAPSHOT + 10.2.12 dcache-plugin-hsqldb diff --git a/plugins/pom.xml b/plugins/pom.xml index d3ea88aa867..5921b82157c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ org.dcache dcache-parent - 10.2.12-SNAPSHOT + 10.2.12 plugins diff --git a/pom.xml b/pom.xml index d2a38f7e1f6..f58d0cf0a52 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.dcache - 10.2.12-SNAPSHOT + 10.2.12 dcache-parent pom @@ -107,7 +107,7 @@ https://github.com/dCache/dcache scm:git:https://github.com/dCache/dcache.git scm:git:ssh://git@github.com/dCache/dcache.git - 10.2 + 10.2.12 From 05ae813e2d2bbd3a7a63b6b832bc5241a7574bad Mon Sep 17 00:00:00 2001 From: Marian Babik Date: Tue, 25 Mar 2025 10:05:50 +0100 Subject: [PATCH 54/57] doors,pools: extend ProtocolInfo to propagate Scitags to FlowMarkers The ProtocolInfo class is updated to pass information from doors to pools to propagate client-supplied SciTag to fireflies. The FLowMarker uses this information to calculate the experiment ID and the activity. Signed-off-by: Marian Babik --- .../vehicles/HttpProtocolInfo.java | 11 +++++ .../diskCacheV111/vehicles/ProtocolInfo.java | 4 ++ .../dcache/webdav/DcacheResourceFactory.java | 3 ++ .../dcache/vehicles/XrootdProtocolInfo.java | 12 +++++ .../dcache/xrootd/door/XrootdTransfer.java | 25 ++++++---- .../main/java/org/dcache/net/FlowMarker.java | 9 +++- .../dcache/pool/movers/TransferLifeCycle.java | 47 ++++++++++--------- .../java/org/dcache/net/FlowMarkerTest.java | 15 ++++-- 8 files changed, 86 insertions(+), 40 deletions(-) diff --git a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/HttpProtocolInfo.java b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/HttpProtocolInfo.java index ae4aa13ab2f..2dc15a67d23 100644 --- a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/HttpProtocolInfo.java +++ b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/HttpProtocolInfo.java @@ -38,6 +38,7 @@ public enum Disposition { private final InetSocketAddress _clientSocketAddress; private long _transferTime; private long _bytesTransferred; + private String _transferTag; /* TODO: Change this to long (but remember backwards compatibility!) */ private int _sessionId; @@ -103,6 +104,7 @@ public HttpProtocolInfo(String protocol, int major, int minor, _disposition = disposition; _wantedChecksum = wantedChecksums.isEmpty() ? null : wantedChecksums.get(0); _wantedChecksums = Set.copyOf(wantedChecksums); + _transferTag = ""; } public String getHttpDoorCellName() { @@ -171,6 +173,15 @@ public long getBytesTransferred() { return _bytesTransferred; } + public void setTransferTag(String tag) { + _transferTag = tag; + } + + @Override + public String getTransferTag() { + return _transferTag; + } + public String toString() { String sb = getVersionString() + ':' + _clientSocketAddress.getAddress().getHostAddress() + diff --git a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/ProtocolInfo.java b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/ProtocolInfo.java index 52d25f0f22a..b5c45166e24 100644 --- a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/ProtocolInfo.java +++ b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/ProtocolInfo.java @@ -22,4 +22,8 @@ public interface ProtocolInfo extends Serializable { int getMajorVersion(); String getVersionString(); + + default String getTransferTag() { + return ""; + } } diff --git a/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java b/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java index ad2136fb2be..65925aeaae3 100644 --- a/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java +++ b/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java @@ -1683,6 +1683,7 @@ private class HttpTransfer extends RedirectedTransfer { * The original request path that will be passed to pool for fall-back redirect. */ private final String _requestPath; + private String _transferTag = ""; public HttpTransfer(PnfsHandler pnfs, Subject subject, Restriction restriction, FsPath path) throws URISyntaxException { @@ -1693,6 +1694,7 @@ public HttpTransfer(PnfsHandler pnfs, Subject subject, var request = ServletRequest.getRequest(); request.setAttribute(TRANSACTION_ATTRIBUTE, getTransaction()); _requestPath = Requests.stripToPath(request.getRequestURL().toString()); + _transferTag = request.getHeader("SciTag"); } protected ProtocolInfo createProtocolInfo(InetSocketAddress address) { @@ -1711,6 +1713,7 @@ protected ProtocolInfo createProtocolInfo(InetSocketAddress address) { _disposition, wantedChecksums); protocolInfo.setSessionId((int) getId()); + protocolInfo.setTransferTag(_transferTag); return protocolInfo; } diff --git a/modules/dcache-xrootd/src/main/java/org/dcache/vehicles/XrootdProtocolInfo.java b/modules/dcache-xrootd/src/main/java/org/dcache/vehicles/XrootdProtocolInfo.java index aec13f61d78..c4063c64e3a 100644 --- a/modules/dcache-xrootd/src/main/java/org/dcache/vehicles/XrootdProtocolInfo.java +++ b/modules/dcache-xrootd/src/main/java/org/dcache/vehicles/XrootdProtocolInfo.java @@ -52,6 +52,8 @@ public enum Flags { private boolean _overwriteAllowed; + private String _transferTag; + public XrootdProtocolInfo(String protocol, int major, int minor, InetSocketAddress clientAddress, CellPath pathToDoor, PnfsId pnfsID, int xrootdFileHandle, UUID uuid, @@ -66,6 +68,7 @@ public XrootdProtocolInfo(String protocol, int major, int minor, _uuid = uuid; _doorAddress = doorAddress; _flags = Sets.newEnumSet(asList(flags), Flags.class); + _transferTag = ""; } public Serializable getDelegatedCredential() { @@ -166,4 +169,13 @@ public void setTpcGid(Long tpcGid) { public void setOverwriteAllowed(boolean overwriteAllowed) { _overwriteAllowed = overwriteAllowed; } + + public void setTransferTag(String tag) { + _transferTag = tag; + } + + @Override + public String getTransferTag() { + return _transferTag; + } } diff --git a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdTransfer.java b/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdTransfer.java index 613c35b1555..2a44adaadc0 100644 --- a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdTransfer.java +++ b/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdTransfer.java @@ -31,12 +31,14 @@ public class XrootdTransfer extends RedirectedTransfer { private boolean proxiedTransfer; private final XrootdTpcInfo tpcInfo; private final Restriction restriction; + private String _transferTag; public XrootdTransfer(PnfsHandler pnfs, Subject subject, - Restriction restriction, FsPath path, Map opaque) throws ParseException { + Restriction restriction, FsPath path, Map opaque) throws ParseException { super(pnfs, subject, restriction, path); this.restriction = requireNonNull(restriction); tpcInfo = new XrootdTpcInfo(opaque); + _transferTag = opaque.getOrDefault("scitag.flow", ""); try { tpcInfo.setUid(Subjects.getUid(subject)); } catch (NoSuchElementException e) { @@ -109,15 +111,18 @@ protected ProtocolInfo getProtocolInfoForPool() { } private XrootdProtocolInfo createXrootdProtocolInfo() { - return new XrootdProtocolInfo(XrootdDoor.XROOTD_PROTOCOL_STRING, - XrootdProtocol.PROTOCOL_VERSION_MAJOR, - XrootdProtocol.PROTOCOL_VERSION_MINOR, - getClientAddress(), - new CellPath(getCellName(), getDomainName()), - getPnfsId(), - _fileHandle, - _uuid, - _doorAddress); + XrootdProtocolInfo protocolInfo = new XrootdProtocolInfo(XrootdDoor.XROOTD_PROTOCOL_STRING, + XrootdProtocol.PROTOCOL_VERSION_MAJOR, + XrootdProtocol.PROTOCOL_VERSION_MINOR, + getClientAddress(), + new CellPath(getCellName(), getDomainName()), + getPnfsId(), + _fileHandle, + _uuid, + _doorAddress); + + protocolInfo.setTransferTag(_transferTag); + return protocolInfo; } @Override diff --git a/modules/dcache/src/main/java/org/dcache/net/FlowMarker.java b/modules/dcache/src/main/java/org/dcache/net/FlowMarker.java index 75003728025..7116703a350 100644 --- a/modules/dcache/src/main/java/org/dcache/net/FlowMarker.java +++ b/modules/dcache/src/main/java/org/dcache/net/FlowMarker.java @@ -104,7 +104,7 @@ public FlowMarkerBuilder withProtocol(String proto) { return this; } - public JSONObject build(String state) { + public String build(String state) { switch (state) { case "start": @@ -123,7 +123,12 @@ public JSONObject build(String state) { lifecycle.put("state", state); lifecycle.put("current-time", DateTimeFormatter.ISO_INSTANT.format(Instant.now())); - return payload; + String jsonPayload = payload.toString(); + String time = DateTimeFormatter.ISO_INSTANT.format(Instant.now()); + String host = flow.has("src-ip") ? flow.getString("src-ip") : "localhost"; + String syslogHeader = String.format("<134>1 %s %s dCache - firefly-json - ", time, host); + + return syslogHeader + jsonPayload; } } } diff --git a/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java b/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java index 64fc9e6bb9d..3e8e596ffb9 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java +++ b/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java @@ -36,10 +36,8 @@ import java.util.function.Predicate; import javax.annotation.Nonnull; import javax.security.auth.Subject; -import org.dcache.auth.Subjects; import org.dcache.net.FlowMarker.FlowMarkerBuilder; import org.dcache.util.IPMatcher; -import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,7 +84,7 @@ public void onStart(InetSocketAddress src, InetSocketAddress dst, ProtocolInfo p var data = new FlowMarkerBuilder() .withStartedAt(Instant.now()) - .withExperimentId(getExperimentId(subject)) + .withExperimentId(getExperimentId(protocolInfo)) .withActivityId(getActivity(protocolInfo)) .wittApplication(getApplication(protocolInfo)) .withProtocol("tcp") @@ -123,7 +121,7 @@ public void onEnd(InetSocketAddress src, InetSocketAddress dst, ProtocolInfo pro var data = new FlowMarkerBuilder() .withStartedAt(Instant.now()) .withFinishedAt(Instant.now()) - .withExperimentId(getExperimentId(subject)) + .withExperimentId(getExperimentId(protocolInfo)) .withActivityId(getActivity(protocolInfo)) .wittApplication(getApplication(protocolInfo)) .withProtocol("tcp") @@ -162,10 +160,10 @@ public void setEnabled(boolean isEnabled) { * @param payload the marker * @throws IllegalStateException if flow marker ist not build. */ - private void send(InetSocketAddress dst, @Nonnull JSONObject payload) + private void send(InetSocketAddress dst, @Nonnull String payload) throws IllegalStateException { - byte[] data = payload.toString().getBytes(StandardCharsets.UTF_8); + byte[] data = payload.getBytes(StandardCharsets.UTF_8); DatagramPacket p = new DatagramPacket(data, data.length); try (DatagramSocket socket = new DatagramSocket()) { socket.connect(dst); @@ -177,6 +175,21 @@ private void send(InetSocketAddress dst, @Nonnull JSONObject payload) private boolean needMarker(ProtocolInfo protocolInfo) { + if (protocolInfo.getTransferTag().isEmpty()) { + return false; + } + + try { + int transferTag = Integer.parseInt(protocolInfo.getTransferTag()); + if (transferTag <= 64 || transferTag >= 65536) { + LOGGER.warn("Invalid integer range for transfer tag: {}", protocolInfo.getTransferTag()); + return false; + } + } catch (NumberFormatException e) { + LOGGER.warn("Invalid transfer tag: {}", protocolInfo.getTransferTag()); + return false; + } + switch (protocolInfo.getProtocol().toLowerCase()) { case "xrootd": case "http": @@ -191,21 +204,9 @@ private String getApplication(ProtocolInfo protocolInfo) { return protocolInfo.getProtocol().toLowerCase(); } - private int getExperimentId(Subject subject) { - - var vo = Subjects.getPrimaryFqan(subject); - if (vo == null) { - return 0; - } - - switch (vo.getGroup().toLowerCase()) { - case "atlas": - return 16; - case "cms": - return 23; - default: - return 0; - } + private int getExperimentId(ProtocolInfo protocolInfo) { + // scitag = exp_id << 6 | act_id + return Integer.parseInt(protocolInfo.getTransferTag()) >> 6; } private boolean isLocalTransfer(InetSocketAddress dst) { @@ -214,8 +215,8 @@ private boolean isLocalTransfer(InetSocketAddress dst) { } private int getActivity(ProtocolInfo protocolInfo) { - // REVISIT: the activity should come from protocol info - return 14; // production + // scitag = exp_id << 6 | act_id + return Integer.parseInt(protocolInfo.getTransferTag()) & 0x3F; } private String toAFI(InetSocketAddress dst) { diff --git a/modules/dcache/src/test/java/org/dcache/net/FlowMarkerTest.java b/modules/dcache/src/test/java/org/dcache/net/FlowMarkerTest.java index 1d4ba81d8dd..b538d274371 100644 --- a/modules/dcache/src/test/java/org/dcache/net/FlowMarkerTest.java +++ b/modules/dcache/src/test/java/org/dcache/net/FlowMarkerTest.java @@ -1,5 +1,7 @@ package org.dcache.net; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.io.InputStream; import java.net.InetAddress; @@ -66,7 +68,7 @@ public void shouldAcceptFullyBuildStartMarker() { .withSource(new InetSocketAddress(InetAddress.getLoopbackAddress(), 5678)) .build("start"); - assertJson(data); + assertFirefly(data); } @Test @@ -83,7 +85,7 @@ public void shouldAcceptFullyBuildEndMarker() { .withSource(new InetSocketAddress(InetAddress.getLoopbackAddress(), 5678)) .build("end"); - assertJson(data); + assertFirefly(data); } @Test @@ -99,7 +101,7 @@ public void shouldAcceptFullyBuildOngoingMarker() { .withSource(new InetSocketAddress(InetAddress.getLoopbackAddress(), 5678)) .build("ongoing"); - assertJson(data); + assertFirefly(data); } @Test(expected = AssertionError.class) @@ -107,11 +109,14 @@ public void shouldFailWithEmptyMarker() { var data = new FlowMarkerBuilder() .build("start"); - assertJson(data); + assertFirefly(data); } - private void assertJson(JSONObject json) { + private void assertFirefly(String firefly) { + assertTrue(firefly.contains("dCache - firefly-json -")); + assertTrue(firefly.contains("<134>1")); + var json = new JSONObject(firefly.substring(firefly.indexOf("{"))); try { SCHEMA.validate(json); } catch (ValidationException e) { From 096676cbf044b319a8e09ce7d3c2d76711140cc6 Mon Sep 17 00:00:00 2001 From: Marian Babik Date: Fri, 4 Apr 2025 16:12:34 +0200 Subject: [PATCH 55/57] Scitags: fallback mechanism (#7775) This brings back the fallback mechanism to generate fireflies based on the subject's virtual organisation, even if there are no transfer tags indicated in the protocols. It introduces a default mapping via the configuration variable pool.firefly.vo-mapping Adds fallback mechanism to determine network tags from the Subject's virtual organisation. A configurable mapping is used to map VO names to the corresponding experiment IDs. Signed-off-by: Marian Babik --- .../dcache/pool/movers/TransferLifeCycle.java | 102 ++++++++++++++---- .../org/dcache/pool/classic/pool.xml | 1 + skel/share/defaults/pool.properties | 10 +- 3 files changed, 90 insertions(+), 23 deletions(-) diff --git a/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java b/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java index 3e8e596ffb9..61064d48cfe 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java +++ b/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java @@ -34,8 +34,12 @@ import java.time.Instant; import java.util.function.Function; import java.util.function.Predicate; +import java.util.Map; +import java.util.OptionalInt; +import java.util.HashMap; import javax.annotation.Nonnull; import javax.security.auth.Subject; +import org.dcache.auth.Subjects; import org.dcache.net.FlowMarker.FlowMarkerBuilder; import org.dcache.util.IPMatcher; import org.slf4j.Logger; @@ -60,6 +64,8 @@ public class TransferLifeCycle { private boolean enabled; + private Map voToExpId = new HashMap<>(); + /** * Mark transfer start. * @param src remote client endpoint @@ -82,9 +88,14 @@ public void onStart(InetSocketAddress src, InetSocketAddress dst, ProtocolInfo p return; } + var optionalExpId = getExperimentId(protocolInfo, subject); + if (optionalExpId.isEmpty()) { + return; + } + var data = new FlowMarkerBuilder() .withStartedAt(Instant.now()) - .withExperimentId(getExperimentId(protocolInfo)) + .withExperimentId(optionalExpId.getAsInt()) .withActivityId(getActivity(protocolInfo)) .wittApplication(getApplication(protocolInfo)) .withProtocol("tcp") @@ -118,10 +129,15 @@ public void onEnd(InetSocketAddress src, InetSocketAddress dst, ProtocolInfo pro return; } + var optionalExpId = getExperimentId(protocolInfo, subject); + if (optionalExpId.isEmpty()) { + return; + } + var data = new FlowMarkerBuilder() .withStartedAt(Instant.now()) .withFinishedAt(Instant.now()) - .withExperimentId(getExperimentId(protocolInfo)) + .withExperimentId(optionalExpId.getAsInt()) .withActivityId(getActivity(protocolInfo)) .wittApplication(getApplication(protocolInfo)) .withProtocol("tcp") @@ -153,6 +169,29 @@ public void setEnabled(boolean isEnabled) { enabled = isEnabled; } + /** + * Configures VO (Virtual Organization) to Experiment ID mapping. + * + * @param voMap A comma-separated string of VO mapping entries in the format + * "voName:expId". + */ + public void setVoMapping(String voMap) { + voToExpId.clear(); + + for (String entry : voMap.split(",")) { + String[] parts = entry.split(":"); + if (parts.length == 2) { + try { + voToExpId.put(parts[0].trim().toLowerCase(), Integer.parseInt(parts[1].trim())); + } catch (NumberFormatException e) { + LOGGER.warn("Invalid VO mapping entry: {}", entry); + } + } else { + LOGGER.warn("Invalid VO mapping entry: {}", entry); + } + } + } + /** * Send flow marker. * @@ -175,21 +214,6 @@ private void send(InetSocketAddress dst, @Nonnull String payload) private boolean needMarker(ProtocolInfo protocolInfo) { - if (protocolInfo.getTransferTag().isEmpty()) { - return false; - } - - try { - int transferTag = Integer.parseInt(protocolInfo.getTransferTag()); - if (transferTag <= 64 || transferTag >= 65536) { - LOGGER.warn("Invalid integer range for transfer tag: {}", protocolInfo.getTransferTag()); - return false; - } - } catch (NumberFormatException e) { - LOGGER.warn("Invalid transfer tag: {}", protocolInfo.getTransferTag()); - return false; - } - switch (protocolInfo.getProtocol().toLowerCase()) { case "xrootd": case "http": @@ -204,9 +228,38 @@ private String getApplication(ProtocolInfo protocolInfo) { return protocolInfo.getProtocol().toLowerCase(); } - private int getExperimentId(ProtocolInfo protocolInfo) { - // scitag = exp_id << 6 | act_id - return Integer.parseInt(protocolInfo.getTransferTag()) >> 6; + /** + * Determine experiment ID, initially from the ProtocolInfo (xroot/http), + * if that fails then fallback to the Subject's primary FQAN. + * + * @param protocolInfo the ProtocolInfo object containing transfer-related metadata + * @param subject the Subject representing the user or entity associated with the transfer + * @return the experiment ID, or -1 if it cannot be determined + */ + private OptionalInt getExperimentId(ProtocolInfo protocolInfo, Subject subject) { + if (protocolInfo.getTransferTag() != null && !protocolInfo.getTransferTag().isEmpty()) { + try { + int transferTag = Integer.parseInt(protocolInfo.getTransferTag()); + if (transferTag <= 64 || transferTag >= 65536) { + LOGGER.warn("Invalid integer range for transfer tag: {}", protocolInfo.getTransferTag()); + return OptionalInt.empty(); + } + // scitag = exp_id << 6 | act_id + return OptionalInt.of(transferTag >> 6); + } catch (NumberFormatException e) { + LOGGER.warn("Invalid transfer tag: {}", protocolInfo.getTransferTag()); + return OptionalInt.empty(); + } + } + + var vo = Subjects.getPrimaryFqan(subject); + if (vo == null) { + return OptionalInt.empty(); + } + + return voToExpId.containsKey(vo.getGroup().toLowerCase()) + ? OptionalInt.of(voToExpId.get(vo.getGroup().toLowerCase())) + : OptionalInt.empty(); } private boolean isLocalTransfer(InetSocketAddress dst) { @@ -215,8 +268,13 @@ private boolean isLocalTransfer(InetSocketAddress dst) { } private int getActivity(ProtocolInfo protocolInfo) { - // scitag = exp_id << 6 | act_id - return Integer.parseInt(protocolInfo.getTransferTag()) & 0x3F; + if (!protocolInfo.getTransferTag().isEmpty()) { + // scitag = exp_id << 6 | act_id + return Integer.parseInt(protocolInfo.getTransferTag()) & 0x3F; + } else { + // default activity id = 1 + return 1; + } } private String toAFI(InetSocketAddress dst) { diff --git a/modules/dcache/src/main/resources/org/dcache/pool/classic/pool.xml b/modules/dcache/src/main/resources/org/dcache/pool/classic/pool.xml index 379490850b3..456451b2d12 100644 --- a/modules/dcache/src/main/resources/org/dcache/pool/classic/pool.xml +++ b/modules/dcache/src/main/resources/org/dcache/pool/classic/pool.xml @@ -350,6 +350,7 @@ + Date: Mon, 19 May 2025 09:49:17 +0200 Subject: [PATCH 56/57] Scitags: Firefly usage and stats (#7778) * Introduces usage and storage statistics in fireflies (FlowMaker), which are used to track the data transfer(s) direction and estimate storage performance wrt. network usage. Signed-off-by: Marian Babik --- .../vehicles/MoverInfoMessage.java | 19 +++++++++++ .../main/java/org/dcache/net/FlowMarker.java | 34 +++++++++++++++++++ .../classic/DefaultPostTransferService.java | 5 +-- .../dcache/pool/movers/TransferLifeCycle.java | 25 ++++++++++---- .../org/dcache/pool/classic/pool.xml | 1 + skel/share/defaults/pool.properties | 7 +++- 6 files changed, 82 insertions(+), 9 deletions(-) diff --git a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/MoverInfoMessage.java b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/MoverInfoMessage.java index 8dd74776071..d90f38c3d1b 100644 --- a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/MoverInfoMessage.java +++ b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/MoverInfoMessage.java @@ -22,6 +22,8 @@ public class MoverInfoMessage extends PnfsFileInfoMessage { private Duration _readIdle; private Duration _writeActive; private Duration _writeIdle; + private double bytesRead = Double.NaN; + private double bytesWritten = Double.NaN; private static final long serialVersionUID = -7013160118909496211L; private String _transferPath; @@ -140,6 +142,23 @@ public void setLocalEndpoint(InetSocketAddress endpoint) { public Optional getLocalEndpoint() { return Optional.ofNullable(_localEndpoint); } + + public double getBytesRead() { + return bytesRead; + } + + public void setBytesRead(double bytesRead) { + this.bytesRead = bytesRead; + } + + public double getBytesWritten() { + return bytesWritten; + } + + public void setBytesWritten(double bytesWritten) { + this.bytesWritten = bytesWritten; + } + @Override public String toString() { return "MoverInfoMessage{" + diff --git a/modules/dcache/src/main/java/org/dcache/net/FlowMarker.java b/modules/dcache/src/main/java/org/dcache/net/FlowMarker.java index 7116703a350..0d7d371214e 100644 --- a/modules/dcache/src/main/java/org/dcache/net/FlowMarker.java +++ b/modules/dcache/src/main/java/org/dcache/net/FlowMarker.java @@ -18,9 +18,13 @@ package org.dcache.net; import com.google.common.net.InetAddresses; + +import diskCacheV111.vehicles.MoverInfoMessage; + import java.net.InetSocketAddress; import java.time.Instant; import java.time.format.DateTimeFormatter; + import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,6 +44,8 @@ public static class FlowMarkerBuilder { private final JSONObject lifecycle = new JSONObject(); private final JSONObject context = new JSONObject(); private final JSONObject flow = new JSONObject(); + private final JSONObject usage = new JSONObject(); + private final JSONObject stats = new JSONObject(); public FlowMarkerBuilder withStartedAt(Instant startTime) { lifecycle.put("start-time", DateTimeFormatter.ISO_INSTANT.format(startTime)); @@ -104,6 +110,31 @@ public FlowMarkerBuilder withProtocol(String proto) { return this; } + public FlowMarkerBuilder withUsage(double bytesRead, double bytesWritten) { + // approx. - assumes bytesWritten to disk are bytes "received" over the network + // and bytesRead from disk are bytes "sent" to the network + usage.put("received", Double.isFinite(bytesWritten) ? (long) bytesWritten : 0L); + usage.put("sent", Double.isFinite(bytesRead) ? (long) bytesRead : 0L); + return this; + } + + public FlowMarkerBuilder withStats(MoverInfoMessage message) { + stats.put("bytes-transferred", message.getDataTransferred()); + stats.put("connection-time", message.getConnectionTime()); + stats.put("read-bw", Double.isFinite(message.getMeanReadBandwidth()) ? (long) message.getMeanReadBandwidth() : 0L); + stats.put("write-bw", Double.isFinite(message.getMeanWriteBandwidth()) ? (long) message.getMeanWriteBandwidth() : 0L); + stats.put("read-active", message.getReadActive().isPresent() ? message.getReadActive().get().toString() : "0"); + stats.put("read-idle", message.getReadIdle().isPresent() ? message.getReadIdle().get().toString() : "0"); + stats.put("write-active", message.getWriteActive().isPresent() ? message.getWriteActive().get().toString() : "0"); + stats.put("write-idle", message.getWriteIdle().isPresent() ? message.getWriteIdle().get().toString() : "0"); + return this; + } + + public FlowMarkerBuilder withFlowId(String id) { + flow.put("flow-id", id); + return this; + } + public String build(String state) { switch (state) { @@ -119,6 +150,9 @@ public String build(String state) { payload.put("flow-lifecycle", lifecycle); payload.put("context", context); payload.put("flow-id", flow); + payload.put("usage", usage); + if(!stats.isEmpty()) + payload.put("storage-stats", stats); lifecycle.put("state", state); lifecycle.put("current-time", DateTimeFormatter.ISO_INSTANT.format(Instant.now())); diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/DefaultPostTransferService.java b/modules/dcache/src/main/java/org/dcache/pool/classic/DefaultPostTransferService.java index 1b492e5a8ae..bc7c73cbb7b 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/DefaultPostTransferService.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/DefaultPostTransferService.java @@ -208,12 +208,14 @@ private static MoverInfoMessage updateIoStatistics(MoverInfoMessage info, SnapshotStatistics writeStats = writes.statistics(); if (readStats.requestedBytes().getN() > 0) { + info.setBytesRead(readStats.transferredBytes().getSum()); info.setMeanReadBandwidth(readStats.instantaneousBandwidth().getMean()); info.setReadActive(reads.active()); info.setReadIdle(reads.idle()); } if (writeStats.requestedBytes().getN() > 0) { + info.setBytesWritten(writeStats.transferredBytes().getSum()); info.setMeanWriteBandwidth(writeStats.instantaneousBandwidth().getMean()); info.setWriteActive(writes.active()); info.setWriteIdle(writes.idle()); @@ -240,8 +242,7 @@ public void sendFinished(Mover mover, MoverInfoMessage moverInfoMessage) { mover.getLocalEndpoint().ifPresent(e -> transferLifeCycle.onEnd(((IpProtocolInfo) mover.getProtocolInfo()).getSocketAddress(), e, - mover.getProtocolInfo(), - mover.getSubject())); + moverInfoMessage)); _door.notify(mover.getPathToDoor(), finished); } diff --git a/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java b/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java index 61064d48cfe..2d12803d454 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java +++ b/modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java @@ -22,6 +22,8 @@ import com.google.common.base.Strings; import com.google.common.net.HostAndPort; + +import diskCacheV111.vehicles.MoverInfoMessage; import diskCacheV111.vehicles.ProtocolInfo; import java.io.IOException; import java.net.DatagramPacket; @@ -63,6 +65,7 @@ public class TransferLifeCycle { private Predicate localSubnet = a -> false; private boolean enabled; + private boolean storageStatisticsEnabled; private Map voToExpId = new HashMap<>(); @@ -75,7 +78,7 @@ public class TransferLifeCycle { */ public void onStart(InetSocketAddress src, InetSocketAddress dst, ProtocolInfo protocolInfo, Subject subject) { - + if (!enabled) { return; } @@ -114,9 +117,11 @@ public void onStart(InetSocketAddress src, InetSocketAddress dst, ProtocolInfo p * @param protocolInfo access protocol information * @param subject associated with the transfer */ - public void onEnd(InetSocketAddress src, InetSocketAddress dst, ProtocolInfo protocolInfo, - Subject subject) { + public void onEnd(InetSocketAddress src, InetSocketAddress dst, MoverInfoMessage mover) { + ProtocolInfo protocolInfo = mover.getProtocolInfo(); + Subject subject = mover.getSubject(); + if (!enabled) { return; } @@ -140,13 +145,17 @@ public void onEnd(InetSocketAddress src, InetSocketAddress dst, ProtocolInfo pro .withExperimentId(optionalExpId.getAsInt()) .withActivityId(getActivity(protocolInfo)) .wittApplication(getApplication(protocolInfo)) + .withUsage(mover.getBytesRead(), mover.getBytesWritten()) .withProtocol("tcp") .withAFI(toAFI(dst)) .withDestination(dst) - .withSource(src) - .build("end"); + .withSource(src); + if (storageStatisticsEnabled) { + data.withStats(mover); + } + var firefly = data.build("end"); - send(toFireflyDestination.apply(src), data); + send(toFireflyDestination.apply(src), firefly); } public void setFireflyDestination(String addr) { @@ -169,6 +178,10 @@ public void setEnabled(boolean isEnabled) { enabled = isEnabled; } + public void setStorageStatisticsEnabled(boolean isEnabled) { + storageStatisticsEnabled = isEnabled; + } + /** * Configures VO (Virtual Organization) to Experiment ID mapping. * diff --git a/modules/dcache/src/main/resources/org/dcache/pool/classic/pool.xml b/modules/dcache/src/main/resources/org/dcache/pool/classic/pool.xml index 456451b2d12..b36db8c04bb 100644 --- a/modules/dcache/src/main/resources/org/dcache/pool/classic/pool.xml +++ b/modules/dcache/src/main/resources/org/dcache/pool/classic/pool.xml @@ -351,6 +351,7 @@ + Date: Mon, 19 May 2025 09:53:49 +0200 Subject: [PATCH 57/57] 10.2.12-scitags release --- packages/fhs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fhs/pom.xml b/packages/fhs/pom.xml index a417f76bab4..e178a2b1dc5 100644 --- a/packages/fhs/pom.xml +++ b/packages/fhs/pom.xml @@ -26,7 +26,7 @@ 1 - + scitags