Skip to content
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

Jump to bottom

renovate: Custom Manager for Velocity Templates #49

Merged
merged 6 commits into from
May 28, 2024
Merged

renovate: Custom Manager for Velocity Templates #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc8ce8d
run renovate locally
stefanseifert May 28, 2024
21f96e7
start with custom manager, disable npm for now
stefanseifert May 28, 2024
5633026
custom regex manager
stefanseifert May 28, 2024
6b40e73
comment formatting
stefanseifert May 28, 2024
8d0c707
support all properties
stefanseifert May 28, 2024
2de27b2
cleanup code
stefanseifert May 28, 2024
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
17 changes: 15 additions & 2 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,22 @@
],
"enabledManagers": [
"npm",
"maven"
"nvm",
"maven",
"custom.regex"
],
"npm": {
"minimumReleaseAge": "3 days"
}
},
"customManagers": [
{
"customType": "regex",
"datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}maven{{/if}}",
"fileMatch": ["(^|/)pom\\.xml$"],
"matchStrings": [
"##\\s??renovate:( datasource=(?<datasource>[a-z-.]+?))? depName=(?<depName>[^\\s]+?)(?: packageName=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?\\s+<(.+\\.)?version>(?<currentValue>.+)<\\/(.+\\.)?version>"
],
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}maven{{/if}}"
}
]
}
10 changes: 7 additions & 3 deletions src/main/resources/archetype-resources/frontend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
#set( $nodeJsVersion = "20.13.1" )

<parent>
<groupId>${groupId}</groupId>
Expand All @@ -17,6 +16,11 @@

<name>${projectName} Frontend</name>

<properties>
## renovate: datasource=node-version depName=node
<nodejs.version>v20.13.1</nodejs.version>
</properties>

<build>

<plugins>
Expand Down Expand Up @@ -45,7 +49,7 @@
</execution>
</executions>
<configuration>
<nodeJsVersion>${nodeJsVersion}</nodeJsVersion>
<nodeJsVersion>${nodejs.version}</nodeJsVersion>
<tasks>
<npmInstallTask>
<workingDirectory>${project.basedir}</workingDirectory>
Expand Down Expand Up @@ -74,7 +78,7 @@
</goals>
<phase>process-resources</phase>
<configuration>
<nodeVersion>v${nodeJsVersion}</nodeVersion>
<nodeVersion>${nodejs.version}</nodeVersion>
</configuration>
</execution>
<execution>
Expand Down
44 changes: 39 additions & 5 deletions src/main/resources/archetype-resources/parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,18 @@

<!-- Set to 'enabled' to activate org.eclipse.jdt.core.compiler.annotation.nullanalysis feature in eclipse settings -->
<eclipse.settings.nullanalysis>enabled</eclipse.settings.nullanalysis>
#if ( $optionAemVersion != "cloud" or $optionAcsCommons == "y" )

<!-- Versions -->
#end
#if ( $optionAemVersion != "cloud" )
## renovate: depName=com.adobe.cq:core.wcm.components.core
<core.wcm.components.version>2.24.6</core.wcm.components.version>
#end
#if( $optionAcsCommons == "y" )
## renovate: depName=com.adobe.acs:acs-aem-commons-bundle
<acs.aem.commons.version>6.6.0</acs.aem.commons.version>
#end
## renovate: depName=org.mockito:mockito-core
<mockito.version>5.11.0</mockito.version>

<!-- Enable reproducible builds -->
<project.build.outputTimestamp>2021-01-01T00:00:00Z</project.build.outputTimestamp>
Expand Down Expand Up @@ -92,11 +94,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.api</artifactId>
## renovate: depName=org.apache.sling:org.apache.sling.models.api
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.impl</artifactId>
## renovate: depName=org.apache.sling:org.apache.sling.models.impl
<version>1.6.4</version>
</dependency>

Expand All @@ -106,21 +110,25 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.api</artifactId>
## renovate: depName=org.apache.sling:org.apache.sling.caconfig.api
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.spi</artifactId>
## renovate: depName=org.apache.sling:org.apache.sling.caconfig.spi
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.impl</artifactId>
## renovate: depName=org.apache.sling:org.apache.sling.caconfig.impl
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.caconfig</artifactId>
## renovate: depName=org.apache.sling:org.apache.sling.models.caconfig
<version>1.0.2</version>
</dependency>

