Skip to content

Commit 35c58ba

Browse files
sbabcocsbabcoc
authored
Merge pull request #12 from seleniumhq-community/pr/migrate-publishing-service
Update publishing info; update versions
2 parents 02845e0 + a97c88a commit 35c58ba

File tree

8 files changed

+65
-26
lines changed

8 files changed

+65
-26
lines changed

‎pom.xml

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.nordstrom.ui-tools</groupId>
77
<artifactId>htmlunit-remote</artifactId>
8-
<version>4.32.1-SNAPSHOT</version>
8+
<version>4.33.1-SNAPSHOT</version>
99

1010
<name>htmlunit-remote</name>
1111
<description>This is the remote wrapper for HtmlUnitDriver</description>
@@ -38,6 +38,17 @@
3838
<checkstyle.version>10.15.0</checkstyle.version>
3939
<spotbugs.version>4.8.4</spotbugs.version>
4040
<dependencycheck.version>9.1.0</dependencycheck.version>
41+
<compiler-plugin.version>3.8.1</compiler-plugin.version>
42+
<checkstyle-plugin.version>3.3.1</checkstyle-plugin.version>
43+
<spotbugs-plugin.version>4.8.4.0</spotbugs-plugin.version>
44+
<source-plugin.version>3.3.1</source-plugin.version>
45+
<javadoc-plugin.version>3.6.3</javadoc-plugin.version>
46+
<surefire-plugin.version>3.2.5</surefire-plugin.version>
47+
<gpg-plugin.version>3.2.4</gpg-plugin.version>
48+
<assembly-plugin.version>3.7.1</assembly-plugin.version>
49+
<enforcer-plugin.version>3.4.1</enforcer-plugin.version>
50+
<staging-plugin.version>1.7.0</staging-plugin.version>
51+
<release-plugin.version>3.1.1</release-plugin.version>
4152
<skipSigning>true</skipSigning>
4253
</properties>
4354

@@ -51,11 +62,11 @@
5162
<distributionManagement>
5263
<snapshotRepository>
5364
<id>ossrh</id>
54-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
65+
<url>https://ossrh-staging-api.central.sonatype.com/content/repositories/snapshots</url>
5566
</snapshotRepository>
5667
<repository>
5768
<id>ossrh</id>
58-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
69+
<url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
5970
</repository>
6071
</distributionManagement>
6172

