Skip to content

Commit f9dd1e7

Browse files
hkarthik7hkarthik7
committed
2 parents 303843f + 969b1d6 commit f9dd1e7

File tree

2 files changed

+57
-28
lines changed

2 files changed

+57
-28
lines changed

‎azd/pom.xml‎

Lines changed: 54 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<properties>
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2727
<jackson.version>2.19.0</jackson.version>
28+
<maven.compiler.source>11</maven.compiler.source>
29+
<maven.compiler.target>11</maven.compiler.target>
2830
</properties>
2931

3032
<dependencies>
@@ -52,26 +54,22 @@
5254
</dependencies>
5355

5456
<build>
55-
<!-- <finalName>azd-${project.version}</finalName>-->
56-
<!-- <pluginManagement>-->
5757
<plugins>
58-
<!-- clean lifecycle, see
59-
https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
58+
<!-- clean lifecycle -->
6059
<plugin>
6160
<groupId>org.apache.maven.plugins</groupId>
6261
<artifactId>maven-clean-plugin</artifactId>
63-
<version>3.1.0</version>
62+
<version>3.3.2</version>
6463
</plugin>
65-
<!-- default lifecycle, jar packaging: see
66-
https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
64+
<!-- default lifecycle, jar packaging -->
6765
<plugin>
6866
<groupId>org.apache.maven.plugins</groupId>
6967
<artifactId>maven-resources-plugin</artifactId>
70-
<version>3.0.2</version>
68+
<version>3.3.1</version>
7169
</plugin>
7270
<plugin>
7371
<artifactId>maven-compiler-plugin</artifactId>
74-
<version>3.8.1</version>
72+
<version>3.11.0</version>
7573
<configuration>
7674
<source>11</source>
7775
<target>11</target>
@@ -80,31 +78,41 @@
8078
<plugin>
8179
<groupId>org.apache.maven.plugins</groupId>
8280
<artifactId>maven-surefire-plugin</artifactId>
83-
<version>2.22.1</version>
81+
<version>3.2.2</version>
8482
</plugin>
8583
<plugin>
8684
<groupId>org.apache.maven.plugins</groupId>
8785
<artifactId>maven-jar-plugin</artifactId>
88-
<version>3.0.2</version>
86+
<version>3.3.0</version>
8987
</plugin>
88+
<!-- GPG plugin for signing artifacts -->
9089
<plugin>
9190
<groupId>org.apache.maven.plugins</groupId>
9291
<artifactId>maven-gpg-plugin</artifactId>
93-
<version>1.5</version>
92+
<version>3.1.0</version>
9493
<executions>
9594
<execution>
9695
<id>sign-artifacts</id>
9796
<phase>verify</phase>
9897
<goals>
9998
<goal>sign</goal>
10099
</goals>
100+
<configuration>
101+
<!-- Prevent gpg from using pinentry programs -->
102+
<gpgArguments>
103+
<arg>--pinentry-mode</arg>
104+
<arg>loopback</arg>
105+
</gpgArguments>
106+
<passphrase>${env.GPG_PASSPHRASE}</passphrase>
107+
</configuration>
101108
</execution>
102109
</executions>
103110
</plugin>
111+
<!-- Source plugin -->
104112
<plugin>
105113
<groupId>org.apache.maven.plugins</groupId>
106114
<artifactId>maven-source-plugin</artifactId>
107-
<version>2.2.1</version>
115+
<version>3.3.0</version>
108116
<executions>
109117
<execution>
110118
<id>attach-sources</id>
@@ -114,10 +122,11 @@
114122
</execution>
115123
</executions>
116124
</plugin>
125+
<!-- Javadoc plugin -->
117126
<plugin>
118127
<groupId>org.apache.maven.plugins</groupId>
119128
<artifactId>maven-javadoc-plugin</artifactId>
120-
<version>3.2.0</version>
129+
<version>3.6.3</version>
121130
<executions>
122131
<execution>
123132
<id>attach-javadocs</id>
@@ -126,32 +135,49 @@
126135
</goals>
127136
</execution>
128137
</executions>
138+
<configuration>
139+
<!-- Ignore missing @param, @return, etc. -->
140+
<doclint>none</doclint>
141+
<source>11</source>
142+
</configuration>
129143
</plugin>
130144
<plugin>
131145
<groupId>org.apache.maven.plugins</groupId>
132146
<artifactId>maven-install-plugin</artifactId>
133-
<version>2.5.2</version>
147+
<version>3.1.1</version>
134148
</plugin>
135149
<plugin>
136150
<groupId>org.apache.maven.plugins</groupId>
137151
<artifactId>maven-deploy-plugin</artifactId>
138-
<version>2.8.2</version>
152+
<version>3.1.1</version>
139153
</plugin>
140-
<!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
154+
<!-- Nexus Staging Plugin for Maven Central -->
155+
<plugin>
156+
<groupId>org.sonatype.central</groupId>
157+
<artifactId>central-publishing-maven-plugin</artifactId>
158+
<version>0.9.0</version>
159+
<extensions>true</extensions>
160+
<configuration>
161+
<publishingServerId>central</publishingServerId>
162+
<!-- <tokenAuth>true</tokenAuth>-->
163+
<!-- <autoPublish>true</autoPublish>-->
164+
</configuration>
165+
</plugin>
166+
<!-- site lifecycle -->
141167
<plugin>
142168
<groupId>org.apache.maven.plugins</groupId>
143169
<artifactId>maven-site-plugin</artifactId>
144-
<version>3.7.1</version>
170+
<version>4.0.0-M13</version>
145171
</plugin>
146172
<plugin>
147173
<groupId>org.apache.maven.plugins</groupId>
148174
<artifactId>maven-project-info-reports-plugin</artifactId>
149-
<version>3.0.0</version>
175+
<version>3.5.0</version>
150176
</plugin>
151177
<plugin>
152178
<groupId>org.apache.maven.plugins</groupId>
153179
<artifactId>maven-shade-plugin</artifactId>
154-
<version>3.2.4</version>
180+
<version>3.5.1</version>
155181
<executions>
156182
<execution>
157183
<phase>package</phase>
@@ -161,7 +187,7 @@
161187
<configuration>
162188
<transformers>
163189
<transformer
164-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
190+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
165191
</transformer>
166192
</transformers>
167193
<artifactSet>
@@ -176,28 +202,30 @@
176202
</executions>
177203
</plugin>
178204
</plugins>
179-
<!-- </pluginManagement>-->
180205
</build>
206+
181207
<licenses>
182208
<license>
183209
<name>MIT</name>
184210
<url>https://github.com/hkarthik7/azure-devops-java-sdk/blob/main/LICENSE</url>
185211
</license>
186212
</licenses>
213+
187214
<scm>
188215
<connection>scm:git:git://github.com/hkarthik7/azure-devops-java-sdk.git</connection>
189216
<developerConnection>scm:git:ssh://github.com:hkarthik7/azure-devops-java-sdk.git</developerConnection>
190217
<url>https://github.com/hkarthik7/azure-devops-java-sdk/tree/main</url>
191218
</scm>
192219

