Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into master-who
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
alexsilaghi committed Oct 18, 2024
2 parents 5d20ba4 + 08ce5d5 commit a376831
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>edu.stanford.protege</groupId>
<artifactId>webprotege-backend-api</artifactId>
<version>2.0.0-WHO</version>
<version>2.0.1-WHO</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -30,7 +30,7 @@
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
<commonmark.version>0.11.0</commonmark.version>
<lucene.version>8.5.2</lucene.version>
<java.version>16</java.version>
<java.version>17</java.version>
<spring-cloud.version>2020.0.3</spring-cloud.version>
</properties>

Expand Down Expand Up @@ -248,9 +248,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>16</source>
<target>16</target>
<release>16</release>
<source>17</source>
<target>17</target>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@JsonSubTypes.Type(DataPropertyHierarchyDescriptor.class),
@JsonSubTypes.Type(AnnotationPropertyHierarchyDescriptor.class)
})
public sealed interface HierarchyDescriptor permits ClassHierarchyDescriptor, ObjectPropertyHierarchyDescriptor, DataPropertyHierarchyDescriptor, AnnotationPropertyHierarchyDescriptor {
public interface HierarchyDescriptor {


}

0 comments on commit a376831

Please sign in to comment.