Skip to content

Commit 6479b97

Browse files
krissternkrisstern
authored
Merge pull request #92 from krisstern/preparing-for-new-release-2022
Preparing for a new release of plugin
2 parents b7a1d57 + c9475e6 commit 6479b97

File tree

1 file changed

+44
-119
lines changed

1 file changed

+44
-119
lines changed

‎pom.xml‎

Lines changed: 44 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>4.37</version>
8+
<version>4.40</version>
99
<relativePath />
1010
</parent>
1111

@@ -34,32 +34,33 @@
3434
<properties>
3535
<revision>1.21</revision>
3636
<changelist>-SNAPSHOT</changelist>
37-
<jenkins.version>2.332.1</jenkins.version>
37+
<jenkins.version>2.332.3</jenkins.version>
3838
<java.level>8</java.level>
3939
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
4040
<!-- To be removed once Jenkins.MANAGE permission gets out of beta -->
4141
<useBeta>true</useBeta>
42+
<maven.version>3.8.5</maven.version>
4243
<junit.version>5.8.2</junit.version>
4344
<mockito.version>4.3.1</mockito.version>
4445
<junit-platform-launcher.version>1.8.2</junit-platform-launcher.version>
45-
<assertj.version>3.22.0</assertj.version>
46-
<archunit.version>0.22.0</archunit.version>
47-
<json-unit-fluent.version>2.31.0</json-unit-fluent.version>
48-
<equalsverifier.version>3.9</equalsverifier.version>
4946
</properties>
5047

