Skip to content

Commit 89bb2b6

Browse files
committed
Merge branch 'develop'
2 parents 9027837 + c026ec1 commit 89bb2b6

129 files changed

Lines changed: 818 additions & 520 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/maven-build.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Build validation
2+
3+
name: Build
4+
5+
on:
6+
push:
7+
branches-ignore:
8+
- master
9+
- experimental/**
10+
pull_request:
11+
branches-ignore:
12+
- master
13+
- experimental/**
14+
workflow_dispatch:
15+
16+
jobs:
17+
build:
18+
19+
runs-on: ${{ matrix.os }}
20+
strategy:
21+
matrix:
22+
java: [8, 11]
23+
os: [ubuntu-latest]
24+
distribution: [temurin]
25+
26+
steps:
27+
- name: Checkout code
28+
uses: actions/checkout@v2
29+
30+
- name: Setup JDK
31+
uses: actions/setup-java@v2
32+
with:
33+
distribution: ${{ matrix.distribution }}
34+
java-version: ${{ matrix.java }}
35+
cache: 'maven'
36+
37+
- name: Build and verify
38+
run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify

.github/workflows/maven-deploy.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Deploy snapshots to Sonatpe 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@v2
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@v2
27+
with:
28+
distribution: temurin
29+
java-version: 8
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 site
37+
38+
- name: Stage and deploy site
39+
run: >
40+
mvn -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm
41+
-Dscmpublish.checkinComment="Maven site: ${{ github.repository }}"
42+
-Dusername=${{ secrets.GH_SITE_DEPLOY_USERNAME }}
43+
-Dpassword=${{ secrets.GH_SITE_DEPLOY_PAT }}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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@v2
16+
- uses: ncipollo/release-action@v1
17+
with:
18+
body: 'Changes: https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/changes-report.html'
19+
token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,21 @@ 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
3035

3136
pom-test.xml
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<repository>
3333
<id>central</id>
34-
<url>http://repo1.maven.org/maven2/</url>
34+
<url>https://repo1.maven.org/maven2/</url>
3535
<layout>default</layout>
3636
<releases>
3737
<enabled>true</enabled>
@@ -57,7 +57,7 @@
5757

5858
<repository>
5959
<id>apache-snapshots</id>
60-
<url>http://repository.apache.org/snapshots</url>
60+
<url>https://repository.apache.org/snapshots</url>
6161
<layout>default</layout>
6262
<releases>
6363
<enabled>false</enabled>
@@ -74,7 +74,7 @@
7474

7575
<pluginRepository>
7676
<id>central</id>
77-
<url>http://repo1.maven.org/maven2/</url>
77+
<url>https://repo1.maven.org/maven2/</url>
7878
<layout>default</layout>
7979
<releases>
8080
<enabled>true</enabled>
@@ -100,7 +100,7 @@
100100

101101
<pluginRepository>
102102
<id>apache-snapshots</id>
103-
<url>http://repository.apache.org/snapshots</url>
103+
<url>https://repository.apache.org/snapshots</url>
104104
<layout>default</layout>
105105
<releases>
106106
<enabled>false</enabled>
@@ -121,4 +121,12 @@
121121
<activeProfile>default</activeProfile>
122122
</activeProfiles>
123123

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+
124132
</settings>

.travis.yml

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

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
<img src="http://wcm.io/images/favicon-16@2x.png"/> Eclipse Maven Plugin
1+
<img src="https://wcm.io/images/favicon-16@2x.png"/> Eclipse Maven Plugin
22
======
3-
[![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)
4-
[![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)
3+
[![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)
4+
[![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)
55

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

88
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.
99

10-
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.
10+
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.
1111

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

14-
Changes since the original Maven Eclipse Plugin 2.10:
14+
Documentation:
1515

16-
* 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)
17-
* Add support for `filtering` property on additionalConfig files (since 3.1.0)
18-
* Mark test source folders and test dependencies as "test" for Eclipse 4.8 Photon (since 3.1.0)
16+
* [wcm.io DevOps Eclipse Maven Plugin Documentation](https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/)
17+
* [Changes since the original Maven Eclipse Plugin 2.10.](https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/changes-report.html)
1918

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

changes.xml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
#%L
4+
wcm.io
5+
%%
6+
Copyright (C) 2019 wcm.io
7+
%%
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing, software
15+
distributed under the License is distributed on an "AS IS" BASIS,
16+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
See the License for the specific language governing permissions and
18+
limitations under the License.
19+
#L%
20+
-->
21+
22+
<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/changes/1.0.0"
23+
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
24+
<body>
25+
26+
<release version="3.2.0" date="2022-09-29">
27+
<action type="add" dev="jschaible">
28+
New parameters for to-maven goal.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update dependencies.
32+
</action>
33+
</release>
34+
35+
<release version="3.1.0" date="2018-07-11">
36+
<action type="add" dev="sseifert">
37+
Add support for `filtering` property on additionalConfig files.
38+
</action>
39+
<action type="add" dev="sseifert">
40+
Mark test source folders and test dependencies as "test" for Eclipse 4.8 Photon.
41+
</action>
42+
</release>
43+
44+
<release version="3.0.0" date="2016-02-16">
45+
<action type="add" dev="sseifert">
46+
Initial release based on Apache Maven Eclipse Plugin 2.10.
47+
</action>
48+
<action type="update" dev="sseifert"><![CDATA[
49+
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.
50+
]]></action>
51+
</release>
52+
53+
</body>
54+
</document>

0 commit comments

Comments
 (0)