Skip to content

Modernization phase 2026 0 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k2merlinsix merged 2 commits into from
Sep 8, 2026
Merged

Modernization phase 2026 0 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
710de49
phase0: pin archetype to published releases and fix missing import
Aug 27, 2026
fcc228a
chore: green CI on JDK 21, refresh Maven wrapper, de-brittle license …
Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
with:
# needed for license-plugin to check last modified date of each file
fetch-depth: 0
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: '21'
Expand All @@ -39,11 +36,12 @@ jobs:
needs: [ build ]
runs-on: [ ubuntu-latest ]
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 11
java-version: '21'
distribution: 'temurin'
- name: mvn clean deploy
env:
REPO_USER: ${{ secrets.REPO_USER }}
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ jobs:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 11
java-version: '21'
distribution: 'temurin'
- name: setup git
run: |
git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
Expand Down
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
2 changes: 1 addition & 1 deletion .settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright 2020-2024 the original author or authors.
Copyright 2020-2026 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion camel-openapi-archetype/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2020-2024 the original author or authors.
Copyright 2020-2026 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion camel-openapi-archetype/src/build/license-header.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright ${license.git.copyrightYears} the original author or authors.
Copyright 2020-2026 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion camel-openapi-archetype/src/main/archetype/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<dependency>
<groupId>com.ms3-inc.tavros</groupId>
<artifactId>camel-rest-extensions</artifactId>
<version>0.1.7-SNAPSHOT</version>
<version>0.1.6</version>
<exclusions>
<!-- https://github.com/spring-projects/spring-framework/issues/20611 -->
<exclusion>
Expand Down
1 change: 1 addition & 0 deletions camel-openapi-archetype/src/main/archetype/src/main/java/RoutesImplementation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ${package};

import com.datasonnet.document.MediaTypes;
import org.apache.camel.language.datasonnet.DatasonnetExpression;
import org.springframework.stereotype.Component;

/**
Expand Down
4 changes: 2 additions & 2 deletions camel-openapi-archetype/src/main/resources/META-INF/archetype-post-generate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2020-2024 the original author or authors.
* Copyright 2020-2026 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -55,7 +55,7 @@ if (isSample) {
}

def generatedApiDirectory = request.outputDirectory + "/" + request.artifactId
def camelRestDslPluginVersion = '0.1.8-SNAPSHOT'
def camelRestDslPluginVersion = '0.1.7'
def mvnCommand = ['mvn', 'com.ms3-inc.tavros:camel-restdsl-openapi-plugin:' + camelRestDslPluginVersion + ':generate', '-DspecificationUri=' + specUri, '-f', generatedApiDirectory]

if (Files.exists(Path.of(specUri))) {
Expand Down
2 changes: 1 addition & 1 deletion camel-openapi-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright 2020-2021 the original author or authors.
Copyright 2020-2026 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion camel-openapi-archetype/src/test/resources/projects/it-build/archetype.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2021 the original author or authors.
# Copyright 2020-2026 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion camel-openapi-archetype/src/test/resources/projects/it-run/archetype.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2021 the original author or authors.
# Copyright 2020-2026 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion camel-scheduled-archetype/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2020-2024 the original author or authors.
Copyright 2020-2026 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion camel-scheduled-archetype/src/build/license-header.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright ${license.git.copyrightYears} the original author or authors.
Copyright 2020-2026 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
3 changes: 1 addition & 2 deletions camel-scheduled-archetype/src/main/resources/META-INF/archetype-post-generate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2020-2021 the original author or authors.
* Copyright 2020-2026 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import org.slf4j.Logger
import org.slf4j.LoggerFactory

Expand Down
2 changes: 1 addition & 1 deletion camel-scheduled-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2020-2021 the original author or authors.
Copyright 2020-2026 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Loading
Loading