Skip to content

Commit 54721bc

Browse files
authored
Fix release (#484)
1 parent bf710b4 commit 54721bc

File tree

6 files changed

+98
-23
lines changed

6 files changed

+98
-23
lines changed

coverage/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,16 @@
6868
</execution>
6969
</executions>
7070
</plugin>
71+
72+
<!-- Skip this module when deploying. -->
73+
<plugin>
74+
<groupId>org.sonatype.central</groupId>
75+
<artifactId>central-publishing-maven-plugin</artifactId>
76+
<configuration>
77+
<skipPublishing>true</skipPublishing>
78+
</configuration>
79+
</plugin>
80+
7181
</plugins>
7282
</build>
7383

exec/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,16 @@
109109
</execution>
110110
</executions>
111111
</plugin>
112+
113+
<!-- Skip this module when deploying. -->
114+
<plugin>
115+
<groupId>org.sonatype.central</groupId>
116+
<artifactId>central-publishing-maven-plugin</artifactId>
117+
<configuration>
118+
<skipPublishing>true</skipPublishing>
119+
</configuration>
120+
</plugin>
121+
112122
</plugins>
113123
</build>
114124

plugins/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828

2929
<artifactId>plugins</artifactId>
3030

31+
<name>FHIR Information Gateway Plugins</name>
32+
<description>Sample AccessChecker plugins for FHIR Info Gateway</description>
33+
3134
<properties>
3235
<root.basedir>${project.parent.basedir}</root.basedir>
3336
</properties>

pom.xml

Lines changed: 71 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2020
<modelVersion>4.0.0</modelVersion>
2121

22-
<parent>
23-
<groupId>org.sonatype.oss</groupId>
24-
<artifactId>oss-parent</artifactId>
25-
<version>9</version>
26-
</parent>
27-
2822
<groupId>com.google.fhir.gateway</groupId>
2923
<artifactId>fhir-gateway</artifactId>
3024
<version>0.5.0</version>
@@ -42,6 +36,16 @@
4236
</license>
4337
</licenses>
4438

39+
<developers>
40+
<!-- A Sonatype requirement is to have someone here. For the full list of contributors see:
41+
https://github.com/google/fhir-gateway/graphs/contributors -->
42+
<developer>
43+
<id>bashir</id>
44+
<name>Bashir Sadjad</name>
45+
<email>bashir@google.com</email>
46+
</developer>
47+
</developers>
48+
4549
<modules>
4650
<module>exec</module>
4751
<module>plugins</module>
@@ -55,21 +59,6 @@
5559
<url>https://github.com/google/fhir-gateway/tree/main</url>
5660
</scm>
5761

58-
<!-- For release documentation see:
59-
https://central.sonatype.org/publish/publish-maven/
60-
Note, although it suggests new projects should use s01.oss.sonatype.org but
61-
with our sonatype.org credentials, it fails with a "Forbidden" message. -->
62-
<distributionManagement>
63-
<repository>
64-
<id>ossrh</id>
65-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
66-
</repository>
67-
<snapshotRepository>
68-
<id>ossrh</id>
69-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
70-
</snapshotRepository>
71-
</distributionManagement>
72-
7362
<properties>
7463
<hapifhir_version>8.0.0</hapifhir_version>
7564
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -290,6 +279,67 @@
290279
<target>17</target>
291280
</configuration>
292281
</plugin>
282+
283+
<!-- source jars are needed for Maven Central deployment -->
284+
<plugin>
285+
<groupId>org.apache.maven.plugins</groupId>
286+
<artifactId>maven-source-plugin</artifactId>
287+
<version>3.3.1</version>
288+
<executions>
289+
<execution>
290+
<id>attach-sources</id>
291+
<phase>verify</phase>
292+
<goals>
293+
<goal>jar-no-fork</goal>
294+
</goals>
295+
</execution>
296+
</executions>
297+
</plugin>
298+
299+
<!-- javadoc jars are needed for Maven Central deployment -->
300+
<plugin>
301+
<groupId>org.apache.maven.plugins</groupId>
302+
<artifactId>maven-javadoc-plugin</artifactId>
303+
<version>3.12.0</version>
304+
<executions>
305+
<execution>
306+
<id>attach-javadocs</id>
307+
<goals>
308+
<goal>jar</goal>
309+
</goals>
310+
</execution>
311+
</executions>
312+
</plugin>
313+
314+
<!-- We need to sign to deploy on Maven Central; we do this
315+
only in the deploy phase not to impact install. -->
316+
<plugin>
317+
<groupId>org.apache.maven.plugins</groupId>
318+
<artifactId>maven-gpg-plugin</artifactId>
319+
<version>3.2.8</version>
320+
<executions>
321+
<execution>
322+
<id>sign-artifacts</id>
323+
<phase>deploy</phase>
324+
<goals>
325+
<goal>sign</goal>
326+
</goals>
327+
</execution>
328+
</executions>
329+
</plugin>
330+
331+
<!-- See https://central.sonatype.org/publish/publish-portal-maven/
332+
Keep this after GPG step above to upload signature files too. -->
333+
<plugin>
334+
<groupId>org.sonatype.central</groupId>
335+
<artifactId>central-publishing-maven-plugin</artifactId>
336+
<version>0.9.0</version>
337+
<extensions>true</extensions>
338+
<configuration>
339+
<publishingServerId>central</publishingServerId>
340+
</configuration>
341+
</plugin>
342+
293343
</plugins>
294344
</build>
295345

server/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<artifactId>server</artifactId>
2828
<packaging>jar</packaging>
2929

30+
<name>FHIR Information Gateway Core</name>
31+
<description>The core component of FHIR Info Gateway</description>
32+
3033
<properties>
3134
<root.basedir>${project.parent.basedir}</root.basedir>
3235
<!-- This is chosen based on the Spring Boot version used in exec module.

server/src/main/java/com/google/fhir/gateway/interfaces/PatientFinder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ public interface PatientFinder {
6969
/**
7070
* Finds all patient ids in the content of a resource.
7171
*
72-
* @param resource belonging to {@link org.hl7.fhir.r4.model.codesystems.CompartmentType.PATIENT}
73-
* that is expected to have patient ids.
72+
* @param resource belonging to Patient Compartment that is expected to have patient ids.
7473
* @return the ids of the patient compartment owners
7574
*/
7675
Set<String> findPatientIds(DomainResource resource);

0 commit comments

Comments
 (0)