Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Sep 29, 2022
2 parents 9027837 + c026ec1 commit 89bb2b6
Show file tree
Hide file tree
Showing 129 changed files with 818 additions and 520 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Build validation

name: Build

on:
push:
branches-ignore:
- master
- experimental/**
pull_request:
branches-ignore:
- master
- experimental/**
workflow_dispatch:

jobs:
build:

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

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

- name: Setup JDK
uses: actions/setup-java@v2
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java }}
cache: 'maven'

- name: Build and verify
run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify
43 changes: 43 additions & 0 deletions .github/workflows/maven-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Deploy snapshots to Sonatpe 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@v2

- 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@v2
with:
distribution: temurin
java-version: 8
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 site

- name: Stage and deploy site
run: >
mvn -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm
-Dscmpublish.checkinComment="Maven site: ${{ github.repository }}"
-Dusername=${{ secrets.GH_SITE_DEPLOY_USERNAME }}
-Dpassword=${{ secrets.GH_SITE_DEPLOY_PAT }}
19 changes: 19 additions & 0 deletions .github/workflows/release-from-tag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Release from Tag

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

jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v2
- uses: ncipollo/release-action@v1
with:
body: 'Changes: https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/changes-report.html'
token: ${{ secrets.GITHUB_TOKEN }}
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,21 @@ 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

pom-test.xml
16 changes: 12 additions & 4 deletions .travis.maven-settings.xml → .maven-settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<repository>
<id>central</id>
<url>http://repo1.maven.org/maven2/</url>
<url>https://repo1.maven.org/maven2/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
Expand All @@ -57,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 @@ -74,7 +74,7 @@

<pluginRepository>
<id>central</id>
<url>http://repo1.maven.org/maven2/</url>
<url>https://repo1.maven.org/maven2/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
Expand All @@ -100,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 @@ -121,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>
51 changes: 0 additions & 51 deletions .travis.yml

This file was deleted.

15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
<img src="http://wcm.io/images/[email protected]"/> Eclipse Maven Plugin
<img src="https://wcm.io/images/[email protected]"/> Eclipse Maven Plugin
======
[![Build Status](https://travis-ci.org/wcm-io-devops/eclipse-maven-plugin.png?branch=develop)](https://travis-ci.org/wcm-io-devops/eclipse-maven-plugin)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.maven.plugins/eclipse-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.maven.plugins/eclipse-maven-plugin)
[![Build](https://github.com/wcm-io-devops/eclipse-maven-plugin/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/eclipse-maven-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.maven.plugins/eclipse-maven-plugin)](https://repo1.maven.org/maven2/io/wcm/devops/maven/plugins/eclipse-maven-plugin)

The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM.

This is a fork of the original [Maven Eclipse Plugin](https://maven.apache.org/plugins/maven-eclipse-plugin/) which [was retired end of 2015](http://mail-archives.apache.org/mod_mbox/maven-dev/201510.mbox/%3Cop.x55dxii1kdkhrr%40robertscholte.dynamic.ziggo.nl%3E) in favor of the m2e Eclipse integration.

In our wcm.io and other Maven-based projects we usually use both m2e Integration and the Eclipse Maven Plugin. The Eclipse Maven Plugin is used to generate project-specific eclipse settings files and further files for Checkstyle, Findbugs and PMD based on a global build tools artifact defined a parent POM like `io.wcm.maven:io.wcm.maven.global-parent`, see [Global Parent](http://wcm.io/tooling/maven/global-parent.html) documentation for details.
In our wcm.io and other Maven-based projects we usually use both m2e Integration and the Eclipse Maven Plugin. The Eclipse Maven Plugin is used to generate project-specific eclipse settings files and further files for Checkstyle, Findbugs and PMD based on a global build tools artifact defined a parent POM like `io.wcm.maven:io.wcm.maven.global-parent`, see [Global Parent](https://wcm.io/tooling/maven/global-parent.html) documentation for details.

So we maintain a fork of the original plugin here and publish it under Apache 2.0 license within the wcm.io DevOps project.

Changes since the original Maven Eclipse Plugin 2.10:
Documentation:

* Patch from [MECLIPSE-641](https://issues.apache.org/jira/browse/MECLIPSE-641) which was never applied to the original code base, but is important for generating the eclipse project settings (since 3.0.0)
* Add support for `filtering` property on additionalConfig files (since 3.1.0)
* Mark test source folders and test dependencies as "test" for Eclipse 4.8 Photon (since 3.1.0)
* [wcm.io DevOps Eclipse Maven Plugin Documentation](https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/)
* [Changes since the original Maven Eclipse Plugin 2.10.](https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/changes-report.html)

To use this in your projects update all your POMs to use

Expand Down
54 changes: 54 additions & 0 deletions changes.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
#%L
wcm.io
%%
Copyright (C) 2019 wcm.io
%%
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
#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">
<body>

<release version="3.2.0" date="2022-09-29">
<action type="add" dev="jschaible">
New parameters for to-maven goal.
</action>
<action type="update" dev="sseifert">
Update dependencies.
</action>
</release>

<release version="3.1.0" date="2018-07-11">
<action type="add" dev="sseifert">
Add support for `filtering` property on additionalConfig files.
</action>
<action type="add" dev="sseifert">
Mark test source folders and test dependencies as "test" for Eclipse 4.8 Photon.
</action>
</release>

<release version="3.0.0" date="2016-02-16">
<action type="add" dev="sseifert">
Initial release based on Apache Maven Eclipse Plugin 2.10.
</action>
<action type="update" dev="sseifert"><![CDATA[
Apply patch from <a href="https://issues.apache.org/jira/browse/MECLIPSE-641">MECLIPSE-641</a> which was never applied to the original code base, but is important for generating the eclipse project settings.
]]></action>
</release>

</body>
</document>
Loading

0 comments on commit 89bb2b6

Please sign in to comment.