Skip to content

Commit 2659164

Browse files
mariano-fernandezmariano-fernandez
committed
feat(deps): upgrade gravitee dependencies
This commit: - Updates all gravitee dependencies and does all necessary to make the build pass - Updates gravitee orb version + configuration - Updates renovate configuration
1 parent a9811e5 commit 2659164

Some content is hidden

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

48 files changed

+362
-361
lines changed

‎.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 2.1
44
setup: true
55

66
orbs:
7-
gravitee: gravitee-io/gravitee@2.1
7+
gravitee: gravitee-io/gravitee@4.12.1
88

99
# our single workflow, that triggers the setup job defined above, filters on tag and branches are needed otherwise
1010
# some workflow and job will not be triggered for tags (default CircleCI behavior)
@@ -22,7 +22,7 @@ workflows:
2222
setup_release:
2323
when:
2424
matches:
25-
pattern: "^[0-9]+\\.[0-9]+\\.[0-9]+$"
25+
pattern: "/^[0-9]+\\.[0-9]+\\.[0-9]+(-(alpha|beta|rc)\\.[0-9]+)?$/"
2626
value: << pipeline.git.tag >>
2727
jobs:
2828
- gravitee/setup_lib-release-config:
@@ -32,4 +32,4 @@ workflows:
3232
- /.*/
3333
tags:
3434
only:
35-
- /^[0-9]+\.[0-9]+\.[0-9]+$/
35+
- /^[0-9]+\.[0-9]+\.[0-9]+(-(alpha|beta|rc)\.[0-9]+)?$/

‎.github/renovate.json

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
{
2-
"extends": [
3-
"config:base",
4-
"schedule:earlyMondays"
5-
],
6-
"prConcurrentLimit": 3,
7-
"rebaseWhen": "conflicted",
8-
"packageRules": [
9-
{
10-
"matchDatasources": ["orb"],
11-
"rangeStrategy": "replace"
12-
}
13-
]
14-
}
2+
"extends": ["config:base", "schedule:earlyMondays"],
3+
"prConcurrentLimit": 3,
4+
"dependencyDashboard": true,
5+
"commitMessageTopic": "{{depName}}",
6+
"rebaseWhen": "conflicted",
7+
"packageRules": [
8+
{
9+
"matchDatasources": ["orb"],
10+
"rangeStrategy": "replace"
11+
}
12+
]
13+
}

‎pom.xml

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (C) 2015 The Gravitee team (http://gravitee.io)
4+
Copyright © 2015 The Gravitee team (http://gravitee.io)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
88
You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
http://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>io.gravitee</groupId>
2626
<artifactId>gravitee-parent</artifactId>
27-
<version>21.0.0</version>
27+
<version>22.3.0</version>
2828
</parent>
2929

3030
<groupId>io.gravitee.alert</groupId>
@@ -34,9 +34,12 @@
3434
<name>Gravitee.io - Alert - API</name>
3535

3636
<properties>
37-
<gravitee-common.version>2.0.0</gravitee-common.version>
38-
<gravitee-notifier-api.version>1.4.1</gravitee-notifier-api.version>
39-
<gravitee-bom.version>3.0.0</gravitee-bom.version>
37+
<skip.validation>false</skip.validation>
38+
39+
<gravitee-common.version>4.6.0</gravitee-common.version>
40+
<gravitee-notifier-api.version>1.4.3</gravitee-notifier-api.version>
41+
<gravitee-bom.version>8.2.11</gravitee-bom.version>
42+
<prettier-maven-plugin.prettierJavaVersion>2.1.0</prettier-maven-plugin.prettierJavaVersion>
4043
</properties>
4144

4245
<dependencyManagement>
@@ -72,8 +75,8 @@
7275

7376
<!-- Test scope -->
7477
<dependency>
75-
<groupId>junit</groupId>
76-
<artifactId>junit</artifactId>
78+
<groupId>org.junit.jupiter</groupId>
79+
<artifactId>junit-jupiter-engine</artifactId>
7780
<scope>test</scope>
7881
</dependency>
7982
</dependencies>
@@ -83,10 +86,9 @@
8386
<plugin>
8487
<groupId>com.hubspot.maven.plugins</groupId>
8588
<artifactId>prettier-maven-plugin</artifactId>
86-
<version>0.18</version>
8789
<configuration>
88-
<nodeVersion>12.13.0</nodeVersion>
89-
<prettierJavaVersion>1.6.1</prettierJavaVersion>
90+
<prettierJavaVersion>${prettier-maven-plugin.prettierJavaVersion}</prettierJavaVersion>
91+
<skip>${skip.validation}</skip>
9092
</configuration>
9193
<executions>
9294
<execution>

‎src/main/java/io/gravitee/alert/api/Listener.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/AbstractCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/AggregationCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/CompareCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/ComparisonBasedAccumulatorCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/Condition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/Filter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/MissingDataCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/RateCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/SingleValueCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/StringCompareCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/StringCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/ThresholdCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/ThresholdRangeCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/WindowBasedCondition.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/projection/AbstractProjection.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/projection/Projection.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎src/main/java/io/gravitee/alert/api/condition/projection/Projections.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/**
2-
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
1+
/*
2+
* Copyright © 2015 The Gravitee team (http://gravitee.io)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)