Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: wcm-io-devops/maven-nodejs-proxy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.2.2
Choose a base ref
...
head repository: wcm-io-devops/maven-nodejs-proxy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
2 contributors
Loading
Showing with 35 additions and 24 deletions.
  1. +10 −0 .github/renovate.json
  2. +3 −8 .github/workflows/maven-build.yml
  3. +1 −1 .github/workflows/maven-deploy.yml
  4. +10 −5 .maven-settings.xml
  5. +3 −2 changes.xml
  6. +6 −6 maven-nodejs-proxy/pom.xml
  7. +2 −2 pom.xml
10 changes: 10 additions & 0 deletions .github/renovate.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>wcm-io/renovate-config:maven",
"github>wcm-io/renovate-config:automerge-parent",
"github>wcm-io/renovate-config:automerge-trusted-3rdparty",
"github>wcm-io/renovate-config:automerge-testing",
"github>wcm-io-devops/renovate-config:automerge-parent"
]
}
11 changes: 3 additions & 8 deletions .github/workflows/maven-build.yml
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,9 @@ name: Build

on:
push:
branches-ignore:
- master
- experimental/**
branches:
- develop
pull_request:
types: [opened, synchronize, reopened]
branches-ignore:
- master
- experimental/**
workflow_dispatch:

jobs:
@@ -31,6 +26,6 @@ jobs:
os: ${{ matrix.os }}
java-version: ${{ matrix.java }}
sonar-run-on-os: ubuntu-latest
sonar-run-on-java-version: 17
sonar-run-on-java-version: 21
sonar-token: ${{ secrets.SONAR_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/maven-deploy.yml
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ jobs:
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
- name: Setup JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
15 changes: 10 additions & 5 deletions .maven-settings.xml
View file
Original file line number Diff line number Diff line change
@@ -43,8 +43,8 @@
</repository>

<repository>
<id>oss-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>sonatype-central-snapshots</id>
<url>https://central.sonatype.com/repository/maven-snapshots</url>
<layout>default</layout>
<releases>
<enabled>false</enabled>
@@ -86,8 +86,8 @@
</pluginRepository>

<pluginRepository>
<id>oss-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>sonatype-central-snapshots</id>
<url>https://central.sonatype.com/repository/maven-snapshots</url>
<layout>default</layout>
<releases>
<enabled>false</enabled>
@@ -123,7 +123,12 @@

<servers>
<server>
<id>ossrh</id>
<id>sonatype-central</id>
<username>${env.SONATYPE_USERNAME}</username>
<password>${env.SONATYPE_PASSWORD}</password>
</server>
<server>
<id>sonatype-central-snapshots</id>
<username>${env.SONATYPE_USERNAME}</username>
<password>${env.SONATYPE_PASSWORD}</password>
</server>
5 changes: 3 additions & 2 deletions changes.xml
View file
Original file line number Diff line number Diff line change
@@ -19,8 +19,9 @@
#L%
-->

<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/changes/1.0.0"
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
<document xmlns="http://maven.apache.org/changes/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
<body>

<release version="1.2.2" date="2024-02-22">
12 changes: 6 additions & 6 deletions maven-nodejs-proxy/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -25,20 +25,20 @@
<parent>
<groupId>io.wcm.devops</groupId>
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
<version>1.4.4</version>
<version>2.0.2</version>
<relativePath />
</parent>

<groupId>io.wcm.devops.maven</groupId>
<artifactId>io.wcm.devops.maven.nodejs-proxy</artifactId>
<version>1.2.2</version>
<version>1.2.3-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Maven NodeJS Proxy</name>
<description>Maven proxy to download NodeJS binaries as Maven artifacts.</description>

<properties>
<dropwizard.version>1.3.9</dropwizard.version>
<dropwizard.version>1.3.29</dropwizard.version>
</properties>

<dependencies>
@@ -65,21 +65,21 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
<version>2.20.0</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.1</version>
<version>1.19.0</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.9.6</version>
<version>3.9.11</version>
<scope>compile</scope>
</dependency>

4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -25,13 +25,13 @@
<parent>
<groupId>io.wcm.devops</groupId>
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
<version>1.4.4</version>
<version>2.0.2</version>
<relativePath />
</parent>

<groupId>io.wcm.devops.maven</groupId>
<artifactId>io.wcm.devops.maven.nodejs-proxy.root</artifactId>
<version>1.2.2</version>
<version>1.2.3-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Maven NodeJS Proxy Root</name>