Skip to content

Commit 50d67cc

Browse files
authored
Merge branch 'main' into dependabot/maven/org.apache.maven.plugins-maven-install-plugin-3.1.3
2 parents b0fa049 + 5985a6f commit 50d67cc

10 files changed

Lines changed: 439 additions & 10 deletions

File tree

.github/workflows/maven.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
distribution: 'temurin'
2222
cache: maven
2323
- name: Build with Maven
24-
run: mvn --batch-mode --no-transfer-progress package --file pom.xml
24+
run: ./mvnw --batch-mode --no-transfer-progress package --file pom.xml
2525

2626
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
27-
- name: Update dependency graph
28-
uses: advanced-security/maven-dependency-submission-action@4f64ddab9d742a4806eeb588d238e4c311a8397d
27+
# - name: Update dependency graph
28+
# uses: advanced-security/maven-dependency-submission-action@4f64ddab9d742a4806eeb588d238e4c311a8397d

.idea/.gitignore

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

changesets-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<plugin>
9797
<groupId>org.apache.maven.plugins</groupId>
9898
<artifactId>maven-invoker-plugin</artifactId>
99-
<version>3.7.0</version>
99+
<version>3.8.0</version>
100100
<configuration>
101101
<postBuildHookScript>verify</postBuildHookScript>
102102
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>

changesets-maven-plugin/src/it/add-blank-changeset-multimodule/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def firstChangeset = new File(basedir, ".changeset")
2828
.findAll { it.name ==~ /.*\.md/ }
2929
.first()
3030
assert firstChangeset.text.equals("---\n" +
31-
"\"se.fortnox.maven.it:add-blank-changeset-multimodule\": patch\n" +
31+
"\"add-blank-changeset-multimodule\": patch\n" +
3232
"---\n" +
3333
"\n" +
3434
"thecontent")

changesets-maven-plugin/src/it/add-changeset-from-property/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ def firstChangeset = new File(basedir, ".changeset")
55
.first()
66

77
assert firstChangeset.text.equals("---\n" +
8-
"\"com.fortnox.maven.it:add-blank-changelog\": patch\n" +
8+
"\"add-blank-changelog\": patch\n" +
99
"---\n" +
1010
"\n" +
1111
"thecontent");

changesets-maven-plugin/src/main/java/se/fortnox/changesets/maven/AddMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void execute() {
2626
ChangesetWriter changesetWriter = new ChangesetWriter(baseDir);
2727

2828
try {
29-
var changeset = new Changeset("%s:%s".formatted(project.getGroupId(), project.getArtifactId()), Level.PATCH, changesetContent, null);
29+
var changeset = new Changeset("%s".formatted(project.getArtifactId()), Level.PATCH, changesetContent, null);
3030
changesetWriter.writeChangeset(changeset);
3131
} catch (FileAlreadyExistsException e) {
3232
throw new RuntimeException(e);

mvnw

Lines changed: 259 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)