@@ -68,6 +79,7 @@
6879
</dependency>
6980
</dependencies>
7081
</dependencyManagement>
82+
7183
<dependencies>
7284
<dependency>
7385
<groupId>org.seleniumhq.selenium</groupId>
@@ -100,9 +112,8 @@
100112
<build>
101113
<plugins>
102114
<plugin>
103-
<groupId>org.apache.maven.plugins</groupId>
104115
<artifactId>maven-compiler-plugin</artifactId>
105-
<version>3.13.0</version>
116+
<version>${compiler-plugin.version}</version>
106117
<configuration>
107118
<release>11</release>
108119
<showDeprecation>true</showDeprecation>
@@ -111,9 +122,8 @@
111122
</configuration>
112123
</plugin>
113124
<plugin>
114-
<groupId>org.apache.maven.plugins</groupId>
115125
<artifactId>maven-checkstyle-plugin</artifactId>
116-
<version>3.3.1</version>
126+
<version>${checkstyle-plugin.version}</version>
117127
<configuration>
118128
<configLocation>checkstyle.xml</configLocation>
119129
<suppressionsLocation>checkstyle_suppressions.xml</suppressionsLocation>
@@ -130,7 +140,7 @@
130140
<plugin>
131141
<groupId>com.github.spotbugs</groupId>
132142
<artifactId>spotbugs-maven-plugin</artifactId>
133-
<version>4.8.4.0</version>
143+
<version>${spotbugs-plugin.version}</version>
134144
<dependencies>
135145
<dependency>
136146
<groupId>com.github.spotbugs</groupId>
@@ -143,9 +153,8 @@
143153
</configuration>
144154
</plugin>
145155
<plugin>
146-
<groupId>org.apache.maven.plugins</groupId>
147156
<artifactId>maven-source-plugin</artifactId>
148-
<version>3.3.1</version>
157+
<version>${source-plugin.version}</version>
149158
<executions>
150159
<execution>
151160
<id>attach-sources</id>
@@ -157,9 +166,8 @@
157166
</executions>
158167
</plugin>
159168
<plugin>
160-
<groupId>org.apache.maven.plugins</groupId>
161169
<artifactId>maven-javadoc-plugin</artifactId>
162-
<version>3.6.3</version>
170+
<version>${javadoc-plugin.version}</version>
163171
<configuration>
164172
<quiet>true</quiet>
165173
<detectLinks>true</detectLinks>
@@ -174,19 +182,17 @@
174182
</executions>
175183
</plugin>
176184
<plugin>
177-
<groupId>org.apache.maven.plugins</groupId>
178185
<artifactId>maven-surefire-plugin</artifactId>
179-
<version>3.2.5</version>
186+
<version>${surefire-plugin.version}</version>
180187
<configuration>
181188
<includes>
182189
<include>**/*.java</include>
183190
</includes>
184191
</configuration>
185192
</plugin>
186193
<plugin>
187-
<groupId>org.apache.maven.plugins</groupId>
188194
<artifactId>maven-gpg-plugin</artifactId>
189-
<version>3.2.4</version>
195+
<version>${gpg-plugin.version}</version>
190196
<executions>
191197
<execution>
192198
<phase>verify</phase>
@@ -197,9 +203,8 @@
197203
</executions>
198204
</plugin>
199205
<plugin>
200-
<groupId>org.apache.maven.plugins</groupId>
201206
<artifactId>maven-assembly-plugin</artifactId>
202-
<version>3.7.1</version>
207+
<version>${assembly-plugin.version}</version>
203208
<configuration>
204209
<descriptors>
205210
<descriptor>src/assembly/assembly.xml</descriptor>
@@ -215,9 +220,8 @@
215220
</executions>
216221
</plugin>
217222
<plugin>
218-
<groupId>org.apache.maven.plugins</groupId>
219223
<artifactId>maven-enforcer-plugin</artifactId>
220-
<version>3.4.1</version>
224+
<version>${enforcer-plugin.version}</version>
221225
<executions>
222226
<execution>
223227
<id>enforce</id>
@@ -242,18 +246,24 @@
242246
<plugin>
243247
<groupId>org.sonatype.plugins</groupId>
244248
<artifactId>nexus-staging-maven-plugin</artifactId>
245-
<version>1.6.13</version>
249+
<version>${staging-plugin.version}</version>
246250
<extensions>true</extensions>
251+
<dependencies>
252+
<dependency>
253+
<groupId>io.github.x-stream</groupId>
254+
<artifactId>mxparser</artifactId>
255+
<version>1.2.1</version>
256+
</dependency>
257+
</dependencies>
247258
<configuration>
248259
<serverId>ossrh</serverId>
249-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
260+
<nexusUrl>https://ossrh-staging-api.central.sonatype.com/</nexusUrl>
250261
<autoReleaseAfterClose>true</autoReleaseAfterClose>
251262
</configuration>
252263
</plugin>
253264
<plugin>
254-
<groupId>org.apache.maven.plugins</groupId>
255265
<artifactId>maven-release-plugin</artifactId>
256-
<version>3.0.0-M6</version>
266+
<version>${release-plugin.version}</version>
257267
<configuration>
258268
<autoVersionSubmodules>true</autoVersionSubmodules>
259269
<useReleaseProfile>false</useReleaseProfile>

‎src/assembly/assembly.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
<include>org.htmlunit:htmlunit-csp</include>
2626
<include>org.htmlunit:htmlunit-websocket-client</include>
2727
<include>org.apache.commons:commons-lang3</include>
28-
<include>org.apache.commons:commons-text</include>
2928
<include>commons-io:commons-io</include>
3029
<include>commons-logging:commons-logging</include>
31-
<include>commons-net:commons-net</include>
3230
<include>commons-codec:commons-codec</include>
3331
<include>org.brotli:dec</include>
3432
</includes>

‎src/main/java/org/openqa/selenium/htmlunit/remote/ActionsCoercer.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
*/
4040
public class ActionsCoercer {
4141

42+
/**
43+
* Default constructor
44+
*/
45+
public ActionsCoercer() { }
46+
4247
/**
4348
* Decode the specified input into the corresponding actions.
4449
*

‎src/main/java/org/openqa/selenium/htmlunit/remote/CookieCoercer.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
*/
1313
public class CookieCoercer {
1414

15+
/**
16+
* Default constructor
17+
*/
18+
public CookieCoercer() { }
19+
1520
/**
1621
* Decode the specified input into the corresponding cookie.
1722
*

‎src/main/java/org/openqa/selenium/htmlunit/remote/HtmlUnitDriverInfo.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
@AutoService(WebDriverInfo.class)
4040
public class HtmlUnitDriverInfo implements WebDriverInfo {
4141

42+
/**
43+
* Default constructor
44+
*/
45+
public HtmlUnitDriverInfo() { }
46+
4247
/**
4348
* {@inheritDoc}
4449
*/

‎src/main/java/org/openqa/selenium/htmlunit/remote/HtmlUnitDriverService.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ public void close() {
182182
@AutoService(DriverService.Builder.class)
183183
public static class Builder extends DriverService.Builder<HtmlUnitDriverService, HtmlUnitDriverService.Builder> {
184184

185+
/**
186+
* Default constructor
187+
*/
188+
public Builder() { }
189+
185190
/**
186191
* {@inheritDoc}
187192
*/

‎src/main/java/org/openqa/selenium/htmlunit/remote/HtmlUnitSlotMatcher.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ public class HtmlUnitSlotMatcher extends DefaultSlotMatcher {
1313

1414
private static final long serialVersionUID = 1L;
1515

16+
/**
17+
* Default constructor
18+
*/
19+
public HtmlUnitSlotMatcher() { }
20+
1621
@Override
1722
public boolean matches(Capabilities stereotype, Capabilities capabilities) {
1823

‎src/main/java/org/openqa/selenium/htmlunit/remote/HtmlUnitWebElementToJsonConverter.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
* WebDriver JSON Wire Protocol</a>
1717
*/
1818
public class HtmlUnitWebElementToJsonConverter extends WebElementToJsonConverter {
19+
20+
/**
21+
* Default constructor
22+
*/
23+
public HtmlUnitWebElementToJsonConverter() { }
24+
1925
@Override
2026
public Object apply(Object arg) {
2127
if (arg instanceof HtmlUnitWebElement) {

0 commit comments

Comments
 (0)