Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Feb 22, 2024
2 parents 498fbb0 + 3ea3b4b commit 6570d14
Show file tree
Hide file tree
Showing 10 changed files with 131 additions and 94 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Build validation

name: Build

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

jobs:
build:

runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [11, 17, 21]
os: [ubuntu-latest]
distribution: [temurin]

steps:
- name: Maven Build with SonarCloud
uses: wcm-io-devops/github-action-maven-build-sonar@v1
with:
os: ${{ matrix.os }}
java-version: ${{ matrix.java }}
sonar-run-on-os: ubuntu-latest
sonar-run-on-java-version: 17
sonar-token: ${{ secrets.SONAR_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
36 changes: 36 additions & 0 deletions .github/workflows/maven-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Deploy snapshots to Sonatype OSS repository and deploy site to GitHub Pages

name: Deploy

on:
push:
branches:
- develop
workflow_dispatch:

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Configure GIT
run: |
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
- name: Setup JDK
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
cache: maven

- name: Build, verify, deploy
env:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy
18 changes: 18 additions & 0 deletions .github/workflows/release-from-tag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Release from Tag

on:
push:
tags:
- '*'
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- uses: ncipollo/release-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@ npm-debug.log
.settings
.externalToolBuilders
.pmd
.eclipse-pmd
.checkstyle
.idea
.vagrant
*.iml
.DS_Store
*.retry
.rubygems
.sass-cache
.rubygems-gem-maven-plugin
*.sublime-*
*nbactions*.xml
.temp/
.vlt
.vlt-sync*
.brackets.json
42 changes: 12 additions & 30 deletions .travis.maven-settings.xml → .maven-settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,7 @@

<repository>
<id>central</id>
<url>http://repo1.maven.org/maven2/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>

<repository>
<id>wcm-io-apache-intermediate-release</id>
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
<url>https://repo1.maven.org/maven2/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
Expand All @@ -70,7 +57,7 @@

<repository>
<id>apache-snapshots</id>
<url>http://repository.apache.org/snapshots</url>
<url>https://repository.apache.org/snapshots</url>
<layout>default</layout>
<releases>
<enabled>false</enabled>
Expand All @@ -87,20 +74,7 @@

<pluginRepository>
<id>central</id>
<url>http://repo1.maven.org/maven2/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>

<pluginRepository>
<id>wcm-io-apache-intermediate-release</id>
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
<url>https://repo1.maven.org/maven2/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
Expand All @@ -126,7 +100,7 @@

<pluginRepository>
<id>apache-snapshots</id>
<url>http://repository.apache.org/snapshots</url>
<url>https://repository.apache.org/snapshots</url>
<layout>default</layout>
<releases>
<enabled>false</enabled>
Expand All @@ -147,4 +121,12 @@
<activeProfile>default</activeProfile>
</activeProfiles>

<servers>
<server>
<id>ossrh</id>
<username>${env.SONATYPE_USERNAME}</username>
<password>${env.SONATYPE_PASSWORD}</password>
</server>
</servers>

</settings>
52 changes: 0 additions & 52 deletions .travis.yml

This file was deleted.

7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<img src="http://wcm.io/images/[email protected]"/> Maven NodeJS Proxy
<img src="https://wcm.io/images/[email protected]"/> Maven NodeJS Proxy
======
[![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)
[![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)
[![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)
[![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)
[![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)

Maven proxy to download NodeJS binaries as Maven artifacts.

Expand Down
6 changes: 6 additions & 0 deletions changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
<body>

<release version="1.2.2" date="2024-02-22">
<action type="update" dev="sseifert">
Update dependencies.
</action>
</release>

<release version="1.2.0" date="2019-04-05">
<action type="add" dev="sseifert">
Add support for downloading Windows NodeJS binaries as ZIP including NPM which is available since Node 6.3.0.
Expand Down
12 changes: 6 additions & 6 deletions maven-nodejs-proxy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
#L%
-->

<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">
<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>

<parent>
<groupId>io.wcm.devops</groupId>
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
<version>1.1.2</version>
<version>1.4.4</version>
<relativePath />
</parent>

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

<name>Maven NodeJS Proxy</name>
Expand Down Expand Up @@ -65,21 +65,21 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
<version>2.15.1</version>
<scope>compile</scope>
</dependency>

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

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

Expand Down
11 changes: 8 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
#L%
-->

<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">
<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>

<parent>
<groupId>io.wcm.devops</groupId>
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
<version>1.1.2</version>
<version>1.4.4</version>
<relativePath />
</parent>

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

<name>Maven NodeJS Proxy Root</name>
Expand All @@ -44,6 +44,11 @@
<tag>HEAD</tag>
</scm>

<ciManagement>
<system>GitHub Actions</system>
<url>https://github.com/wcm-io-devops/maven-nodejs-proxy/actions</url>
</ciManagement>

<modules>
<module>maven-nodejs-proxy</module>
</modules>
Expand Down

0 comments on commit 6570d14

Please sign in to comment.