Expand All @@ -132,6 +140,7 @@
<groupId>io.wcm</groupId>
<artifactId>io.wcm.caconfig.extensions</artifactId>
#if ( $optionContextAwareConfigLatest == "y" || $optionAemVersion == "cloud" )
## renovate: depName=io.wcm:io.wcm.caconfig.extensions
<version>1.9.4</version>
#else
<!-- Stick with version 1.8.x because 1.9.x depends on latest Sling Context-Aware Configuration SPI/Impl -->
Expand All @@ -141,93 +150,110 @@
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.caconfig.editor</artifactId>
## renovate: depName=io.wcm:io.wcm.caconfig.editor
<version>1.16.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.sling.commons</artifactId>
## renovate: depName=io.wcm:io.wcm.sling.commons
<version>1.6.4</version>
</dependency>
#end
#if ( $optionWcmioHandler == "y" )
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.sling.models</artifactId>
## renovate: depName=io.wcm:io.wcm.sling.models
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.commons</artifactId>
## renovate: depName=io.wcm:io.wcm.wcm.commons
<version>1.10.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.parsys</artifactId>
## renovate: depName=io.wcm:io.wcm.wcm.parsys
<version>1.7.4</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.ui.granite</artifactId>
## renovate: depName=io.wcm:io.wcm.wcm.ui.granite
<version>1.10.4</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.ui.clientlibs</artifactId>
## renovate: depName=io.wcm:io.wcm.wcm.ui.clientlibs
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.commons</artifactId>
## renovate: depName=io.wcm:io.wcm.handler.commons
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.url</artifactId>
## renovate: depName=io.wcm:io.wcm.handler.url
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.media</artifactId>
## renovate: depName=io.wcm:io.wcm.handler.media
<version>2.0.8</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.link</artifactId>
## renovate: depName=io.wcm:io.wcm.handler.link
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.richtext</artifactId>
## renovate: depName=io.wcm:io.wcm.handler.richtext
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.core.components</artifactId>
## renovate: depName=io.wcm:io.wcm.wcm.core.components
<version>2.0.2-2.23.2</version>
</dependency>
#end
<dependency>
<groupId>io.wcm.devops.conga.definitions</groupId>
<artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
## renovate: depName=io.wcm.devops.conga.definitions:io.wcm.devops.conga.definitions.aem
<version>2.0.4</version>
</dependency>

<!-- wcm.io Testing -->
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.junit5</artifactId>
## renovate: depName=io.wcm:io.wcm.testing.aem-mock.junit5
<version>5.5.2</version>
</dependency>
#if ( $optionAemVersion == "6.5" && ($optionAemServicePack=="y" || $optionAemServicePackAPI=="y") )
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.logging.logback</artifactId>
## renovate: depName=io.wcm:io.wcm.testing.logging.logback
<version>1.0.0</version>
</dependency>
#else
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.logging-mock</artifactId>
## renovate: depName=org.apache.sling:org.apache.sling.testing.logging-mock
<version>2.0.0</version>
</dependency>
#end
Expand All @@ -242,28 +268,33 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
## renovate: depName=org.apache.sling:org.apache.sling.testing.caconfig-mock-plugin
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.wcm-io-mock.caconfig</artifactId>
## renovate: depName=io.wcm:io.wcm.testing.wcm-io-mock.caconfig
<version>1.2.0</version>
</dependency>
#end
#if ( $optionWcmioHandler == "y" )
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.wcm-io-mock.sling</artifactId>
## renovate: depName=io.wcm:io.wcm.testing.wcm-io-mock.sling
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.wcm-io-mock.wcm</artifactId>
## renovate: depName=io.wcm:io.wcm.testing.wcm-io-mock.wcm
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.wcm-io-mock.handler</artifactId>
## renovate: depName=io.wcm:io.wcm.testing.wcm-io-mock.handler
<version>2.0.0</version>
</dependency>
#end
Expand Down Expand Up @@ -321,39 +352,42 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
## renovate: depName=org.junit:junit-bom
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
#set( $mockitoVersion = "5.11.0" )
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockitoVersion}</version>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockitoVersion}</version>
<version>${mockito.version}</version>
</dependency>

#if ( $optionIntegrationTests == "y" )
<!-- Integration Tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
## renovate: depName=junit:junit
<version>4.13.2</version>
</dependency>
#if ( $optionAemVersion == "6.5" )
<dependency>
<groupId>com.adobe.cq</groupId>
<artifactId>cq-testing-clients-65</artifactId>
## renovate: depName=com.adobe.cq:cq-testing-clients-65
<version>1.1.1</version>
</dependency>
#else
<dependency>
<groupId>com.adobe.cq</groupId>
<artifactId>aem-cloud-testing-clients</artifactId>
## renovate: depName=com.adobe.cq:aem-cloud-testing-clients
<version>1.2.5</version>
</dependency>
#end
Expand Down