Skip to content

Commit 7784d4a

Browse files
Merge branch 'release/1.x' into patch-1
2 parents e1b44c8 + 0321614 commit 7784d4a

5 files changed

Lines changed: 70 additions & 2 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"name": "Stash Notifier Jenkins Plugin",
3+
"image": "mcr.microsoft.com/devcontainers/java:17",
4+
"postCreateCommand": ".devcontainer/post-create.sh",
5+
"features": {
6+
"ghcr.io/devcontainers/features/java:1": {
7+
"version": "none",
8+
"installMaven": true
9+
}
10+
},
11+
"customizations": {
12+
"vscode": {
13+
"extensions": [
14+
"redhat.vscode-xml",
15+
"vscjava.vscode-java-pack"
16+
]
17+
}
18+
}
19+
}

.devcontainer/post-create.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
set -ex
3+
4+
# Create Maven directory if it doesn't exist
5+
mkdir -p ~/.m2
6+
cp .devcontainer/settings.xml ~/.m2/settings.xml

.devcontainer/settings.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
5+
6+
<profiles>
7+
<profile>
8+
<id>jenkins</id>
9+
<activation>
10+
<activeByDefault>true</activeByDefault>
11+
</activation>
12+
<repositories>
13+
<repository>
14+
<id>repo.jenkins-ci.org</id>
15+
<url>https://repo.jenkins-ci.org/public/</url>
16+
<releases>
17+
<enabled>true</enabled>
18+
</releases>
19+
<snapshots>
20+
<enabled>true</enabled>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<id>repo.jenkins-ci.org</id>
27+
<url>https://repo.jenkins-ci.org/public/</url>
28+
<releases>
29+
<enabled>true</enabled>
30+
</releases>
31+
<snapshots>
32+
<enabled>true</enabled>
33+
</snapshots>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
<activeProfiles>
40+
<activeProfile>jenkins</activeProfile>
41+
</activeProfiles>
42+
43+
</settings>

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.10</version>
5+
<version>1.13</version>
66
</extension>
77
</extensions>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.jenkins-ci.plugins</groupId>
55
<artifactId>plugin</artifactId>
6-
<version>5.24</version>
6+
<version>5.27</version>
77
<relativePath />
88
</parent>
99
<packaging>hpi</packaging>

0 commit comments

Comments
 (0)