Skip to content

Commit

Permalink
chore: clean code & bump mvn dependancy version
Browse files Browse the repository at this point in the history
  • Loading branch information
ThibaudAV committed Jun 12, 2024
1 parent b444147 commit bde85ff
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 75 deletions.
25 changes: 1 addition & 24 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
{
"extends": ["config:base", ":label(dependencies)", "schedule:earlyMondays"],
"prConcurrentLimit": 3,
"rebaseWhen": "conflicted",
"packageRules": [
{
"matchDatasources": ["orb"],
"matchUpdateTypes": ["patch", "minor"],
"automerge": true,
"automergeType": "branch",
"semanticCommitType": "ci"
},
{
"matchDepTypes": ["provided", "test", "build", "import", "parent"],
"matchUpdateTypes": ["patch", "minor"],
"automerge": true,
"automergeType": "branch",
"semanticCommitType": "chore"
},
{
"matchDepTypes": ["provided", "test", "build", "import", "parent"],
"matchUpdateTypes": ["major"],
"semanticCommitType": "chore"
}
]
"extends": ["github>gravitee-io/renovate-config:policy"]
}
27 changes: 19 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,31 @@
<parent>
<groupId>io.gravitee</groupId>
<artifactId>gravitee-parent</artifactId>
<version>22.0.2</version>
<version>22.0.31</version>
</parent>

<properties>
<gravitee-bom.version>5.0.0</gravitee-bom.version>
<gravitee-gateway-api.version>3.1.0</gravitee-gateway-api.version>
<!-- TODO: Check version regarding APIM target -->
<!-- Gravitee dependencies for APIM >= 4.4.x -->
<gravitee-bom.version>8.0.4</gravitee-bom.version>
<gravitee-common.version>4.3.1</gravitee-common.version>
<gravitee-gateway-api.version>3.5.0</gravitee-gateway-api.version>
<gravitee-policy-api.version>1.11.0</gravitee-policy-api.version>
<gravitee-common.version>2.1.0</gravitee-common.version>
<gravitee-apim.version>4.0.8</gravitee-apim.version>
<gravitee-apim.version>4.4.0-SNAPSHOT</gravitee-apim.version>

<maven-plugin-assembly.version>3.5.0</maven-plugin-assembly.version>
<maven-plugin-prettier.version>0.19</maven-plugin-prettier.version>
<!-- Gravitee dependencies for APIM >= 4.1.x -->
<!-- <gravitee-bom.version>6.0.47</gravitee-bom.version>-->
<!-- <gravitee-common.version>3.4.1</gravitee-common.version>-->
<!-- <gravitee-gateway-api.version>3.2.3</gravitee-gateway-api.version>-->
<!-- <gravitee-policy-api.version>1.11.0</gravitee-policy-api.version>-->
<!-- <gravitee-apim.version>4.1.17</gravitee-apim.version>-->


<!-- Maven plugins -->
<maven-plugin-assembly.version>3.7.1</maven-plugin-assembly.version>
<maven-plugin-prettier.version>0.22</maven-plugin-prettier.version>
<maven-plugin-prettier.prettierjava.version>2.1.0</maven-plugin-prettier.prettierjava.version>
<maven-plugin-properties.version>1.1.0</maven-plugin-properties.version>
<maven-plugin-properties.version>1.2.1</maven-plugin-properties.version>
</properties>

<dependencyManagement>
Expand Down
20 changes: 0 additions & 20 deletions src/main/java/io/gravitee/policy/template/TemplatePolicy.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,6 @@
*/
package io.gravitee.policy.template;

/**
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import io.gravitee.common.http.HttpStatusCode;
import io.gravitee.gateway.reactive.api.ExecutionFailure;
import io.gravitee.gateway.reactive.api.context.HttpExecutionContext;
Expand All @@ -40,10 +24,6 @@
import io.reactivex.rxjava3.core.Completable;
import lombok.extern.slf4j.Slf4j;

/**
* @author Yann TAVERNIER (yann.tavernier at graviteesource.com)
* @author GraviteeSource Team
*/
@Slf4j
public class TemplatePolicy extends TemplatePolicyV3 implements Policy {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.gravitee.policy.template.configuration;/**
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.gravitee.policy.template.configuration;

import io.gravitee.policy.api.PolicyConfiguration;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

/**
* @author Yann TAVERNIER (yann.tavernier at graviteesource.com)
* @author GraviteeSource Team
*/
@Getter
@Setter
@NoArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Test;

/**
* @author Yann TAVERNIER (yann.tavernier at graviteesource.com)
* @author GraviteeSource Team
*/
@GatewayTest
@DeployApi({ "/apis/v4/api.json", "/apis/v4/api-response.json" })
public class TemplatePolicyIntegrationTest extends AbstractPolicyTest<TemplatePolicy, TemplatePolicyConfiguration> {
Expand Down

0 comments on commit bde85ff

Please sign in to comment.