Skip to content

Commit

Permalink
Drop OpenAPI 2.0 support, enable validator and dependabot (#17)
Browse files Browse the repository at this point in the history
* Drop OpenAPI 2.0 support
* Enable belgif-rest-guide-validator-maven-plugin
* Enable dependabot for automatic github-actions and maven upgrades
* Upgrade maven plugin dependencies
* Use string for "${project.version}"
  • Loading branch information
jpraet authored Jan 28, 2025
1 parent 53d49b4 commit b1226b5
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 201 deletions.
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
groups:
maven:
patterns:
- "*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
8 changes: 8 additions & 0 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: dependabot-auto-merge
on:
pull_request:
types: [opened]
jobs:
dependabot:
uses: belgif/workflows/.github/workflows/dependabot-auto-merge-workflow.yml@main
secrets: inherit
42 changes: 20 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<groupId>io.github.belgif.rest.guide.validator</groupId>
<artifactId>belgif-rest-guide-validator-maven-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>unpack-swagger-dependencies</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack-dependencies</goal>
<goal>validate</goal>
</goals>
<configuration>
<includeClassifiers>swagger</includeClassifiers>
<outputDirectory>src/main/swagger</outputDirectory>
<fileMappers>
<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<pattern>belgif/</pattern>
<replacement>./</replacement>
</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
</fileMappers>
</configuration>
</execution>
</executions>
<configuration>
<files>
<file>src/main/openapi/common/v1/common-v1.yaml</file>
</files>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.1</version>
<executions>
<execution>
<id>unpack-openapi-dependencies</id>
<phase>generate-sources</phase>
Expand All @@ -59,11 +59,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<version>3.4.0</version>
<configuration>
<filesets>
<fileset>
<directory>src/main/swagger/problem</directory>
<directory>src/main/openapi/problem</directory>
</fileset>
</filesets>
Expand All @@ -72,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.7.1</version>
<executions>
<execution>
<id>create-distribution</id>
Expand All @@ -83,7 +82,6 @@
<configuration>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/swagger.xml</descriptor>
<descriptor>src/main/assembly/openapi.xml</descriptor>
</descriptors>
</configuration>
Expand All @@ -93,12 +91,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<version>3.1.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.2.7</version>
<executions>
<execution>
<phase>verify</phase>
Expand Down
21 changes: 0 additions & 21 deletions src/main/assembly/swagger.xml

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/openapi/common/v1/common-v1.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.0.0
info:
title: common technical data types
version: ${project.version}
version: "${project.version}"
license:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html
Expand Down
157 changes: 0 additions & 157 deletions src/main/swagger/common/v1/common-v1.yaml

This file was deleted.

0 comments on commit b1226b5

Please sign in to comment.