Skip to content

Conversation

@wind57
Copy link
Contributor

@wind57 wind57 commented Mar 14, 2022

No description provided.

@wind57 wind57 changed the title see if it fails on the pipeline bouncycastle dependency added Mar 14, 2022

import static org.assertj.core.api.Assertions.assertThat;

@RunWith(SpringRunner.class)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

minor clean-up from junit-4

parallelism: 5 # parallel containers to split the tests among
machine:
image: circleci/classic:201707-01
image: ubuntu-2004:202201-02
Copy link
Contributor Author

Choose a reason for hiding this comment

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

newer images, these will not work anymore from May 22 (and until then there will be random times when they will not be available), so let's just upgrade

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah I changed this on main but forgot to cherry pick it, thanks!

<scope>test</scope>
</dependency>

<dependency>
Copy link
Contributor Author

@wind57 wind57 Mar 14, 2022

Choose a reason for hiding this comment

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

fabric-autoconfig tests where failing for me in a diff PR, and I have noticed that this dependency is needed, but it's not in place anymore. I guess it was coming from some spring-boot dependency and now it is not there anymore.

Copy link
Contributor

Choose a reason for hiding this comment

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

All of our builds internally are passing both in the 2.1.x and main branches, so I don't think anything changes that would cause us to need this dependency now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Im really sorry - the error was on my laptop, only. :(

Copy link
Contributor

Choose a reason for hiding this comment

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

No worries glad you got if figured it. Still worth making the other changes though.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right, build is green now

@wind57
Copy link
Contributor Author

wind57 commented Mar 14, 2022

seems like maven central is having issues, its either extremely slow or lots of Connection Reset

<wiremock.version>2.26.3</wiremock.version>
<spring-retry.version>1.3.1</spring-retry.version>
<commons.collections4.version>4.4</commons.collections4.version>
<bouncycastle.version>1.69</bouncycastle.version>
Copy link
Contributor Author

@wind57 wind57 Mar 14, 2022

Choose a reason for hiding this comment

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

this is the highest version where both clients are compatible, as both need it. I tried 1.70, fabric8 works, but native one fails with a missing method. I will take a look closer into that error and see if an upgrade will help, but that is out of scope here. So for now, this version will do

@codecov
Copy link

codecov bot commented Mar 14, 2022

Codecov Report

Merging #985 (c64b388) into 2.1.x (1495f08) will decrease coverage by 0.17%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##              2.1.x     #985      +/-   ##
============================================
- Coverage     51.98%   51.81%   -0.18%     
+ Complexity      537      532       -5     
============================================
  Files           134      134              
  Lines          2868     2868              
  Branches        280      280              
============================================
- Hits           1491     1486       -5     
- Misses         1264     1265       +1     
- Partials        113      117       +4     
Impacted Files Coverage Δ
...oud/kubernetes/fabric8/Fabric8InfoContributor.java 94.44% <0.00%> (-5.56%) ⬇️
.../KubernetesClientSecretsPropertySourceLocator.java 85.71% <0.00%> (-4.77%) ⬇️
...etes/fabric8/discovery/KubernetesCatalogWatch.java 80.76% <0.00%> (-3.85%) ⬇️
...fabric8/config/Fabric8ConfigMapPropertySource.java 96.29% <0.00%> (-3.71%) ⬇️
...s/fabric8/discovery/KubernetesDiscoveryClient.java 87.50% <0.00%> (-0.79%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1495f08...c64b388. Read the comment docs.

@wind57 wind57 marked this pull request as ready for review March 14, 2022 20:11
@wind57 wind57 changed the title bouncycastle dependency added some cleanups Mar 14, 2022
@ryanjbaxter ryanjbaxter merged commit 798c636 into spring-cloud:2.1.x Mar 14, 2022
@ryanjbaxter ryanjbaxter modified the milestones: 2.0.6, 2.1.2 Mar 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants