Skip to content

Commit 6570d14

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 498fbb0 + 3ea3b4b commit 6570d14

File tree

10 files changed

+131
-94
lines changed

10 files changed

+131
-94
lines changed

‎.github/workflows/maven-build.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Build validation
2+
3+
name: Build
4+
5+
on:
6+
push:
7+
branches-ignore:
8+
- master
9+
- experimental/**
10+
pull_request:
11+
types: [opened, synchronize, reopened]
12+
branches-ignore:
13+
- master
14+
- experimental/**
15+
workflow_dispatch:
16+
17+
jobs:
18+
build:
19+
20+
runs-on: ${{ matrix.os }}
21+
strategy:
22+
matrix:
23+
java: [11, 17, 21]
24+
os: [ubuntu-latest]
25+
distribution: [temurin]
26+
27+
steps:
28+
- name: Maven Build with SonarCloud
29+
uses: wcm-io-devops/github-action-maven-build-sonar@v1
30+
with:
31+
os: ${{ matrix.os }}
32+
java-version: ${{ matrix.java }}
33+
sonar-run-on-os: ubuntu-latest
34+
sonar-run-on-java-version: 17
35+
sonar-token: ${{ secrets.SONAR_TOKEN }}
36+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/maven-deploy.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Deploy snapshots to Sonatype OSS repository and deploy site to GitHub Pages
2+
3+
name: Deploy
4+
5+
on:
6+
push:
7+
branches:
8+
- develop
9+
workflow_dispatch:
10+
11+
jobs:
12+
build:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
20+
- name: Configure GIT
21+
run: |
22+
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
23+
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
24+
25+
- name: Setup JDK
26+
uses: actions/setup-java@v3
27+
with:
28+
distribution: temurin
29+
java-version: 11
30+
cache: maven
31+
32+
- name: Build, verify, deploy
33+
env:
34+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
35+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
36+
run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy

‎.github/workflows/release-from-tag.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Release from Tag
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
workflow_dispatch:
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: ncipollo/release-action@v1
17+
with:
18+
token: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@ npm-debug.log
1616
.settings
1717
.externalToolBuilders
1818
.pmd
19+
.eclipse-pmd
1920
.checkstyle
2021
.idea
2122
.vagrant
2223
*.iml
2324
.DS_Store
25+
*.retry
2426
.rubygems
2527
.sass-cache
2628
.rubygems-gem-maven-plugin
2729
*.sublime-*
2830
*nbactions*.xml
2931
.temp/
32+
.vlt
33+
.vlt-sync*
34+
.brackets.json

‎.travis.maven-settings.xml‎ renamed to ‎.maven-settings.xml‎

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,7 @@
3131

3232
<repository>
3333
<id>central</id>
34-
<url>http://repo1.maven.org/maven2/</url>
35-
<layout>default</layout>
36-
<releases>
37-
<enabled>true</enabled>
38-
<updatePolicy>never</updatePolicy>
39-
</releases>
40-
<snapshots>
41-
<enabled>false</enabled>
42-
</snapshots>
43-
</repository>
44-
45-
<repository>
46-
<id>wcm-io-apache-intermediate-release</id>
47-
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
34+
<url>https://repo1.maven.org/maven2/</url>
4835
<layout>default</layout>
4936
<releases>
5037
<enabled>true</enabled>
@@ -70,7 +57,7 @@
7057

7158
<repository>
7259
<id>apache-snapshots</id>
73-
<url>http://repository.apache.org/snapshots</url>
60+
<url>https://repository.apache.org/snapshots</url>
7461
<layout>default</layout>
7562
<releases>
7663
<enabled>false</enabled>
@@ -87,20 +74,7 @@
8774

8875
<pluginRepository>
8976
<id>central</id>
90-
<url>http://repo1.maven.org/maven2/</url>
91-
<layout>default</layout>
92-
<releases>
93-
<enabled>true</enabled>
94-
<updatePolicy>never</updatePolicy>
95-
</releases>
96-
<snapshots>
97-
<enabled>false</enabled>
98-
</snapshots>
99-
</pluginRepository>
100-
101-
<pluginRepository>
102-
<id>wcm-io-apache-intermediate-release</id>
103-
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
77+
<url>https://repo1.maven.org/maven2/</url>
10478
<layout>default</layout>
10579
<releases>
10680
<enabled>true</enabled>
@@ -126,7 +100,7 @@
126100

127101
<pluginRepository>
128102
<id>apache-snapshots</id>
129-
<url>http://repository.apache.org/snapshots</url>
103+
<url>https://repository.apache.org/snapshots</url>
130104
<layout>default</layout>
131105
<releases>
132106
<enabled>false</enabled>
@@ -147,4 +121,12 @@
147121
<activeProfile>default</activeProfile>
148122
</activeProfiles>
149123

124+
<servers>
125+
<server>
126+
<id>ossrh</id>
127+
<username>${env.SONATYPE_USERNAME}</username>
128+
<password>${env.SONATYPE_PASSWORD}</password>
129+
</server>
130+
</servers>
131+
150132
</settings>

‎.travis.yml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<img src="http://wcm.io/images/favicon-16@2x.png"/> Maven NodeJS Proxy
1+
<img src="https://wcm.io/images/favicon-16@2x.png"/> Maven NodeJS Proxy
22
======
3-
[![Build Status](https://travis-ci.com/wcm-io-devops/maven-nodejs-proxy.png?branch=develop)](https://travis-ci.com/wcm-io-devops/maven-nodejs-proxy)
4-
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.maven/io.wcm.devops.maven.nodejs-proxy/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.maven/io.wcm.devops.maven.nodejs-proxy)
3+
[![Build](https://github.com/wcm-io-devops/maven-nodejs-proxy/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/maven-nodejs-proxy/actions?query=workflow%3ABuild+branch%3Adevelop)
4+
[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.maven/io.wcm.devops.maven.nodejs-proxy)](https://repo1.maven.org/maven2/io/wcm/devops/maven/io.wcm.devops.maven.nodejs-proxy)
5+
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_maven-nodejs-proxy&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_maven-nodejs-proxy)
56

67
Maven proxy to download NodeJS binaries as Maven artifacts.
78

‎changes.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="1.2.2" date="2024-02-22">
27+
<action type="update" dev="sseifert">
28+
Update dependencies.
29+
</action>
30+
</release>
31+
2632
<release version="1.2.0" date="2019-04-05">
2733
<action type="add" dev="sseifert">
2834
Add support for downloading Windows NodeJS binaries as ZIP including NPM which is available since Node 6.3.0.

‎maven-nodejs-proxy/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
#L%
2020
-->
2121

22-
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<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">
2323
<modelVersion>4.0.0</modelVersion>
2424

2525
<parent>
2626
<groupId>io.wcm.devops</groupId>
2727
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>1.1.2</version>
28+
<version>1.4.4</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops.maven</groupId>
3333
<artifactId>io.wcm.devops.maven.nodejs-proxy</artifactId>
34-
<version>1.2.0</version>
34+
<version>1.2.2</version>
3535
<packaging>jar</packaging>
3636

3737
<name>Maven NodeJS Proxy</name>
@@ -65,21 +65,21 @@
6565
<dependency>
6666
<groupId>commons-io</groupId>
6767
<artifactId>commons-io</artifactId>
68-
<version>2.6</version>
68+
<version>2.15.1</version>
6969
<scope>compile</scope>
7070
</dependency>
7171

7272
<dependency>
7373
<groupId>commons-codec</groupId>
7474
<artifactId>commons-codec</artifactId>
75-
<version>1.12</version>
75+
<version>1.16.1</version>
7676
<scope>compile</scope>
7777
</dependency>
7878

7979
<dependency>
8080
<groupId>org.apache.maven</groupId>
8181
<artifactId>maven-artifact</artifactId>
82-
<version>3.3.9</version>
82+
<version>3.9.6</version>
8383
<scope>compile</scope>
8484
</dependency>
8585

‎pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
#L%
2020
-->
2121

22-
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<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">
2323
<modelVersion>4.0.0</modelVersion>
2424

2525
<parent>
2626
<groupId>io.wcm.devops</groupId>
2727
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>1.1.2</version>
28+
<version>1.4.4</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops.maven</groupId>
3333
<artifactId>io.wcm.devops.maven.nodejs-proxy.root</artifactId>
34-
<version>1.2.0</version>
34+
<version>1.2.2</version>
3535
<packaging>pom</packaging>
3636

3737
<name>Maven NodeJS Proxy Root</name>
@@ -44,6 +44,11 @@
4444
<tag>HEAD</tag>
4545
</scm>
4646

47+
<ciManagement>
48+
<system>GitHub Actions</system>
49+
<url>https://github.com/wcm-io-devops/maven-nodejs-proxy/actions</url>
50+
</ciManagement>
51+
4752
<modules>
4853
<module>maven-nodejs-proxy</module>
4954
</modules>

0 commit comments

Comments
 (0)