220+
<!-- Updated for new Maven Central publishing -->
193221
<distributionManagement>
194222
<snapshotRepository>
195-
<id>ossrh</id>
196-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
223+
<id>central</id>
224+
<url>https://central.sonatype.com/</url>
197225
</snapshotRepository>
198226
<repository>
199-
<id>ossrh</id>
200-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
227+
<id>central</id>
228+
<url>https://central.sonatype.com/</url>
201229
</repository>
202230
</distributionManagement>
203231
</project>

‎azd/src/test/java/org/azd/unittests/GitRequestBuilderTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.azd.serviceclient.AzDServiceClient;
1919
import org.azd.wiki.types.GitVersionDescriptor;
2020
import org.junit.Before;
21+
import org.junit.Ignore;
2122
import org.junit.Test;
2223

2324
import java.io.File;
@@ -566,7 +567,7 @@ public void shouldGetGitPullRequestStatus() throws AzDException {
566567
client.git().pullRequest().statuses().get(repo.getId(), pr, status.getId());
567568
}
568569

569-
@Test
570+
@Ignore
570571
public void shouldDeleteGitPullRequestStatus() throws AzDException {
571572
var repo = client.git().repositories().get(testConfiguration.properties.git.repositoryName);
572573
var pullRequest = client.git().pullRequests().list(testConfiguration.properties.git.repositoryName)
@@ -589,7 +590,7 @@ public void shouldDeleteGitPullRequestStatus() throws AzDException {
589590
client.git().pullRequest().statuses().delete(repo.getId(), pullRequest.getPullRequestId(), newStatus.getId());
590591
}
591592

592-
@Test
593+
@Ignore
593594
public void shouldUpdateGitPullRequestStatus() throws AzDException {
594595
var repo = client.git().repositories().get(testConfiguration.properties.git.repositoryName);
595596
var pullRequest = client.git().pullRequests().list(testConfiguration.properties.git.repositoryName)

0 commit comments

Comments
 (0)