5148
<build>
5249
<plugins>
5350
<plugin>
5451
<groupId>org.apache.maven.plugins</groupId>
5552
<artifactId>maven-compiler-plugin</artifactId>
53+
<version>3.10.1</version>
5654
<configuration>
57-
<!-- Start for debugging -->
55+
<source>1.8</source>
56+
<target>1.8</target>
57+
<!-- <compilerVersion>1.8</compilerVersion>-->
58+
<!-- Start of logging for debugging -->
5859
<!-- Please feel free to uncomment during debugging -->
5960
<showDeprecation>true</showDeprecation>
6061
<showWarnings>true</showWarnings>
6162
<forceJavacCompilerUse>true</forceJavacCompilerUse>
62-
<!-- End for debugging -->
63+
<!-- End of logging for debugging -->
6364
</configuration>
6465
</plugin>
6566
</plugins>
@@ -69,8 +70,22 @@
6970
<dependencies>
7071
<dependency>
7172
<groupId>io.jenkins.tools.bom</groupId>
72-
<artifactId>bom-2.303.x</artifactId>
73-
<version>1198.v387c834fca_1a_</version>
73+
<artifactId>bom-2.332.x</artifactId>
74+
<version>1382.v7d694476f340</version>
75+
<type>pom</type>
76+
<scope>import</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.junit</groupId>
80+
<artifactId>junit-bom</artifactId>
81+
<version>${junit.version}</version>
82+
<type>pom</type>
83+
<scope>import</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.mockito</groupId>
87+
<artifactId>mockito-bom</artifactId>
88+
<version>${mockito.version}</version>
7489
<type>pom</type>
7590
<scope>import</scope>
7691
</dependency>
@@ -80,149 +95,59 @@
8095
<dependencies>
8196
<dependency>
8297
<groupId>org.jenkins-ci.plugins</groupId>
83-
<artifactId>naginator</artifactId>
84-
<version>1.18.1</version>
85-
<optional>true</optional>
86-
</dependency>
87-
<dependency>
88-
<!-- Required by Naginator as a dependency -->
89-
<groupId>org.jenkins-ci.plugins</groupId>
90-
<artifactId>matrix-project</artifactId>
91-
<scope>test</scope>
98+
<artifactId>token-macro</artifactId>
9299
</dependency>
93100
<dependency>
94101
<groupId>org.jenkins-ci.plugins</groupId>
95-
<artifactId>junit</artifactId>
96-
<scope>test</scope>
102+
<artifactId>naginator</artifactId>
103+
<version>1.18.1</version>
104+
<optional>true</optional>
97105
</dependency>
106+
98107
<dependency>
99-
<groupId>nl.jqno.equalsverifier</groupId>
100-
<artifactId>equalsverifier</artifactId>
101-
<version>${equalsverifier.version}</version>
108+
<groupId>org.mockito</groupId>
109+
<artifactId>mockito-core</artifactId>
102110
<scope>test</scope>
103111
</dependency>
104112
<dependency>
105113
<groupId>org.junit.jupiter</groupId>
106114
<artifactId>junit-jupiter-api</artifactId>
107-
<version>${junit.version}</version>
108115
<scope>test</scope>
109116
</dependency>
110117
<dependency>
111118
<groupId>org.junit.jupiter</groupId>
112119
<artifactId>junit-jupiter-engine</artifactId>
113-
<version>${junit.version}</version>
114120
<scope>test</scope>
115121
</dependency>
116122
<dependency>
117123
<groupId>org.junit.vintage</groupId>
118124
<artifactId>junit-vintage-engine</artifactId>
119-
<version>${junit.version}</version>
120-
<scope>test</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.junit.platform</groupId>
124-
<artifactId>junit-platform-launcher</artifactId>
125-
<version>${junit-platform-launcher.version}</version>
126-
<scope>test</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.junit.jupiter</groupId>
130-
<artifactId>junit-jupiter-params</artifactId>
131-
<version>${junit.version}</version>
132-
<scope>test</scope>
133-
</dependency>
134-
<dependency>
135-
<groupId>junit</groupId>
136-
<artifactId>junit</artifactId>
137-
<version>4.13.2</version>
138-
<scope>test</scope>
139-
</dependency>
140-
<dependency>
141-
<groupId>org.mockito</groupId>
142-
<artifactId>mockito-core</artifactId>
143-
<version>${mockito.version}</version>
144-
<scope>test</scope>
145-
</dependency>
146-
<dependency>
147-
<groupId>org.mockito</groupId>
148-
<artifactId>mockito-inline</artifactId>
149-
<version>${mockito.version}</version>
150125
<scope>test</scope>
151126
</dependency>
152-
<dependency>
153-
<groupId>org.mockito</groupId>
154-
<artifactId>mockito-junit-jupiter</artifactId>
155-
<version>${mockito.version}</version>
156-
<scope>test</scope>
157-
</dependency>
158-
<dependency>
159-
<groupId>org.assertj</groupId>
160-
<artifactId>assertj-core</artifactId>
161-
<version>${assertj.version}</version>
162-
<scope>test</scope>
163-
</dependency>
164-
<dependency>
165-
<groupId>com.tngtech.archunit</groupId>
166-
<artifactId>archunit-junit5</artifactId>
167-
<version>${archunit.version}</version>
168-
<scope>test</scope>
169-
</dependency>
170-
<dependency>
171-
<groupId>net.javacrumbs.json-unit</groupId>
172-
<artifactId>json-unit-assertj</artifactId>
173-
<version>${json-unit-fluent.version}</version>
174-
<scope>test</scope>
175-
<exclusions>
176-
<exclusion>
177-
<groupId>org.ow2.asm</groupId>
178-
<artifactId>asm</artifactId>
179-
</exclusion>
180-
</exclusions>
181-
</dependency>
182-
183-
<dependency>
184-
<groupId>org.objenesis</groupId>
185-
<artifactId>objenesis</artifactId>
186-
<version>3.2</version>
187-
<scope>test</scope>
188-
</dependency>
189-
<dependency>
190-
<groupId>org.mockito</groupId>
191-
<artifactId>mockito-core</artifactId>
192-
<scope>test</scope>
193-
</dependency>
194-
<dependency>
195-
<groupId>org.jenkins-ci.plugins</groupId>
196-
<artifactId>script-security</artifactId>
197-
</dependency>
198-
<dependency>
199-
<groupId>org.jenkins-ci.plugins</groupId>
200-
<artifactId>mailer</artifactId>
201-
</dependency>
202-
<dependency>
203-
<groupId>org.jenkins-ci.plugins</groupId>
204-
<artifactId>token-macro</artifactId>
205-
</dependency>
206-
<dependency>
207-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
208-
<artifactId>workflow-step-api</artifactId>
209-
</dependency>
210-
<dependency>
211-
<groupId>org.jenkins-ci.plugins</groupId>
212-
<artifactId>structs</artifactId>
213-
</dependency>
214127
</dependencies>
215128

216129
<repositories>
217130
<repository>
218131
<id>repo.jenkins-ci.org</id>
219132
<url>https://repo.jenkins-ci.org/public/</url>
220133
</repository>
134+
<repository>
135+
<!-- Required for using incremental versions of dependencies -->
136+
<!-- Please do not remove -->
137+
<id>repo.jenkins-ci.org.incrementals</id>
138+
<url>https://repo.jenkins-ci.org/incrementals/</url>
139+
</repository>
221140
</repositories>
222141
<pluginRepositories>
223142
<pluginRepository>
224143
<id>repo.jenkins-ci.org</id>
225144
<url>https://repo.jenkins-ci.org/public/</url>
226145
</pluginRepository>
146+
<pluginRepository>
147+
<!-- Required for using incremental versions of dependencies -->
148+
<!-- Please do not remove -->
149+
<id>repo.jenkins-ci.org.incrementals</id>
150+
<url>https://repo.jenkins-ci.org/incrementals/</url>
151+
</pluginRepository>
227152
</pluginRepositories>
228153
</project>

0 commit comments

Comments
 (0)