diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b76b895 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000..7a1c0bd --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,19 @@ +_extends: .github +name-template: '$RESOLVED_VERSION' +tag-template: 'jdepend-maven-plugin-$RESOLVED_VERSION' +version-resolver: + major: + labels: + - major + minor: + labels: + - minor + - enhancement + patch: + labels: + - patch + default: patch +template: | + ## Changes + + $CHANGES \ No newline at end of file diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index c9ade96..72c6bdb 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -24,8 +24,8 @@ on: jobs: build: name: Verify - uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2 - with: - os-matrix: '[ "ubuntu-latest" ]' - jdk-matrix: '[ "17" ]' - jdk-distribution-matrix: '[ "temurin" ]' + uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3 +# with: +# os-matrix: '[ "ubuntu-latest" ]' +# jdk-matrix: '[ "17" ]' +# jdk-distribution-matrix: '[ "temurin" ]' diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index 0000000..c8ac4b7 --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,13 @@ +name: Release Drafter +on: + push: + branches: + - master + workflow_dispatch: +jobs: + update_release_draft: + runs-on: ubuntu-latest + steps: + - uses: release-drafter/release-drafter@v5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..e133d3f --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,15 @@ +name: 'Close stale PR' +on: + schedule: + - cron: '30 1 * * *' + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v8 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + stale-pr-message: 'This PR is stale because it has been open 365 days with no activity. Remove stale label or comment or this will be closed in 30 days.' + days-before-stale: 365 + days-before-pr-close: 30 diff --git a/pom.xml b/pom.xml index 1dcc650..c9ea7b2 100644 --- a/pom.xml +++ b/pom.xml @@ -62,10 +62,7 @@ github https://github.com/mojohaus/jdepend-maven-plugin/issues - - Travis-CI - https://travis-ci.org/mojohaus/jdepend-maven-plugin - + 3.2.5 @@ -203,16 +200,17 @@ - org.apache.maven.plugins:maven-project-info-reports-plugin:2.7:maven-plugin - org.apache.maven.plugins:maven-compiler-plugin:3.1:maven-plugin - org.apache.maven.plugins:maven-install-plugin:2.4:maven-plugin - org.apache.maven.plugins:maven-clean-plugin:2.5:maven-plugin - org.apache.maven.plugins:maven-surefire-plugin:2.16:maven-plugin - org.apache.maven.plugins:maven-assembly-plugin:2.4:maven-plugin - org.apache.maven.plugins:maven-jar-plugin:2.4:maven-plugin - org.apache.maven.plugins:maven-war-plugin:2.3:maven-plugin - org.apache.maven.plugins:maven-resources-plugin:2.6:maven-plugin - org.apache.maven.plugins:maven-site-plugin:3.3:maven-plugin + org.apache.maven.plugins:maven-project-info-reports-plugin:3.5.0:maven-plugin + org.apache.maven.plugins:maven-compiler-plugin:3.12.1:maven-plugin + org.apache.maven.plugins:maven-install-plugin:3.1.1:maven-plugin + org.apache.maven.plugins:maven-clean-plugin:3.3.1:maven-plugin + org.apache.maven.plugins:maven-assembly-plugin:3.6.0:maven-plugin + org.apache.maven.plugins:maven-jar-plugin:3.3.0:maven-plugin + org.apache.maven.plugins:maven-war-plugin:3.4.0:maven-plugin + org.apache.maven.plugins:maven-resources-plugin:3.3.1:maven-plugin + org.apache.maven.plugins:maven-surefire-plugin:3.2.5:maven-plugin + org.apache.maven.plugins:maven-site-plugin:3.9.1:maven-plugin + org.apache.maven.plugins:maven-site-plugin:3.9.1:jar org.apache.maven.plugins:maven-verifier-plugin:1.0:maven-plugin org.apache.maven.skins:maven-default-skin:1.0:jar diff --git a/src/it/jdepend-01/invoker.properties b/src/it/jdepend-01/invoker.properties index 2067549..4ee7455 100644 --- a/src/it/jdepend-01/invoker.properties +++ b/src/it/jdepend-01/invoker.properties @@ -17,4 +17,4 @@ # limitations under the License. # #L% ### -invoker.goals=clean site verifier:verify \ No newline at end of file +invoker.goals=clean site \ No newline at end of file diff --git a/src/it/jdepend-01/pom.xml b/src/it/jdepend-01/pom.xml index 351dfa8..8722a82 100644 --- a/src/it/jdepend-01/pom.xml +++ b/src/it/jdepend-01/pom.xml @@ -35,18 +35,6 @@ 1.0-SNAPSHOT JDepend Quick Test When running site goal http://maven.apache.org - - - - org.apache.maven.plugins - maven-verifier-plugin - 1.0 - - src/verifier/verifications.xml - - - - diff --git a/src/it/jdepend-01/src/verifier/verifications.xml b/src/it/jdepend-01/src/verifier/verifications.xml deleted file mode 100644 index 5e208e3..0000000 --- a/src/it/jdepend-01/src/verifier/verifications.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - target/jdepend-report.xml - - - target/site/jdepend-report.html - - - target/site/dependencies.html - - - target/site/index.html - - - target/site/integration.html - - - target/site/issue-tracking.html - - - target/site/license.html - - - target/site/mail-lists.html - - - target/site/project-reports.html - - - target/site/project-info.html - - - target/site/source-repository.html - - - target/site/team-list.html - - - diff --git a/src/it/jdepend-01/verify.groovy b/src/it/jdepend-01/verify.groovy new file mode 100644 index 0000000..6c4cc46 --- /dev/null +++ b/src/it/jdepend-01/verify.groovy @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +// Verify the existence of some files +assert new File( basedir,'target/jdepend-report.xml' ).exists() + +assert new File( basedir,'target/site/jdepend-report.html' ).exists() +assert new File( basedir,'target/site/dependencies.html' ).exists() +assert new File( basedir,'target/site/index.html' ).exists() +assert new File( basedir,'target/site/licenses.html' ).exists() +assert new File( basedir,'target/site/project-reports.html' ).exists() +assert new File( basedir,'target/site/project-info.html' ).exists() \ No newline at end of file diff --git a/src/it/jdepend-02/invoker.properties b/src/it/jdepend-02/invoker.properties index 2067549..4ee7455 100644 --- a/src/it/jdepend-02/invoker.properties +++ b/src/it/jdepend-02/invoker.properties @@ -17,4 +17,4 @@ # limitations under the License. # #L% ### -invoker.goals=clean site verifier:verify \ No newline at end of file +invoker.goals=clean site \ No newline at end of file diff --git a/src/it/jdepend-02/pom.xml b/src/it/jdepend-02/pom.xml index 4cacc1d..0a23530 100644 --- a/src/it/jdepend-02/pom.xml +++ b/src/it/jdepend-02/pom.xml @@ -37,16 +37,6 @@ http://maven.apache.org target/output-classes - - - org.apache.maven.plugins - maven-verifier-plugin - 1.0 - - src/verifier/verifications.xml - - - diff --git a/src/it/jdepend-02/src/verifier/verifications.xml b/src/it/jdepend-02/src/verifier/verifications.xml deleted file mode 100644 index 5e208e3..0000000 --- a/src/it/jdepend-02/src/verifier/verifications.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - target/jdepend-report.xml - - - target/site/jdepend-report.html - - - target/site/dependencies.html - - - target/site/index.html - - - target/site/integration.html - - - target/site/issue-tracking.html - - - target/site/license.html - - - target/site/mail-lists.html - - - target/site/project-reports.html - - - target/site/project-info.html - - - target/site/source-repository.html - - - target/site/team-list.html - - - diff --git a/src/it/jdepend-02/verify.groovy b/src/it/jdepend-02/verify.groovy new file mode 100644 index 0000000..6c4cc46 --- /dev/null +++ b/src/it/jdepend-02/verify.groovy @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +// Verify the existence of some files +assert new File( basedir,'target/jdepend-report.xml' ).exists() + +assert new File( basedir,'target/site/jdepend-report.html' ).exists() +assert new File( basedir,'target/site/dependencies.html' ).exists() +assert new File( basedir,'target/site/index.html' ).exists() +assert new File( basedir,'target/site/licenses.html' ).exists() +assert new File( basedir,'target/site/project-reports.html' ).exists() +assert new File( basedir,'target/site/project-info.html' ).exists() \ No newline at end of file diff --git a/src/it/jdepend-03/invoker.properties b/src/it/jdepend-03/invoker.properties index b94a4ad..d574ec7 100644 --- a/src/it/jdepend-03/invoker.properties +++ b/src/it/jdepend-03/invoker.properties @@ -17,4 +17,4 @@ # limitations under the License. # #L% ### -invoker.goals=clean org.codehaus.mojo:jdepend-maven-plugin:generate verifier:verify +invoker.goals=clean org.codehaus.mojo:jdepend-maven-plugin:generate diff --git a/src/it/jdepend-03/pom.xml b/src/it/jdepend-03/pom.xml index 9e3578f..ae52ef9 100644 --- a/src/it/jdepend-03/pom.xml +++ b/src/it/jdepend-03/pom.xml @@ -37,14 +37,6 @@ http://maven.apache.org - - org.apache.maven.plugins - maven-verifier-plugin - 1.0 - - src/verifier/verifications.xml - - org.codehaus.mojo jdepend-maven-plugin diff --git a/src/it/jdepend-03/src/verifier/verifications.xml b/src/it/jdepend-03/src/verifier/verifications.xml deleted file mode 100644 index 9a50429..0000000 --- a/src/it/jdepend-03/src/verifier/verifications.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - target/jdepend-report.xml - - - target/site/jdepend-report.html - - - target/classes/org/codehaus/mojo/App.class - - - diff --git a/src/it/jdepend-03/verify.groovy b/src/it/jdepend-03/verify.groovy new file mode 100644 index 0000000..013e80f --- /dev/null +++ b/src/it/jdepend-03/verify.groovy @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +// Verify the existence of some files +assert new File( basedir,'target/jdepend-report.xml' ).exists() + +assert new File( basedir,'target/site/jdepend-report.html' ).exists() +assert new File( basedir,'target/classes/org/codehaus/mojo/App.class' ).exists() diff --git a/src/it/jdepend-04/invoker.properties b/src/it/jdepend-04/invoker.properties index b94a4ad..a3387a9 100644 --- a/src/it/jdepend-04/invoker.properties +++ b/src/it/jdepend-04/invoker.properties @@ -17,4 +17,4 @@ # limitations under the License. # #L% ### -invoker.goals=clean org.codehaus.mojo:jdepend-maven-plugin:generate verifier:verify +invoker.goals=clean org.codehaus.mojo:jdepend-maven-plugin:generate \ No newline at end of file diff --git a/src/it/jdepend-04/src/verifier/verifications.xml b/src/it/jdepend-04/src/verifier/verifications.xml deleted file mode 100644 index d218f8f..0000000 --- a/src/it/jdepend-04/src/verifier/verifications.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - target/jdepend-report.xml - - - target/output-site-directory/jdepend-report.html - - - target/classes/org/codehaus/mojo/App.class - - - diff --git a/src/it/jdepend-04/verify.groovy b/src/it/jdepend-04/verify.groovy new file mode 100644 index 0000000..09c1fcb --- /dev/null +++ b/src/it/jdepend-04/verify.groovy @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +// Verify the existence of some files +assert new File( basedir,'target/jdepend-report.xml' ).exists() + +assert new File( basedir,'target/output-site-directory/jdepend-report.html' ).exists() +assert new File( basedir,'target/classes/org/codehaus/mojo/App.class' ).exists() + diff --git a/src/it/jdepend-05/invoker.properties b/src/it/jdepend-05/invoker.properties index 69d2867..d6a051f 100644 --- a/src/it/jdepend-05/invoker.properties +++ b/src/it/jdepend-05/invoker.properties @@ -17,4 +17,4 @@ # limitations under the License. # #L% ### -invoker.goals=clean org.codehaus.mojo:jdepend-maven-plugin:generate verifier:verify -Djdepend.skip=true +invoker.goals=clean org.codehaus.mojo:jdepend-maven-plugin:generate -Djdepend.skip=true diff --git a/src/it/jdepend-05/pom.xml b/src/it/jdepend-05/pom.xml index f5a14ba..6a02a66 100644 --- a/src/it/jdepend-05/pom.xml +++ b/src/it/jdepend-05/pom.xml @@ -37,14 +37,6 @@ http://maven.apache.org - - org.apache.maven.plugins - maven-verifier-plugin - 1.0 - - src/verifier/verifications.xml - - org.codehaus.mojo jdepend-maven-plugin diff --git a/src/it/jdepend-05/src/verifier/verifications.xml b/src/it/jdepend-05/src/verifier/verifications.xml deleted file mode 100644 index 67cb3a1..0000000 --- a/src/it/jdepend-05/src/verifier/verifications.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - target/jdepend-report.xml - false - - - target/output-site-directory/jdepend-report.html - false - - - target/classes/org/codehaus/mojo/App.class - - - diff --git a/src/it/jdepend-05/verify.groovy b/src/it/jdepend-05/verify.groovy new file mode 100644 index 0000000..a9fb71a --- /dev/null +++ b/src/it/jdepend-05/verify.groovy @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +// Verify the existence of some files +assert !new File( basedir,'target/jdepend-report.xml' ).exists() + +assert !new File( basedir,'target/output-site-directory/jdepend-report.html' ).exists() +assert new File( basedir,'target/classes/org/codehaus/mojo/App.class' ).exists() diff --git a/src/it/jdepend-example/pom.xml b/src/it/jdepend-example/pom.xml index 20e95f8..5dcf20e 100644 --- a/src/it/jdepend-example/pom.xml +++ b/src/it/jdepend-example/pom.xml @@ -62,12 +62,12 @@ org.apache.maven.reporting maven-reporting-api - ${mavenVersion} + 3.1.1 org.apache.maven.reporting maven-reporting-impl - 2.3 + 3.2.0 org.codehaus.plexus diff --git a/src/it/settings.xml b/src/it/settings.xml index fcf6bdd..c8f77f0 100644 --- a/src/it/settings.xml +++ b/src/it/settings.xml @@ -1,24 +1,4 @@ - - - - - it-repo - RPM - @localRepositoryUrl@ - * - - it-repo diff --git a/src/it/setup/pom.xml b/src/it/setup/pom.xml index 05dfb11..51d524b 100644 --- a/src/it/setup/pom.xml +++ b/src/it/setup/pom.xml @@ -63,63 +63,55 @@ - - org.apache.maven.plugins - maven-verifier-plugin - 1.0 - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - org.apache.maven.plugins maven-surefire-plugin - 2.16 + 3.2.5 org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.12.1 org.apache.maven.plugins maven-clean-plugin - 3.1.0 + 3.3.1 org.apache.maven.plugins maven-assembly-plugin - 2.4 + 3.6.0 org.apache.maven.plugins maven-jar-plugin - 2.4 + 3.3.0 org.apache.maven.plugins maven-install-plugin - 2.4 + 3.1.1 org.apache.maven.plugins maven-war-plugin - 2.3 + 3.4.0 org.apache.maven.plugins maven-resources-plugin - 2.6 + 3.3.1 org.apache.maven.plugins maven-project-info-reports-plugin - 2.7 + 3.5.0 + org.apache.maven.plugins maven-site-plugin + 3.9.1 attach-descriptor