Skip to content

NCL-9545 - Remove Alignment 2#607

Merged
rnc merged 26 commits intoproject-ncl:masterfrom
rnc:ALIGNMENT2
Feb 26, 2026
Merged

NCL-9545 - Remove Alignment 2#607
rnc merged 26 commits intoproject-ncl:masterfrom
rnc:ALIGNMENT2

Conversation

@rnc
Copy link
Contributor

@rnc rnc commented Feb 18, 2026

This will have associated commits in pnc-common and pnc-api. While Alignment2 was removed from orch & bacon it is still in the other repositories specifically DA. Those two commits will be needed to be merged first.

I realise there is a lot of commits here - I first revert everything down to the alignment 2 and then reverted some of latest reverts to reapply them. I also had to do some tweaks for opentelemetry and httpcomponents.

rnc added 24 commits February 13, 2026 14:38
This reverts commit 986d878.
This reverts commit 444a436.
This reverts commit c300858.
This reverts commit 20fa334.
This reverts commit 7dc9413.
This reverts commit dd4ee72.
@rnc
Copy link
Contributor Author

rnc commented Feb 23, 2026

retest this please

@rnc rnc marked this pull request as ready for review February 23, 2026 09:27
@thescouser89
Copy link
Contributor

Deferring to Jan for this one!

versions.add(parts[3]);
} else {
log.error("Cannot read version for artifact with identifier {}", art.getIdentifier());
log.error("Cannot read version for artifact with identifier %s", art.getIdentifier());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually an improvement here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It probably got removed in the mass reverts, I can go through and reapply them.

versions.add(parts[1]);
} else {
log.error("Cannot read version for artifact with identifier {}", art.getIdentifier());
log.error("Cannot read version for artifact with identifier %s", art.getIdentifier());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually an improvement here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It probably got removed in the mass reverts, I can go through and reapply them.

pom.xml Outdated
<version.pnc-api>2.5.0-SNAPSHOT</version.pnc-api>
<version.pnc>3.4.2</version.pnc>
<version.pnc-common>3.4.1-SNAPSHOT</version.pnc-common>
<version.pnc-api>3.5.0-SNAPSHOT</version.pnc-api>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a particular reason for the SNAPSHOT instead of latest released version of pnc-api? same for pnc-common

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pnc-api can be fixed version I think but pnc-common needs to be snapshot to pick up the changes from dependent PR

@rnc rnc merged commit 2eaa061 into project-ncl:master Feb 26, 2026
1 check passed
@rnc rnc deleted the ALIGNMENT2 branch February 26, 2026 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants