Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump org.apache.maven:maven-core from 3.0.5 to 3.8.1 in /qulice-maven-plugin #1177

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Aug 15, 2023

Bumps org.apache.maven:maven-core from 3.0.5 to 3.8.1.

Commits
  • 05c21c6 [maven-release-plugin] prepare release maven-3.8.1
  • d295dc3 [MNG-7128] keep blocked attribute from mirrors in artifact repositories
  • a469068 next version in branch 3.8.x is 3.8.1-SNAPSHOT
  • dad8a3e [maven-release-plugin] prepare for next development iteration
  • 6aa1f4a [maven-release-plugin] prepare release maven-3.8.0
  • 907d53a [MNG-7118] block HTTP repositories by default
  • 899465a [MNG-7117] add support for blocked mirror
  • fa79cb2 [MNG-7116] add support for mirrorOf external:http:*
  • e5f6634 use Maven Resolver 1.6.2
  • 09f77da [MNG-7119] Upgrade Maven Wagon to 3.4.3
  • Additional commits viewable in compare view

Dependabot compatibility score

You can trigger a rebase of this PR by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
    You can disable automated security fix PRs for this repo from the Security Alerts page.

Note
Automatic rebases have been disabled on this pull request as it has been open for over 30 days.

Bumps [org.apache.maven:maven-core](https://github.com/apache/maven) from 3.0.5 to 3.8.1.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](apache/maven@maven-3.0.5...maven-3.8.1)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Aug 15, 2023
@yegor256
Copy link
Owner

yegor256 commented Dec 4, 2024

@rultor please, try to merge

@rultor
Copy link
Collaborator

rultor commented Dec 4, 2024

@rultor please, try to merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here.

@rultor
Copy link
Collaborator

rultor commented Dec 4, 2024

@rultor please, try to merge

@dependabot[bot] @yegor256 Oops, I failed. You can see the full log here (spent 1min).

+ git config user.email [email protected]
+ git config user.name rultor
+ '[' -z 'export '\''[email protected]:yegor256/qulice.git'\''' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''[email protected]:yegor256/qulice.git'\''' ';' 'export '\''pull_id=1177'\''' ';' 'export '\''[email protected]:yegor256/qulice.git'\''' ';' 'export '\''fork_branch=dependabot/maven/qulice-maven-plugin/org.apache.maven-maven-core-3.8.1'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=Bump org.apache.maven:maven-core from 3.0.5 to 3.8.1 in /qulice-maven-plugin'\''' ';' 'export '\''author=yegor256'\''' ';' 'pdd --file=/dev/null' ';' 'mvn clean install -Pqulice-profile -Pqulice --errors --batch-mode' ';'
+ sensitive=('settings.xml')
+ rm -rf .gnupg
+ cd repo
+ git remote add fork [email protected]:yegor256/qulice.git
+ git remote update
Fetching origin
Fetching fork
From github.com:yegor256/qulice
 * [new branch]        dependabot/maven/qulice-maven-plugin/org.apache.maven-maven-core-3.8.1 -> fork/dependabot/maven/qulice-maven-plugin/org.apache.maven-maven-core-3.8.1
 * [new branch]        gh-pages                 -> fork/gh-pages
 * [new branch]        master                   -> fork/master
 * [new branch]        renovate/com.jcabi-parent-0.x -> fork/renovate/com.jcabi-parent-0.x
 * [new branch]        renovate/commons-io-commons-io-2.x -> fork/renovate/commons-io-commons-io-2.x
 * [new branch]        renovate/commons-lang-commons-lang-2.x -> fork/renovate/commons-lang-commons-lang-2.x
 * [new branch]        renovate/hibernate-core  -> fork/renovate/hibernate-core
 * [new branch]        renovate/junit5-monorepo -> fork/renovate/junit5-monorepo
 * [new branch]        renovate/net.sourceforge.pmd-pmd-core-7.x -> fork/renovate/net.sourceforge.pmd-pmd-core-7.x
 * [new branch]        renovate/net.sourceforge.pmd-pmd-java-7.x -> fork/renovate/net.sourceforge.pmd-pmd-java-7.x
 * [new branch]        renovate/net.sourceforge.pmd-pmd-jsp-7.x -> fork/renovate/net.sourceforge.pmd-pmd-jsp-7.x
 * [new branch]        renovate/org.apache.xmlgraphics-batik-ext-1.x -> fork/renovate/org.apache.xmlgraphics-batik-ext-1.x
 * [new branch]        renovate/org.codehaus.plexus-plexus-utils-4.x -> fork/renovate/org.codehaus.plexus-plexus-utils-4.x
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ wc -l
++ git show-branch __rultor
+ '[' 0 -gt 0 ']'
+ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean
+ git checkout -B __rultor fork/dependabot/maven/qulice-maven-plugin/org.apache.maven-maven-core-3.8.1
Switched to a new branch '__rultor'
Branch '__rultor' set up to track remote branch 'dependabot/maven/qulice-maven-plugin/org.apache.maven-maven-core-3.8.1' from 'fork'.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch 'master' set up to track remote branch 'master' from 'origin'.
Your branch is up to date with 'origin/master'.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff __rultor
Auto-merging qulice-maven-plugin/pom.xml
CONFLICT (content): Merge conflict in qulice-maven-plugin/pom.xml
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, most probably the Docker container wasn't started correctly

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants