Merge branch 'protegeproject:master' into removeLibs

protegeproject · May 25, 2024 · 946f55c · 946f55c
2 parents e7fd6a6 + 23df63b
commit 946f55c
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>edu.stanford.protege</groupId>
     <artifactId>protege-parent</artifactId>
-    <version>5.6.3</version>
+    <version>5.6.4</version>
     <packaging>pom</packaging>
 
     <name>protege-parent</name>
@@ -126,8 +126,8 @@
 	<properties>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
-		<slf4j.version>1.7.12</slf4j.version>
-		<logback.version>1.1.3</logback.version>
+		<slf4j.version>1.7.32</slf4j.version>
+		<logback.version>1.2.13</logback.version>
 		<lib.location>target/lib</lib.location>
 		<jackson.version>2.9.8</jackson.version>
 	</properties>
@@ -138,7 +138,7 @@
 			<dependency>
 				<groupId>net.sourceforge.owlapi</groupId>
 				<artifactId>owlapi-osgidistribution</artifactId>
-				<version>4.5.26</version>
+				<version>4.5.29</version>
 			</dependency>
 
 			<dependency>
@@ -250,7 +250,7 @@
 			<dependency>
 				<groupId>com.googlecode.javaewah</groupId>
 				<artifactId>JavaEWAH</artifactId>
-				<version>1.1.6</version>
+				<version>1.1.13</version>
 			</dependency>
 
 			<dependency>
@@ -379,7 +379,7 @@
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>4.1.0</version>
+					<version>5.1.9</version>
 					<extensions>true</extensions>
 					<configuration>
 						<instructions>							

diff --git a/protege-common/pom.xml b/protege-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>edu.stanford.protege</groupId>
 		<artifactId>protege-parent</artifactId>
-		<version>5.6.3</version>
+		<version>5.6.4</version>
 		<relativePath>../</relativePath>
 	</parent>
 

diff --git a/protege-desktop/pom.xml b/protege-desktop/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>edu.stanford.protege</groupId>
 		<artifactId>protege-parent</artifactId>
-		<version>5.6.3</version>
+		<version>5.6.4</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -68,21 +68,21 @@
 		<dependency>
 			<groupId>edu.stanford.protege</groupId>
 			<artifactId>jre.os-x</artifactId>
-			<version>11.0.17_8</version>
+			<version>11.0.23_9</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>edu.stanford.protege</groupId>
 			<artifactId>jre.win</artifactId>
-			<version>11.0.17_8</version>
+			<version>11.0.23_9</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>edu.stanford.protege</groupId>
 			<artifactId>jre.linux</artifactId>
-			<version>11.0.17_8</version>
+			<version>11.0.23_9</version>
 			<scope>runtime</scope>
 		</dependency>
 

diff --git a/protege-desktop/src/main/env/linux/protege b/protege-desktop/src/main/env/linux/protege
diff --git a/protege-desktop/src/main/env/linux/run.sh b/protege-desktop/src/main/env/linux/run.sh
@@ -31,6 +31,7 @@ $EFFECTIVE_JAVA_HOME/bin/java \
      -Dlogback.configurationFile=conf/logback.xml \
      -Dfile.encoding=UTF-8 \
      ${conf.extra.args} \
+     --add-opens=java.desktop/sun.swing=ALL-UNNAMED \
      -classpath bundles/guava.jar:bundles/logback-classic.jar:bundles/logback-core.jar:bundles/slf4j-api.jar:bundles/glassfish-corba-orb.jar:bundles/org.apache.felix.main.jar:bundles/maven-artifact.jar:bundles/protege-launcher.jar \
      $CMD_OPTIONS $EXTRA_JVM_OPTIONS org.protege.osgi.framework.Launcher $1
 

diff --git a/protege-desktop/src/main/env/os-x/MacOS/protege b/protege-desktop/src/main/env/os-x/MacOS/protege
diff --git a/protege-desktop/src/main/env/platform-independent/run.sh b/protege-desktop/src/main/env/platform-independent/run.sh
@@ -31,6 +31,7 @@ $EFFECTIVE_JAVA_HOME/bin/java \
      -Dlogback.configurationFile=conf/logback.xml \
      -Dfile.encoding=UTF-8 \
      ${conf.extra.args} \
+     --add-opens=java.desktop/sun.swing=ALL-UNNAMED \
      -classpath bundles/guava.jar:bundles/logback-classic.jar:bundles/logback-core.jar:bundles/slf4j-api.jar:bundles/glassfish-corba-orb.jar:bundles/org.apache.felix.main.jar:bundles/maven-artifact.jar:bundles/protege-launcher.jar \
      $CMD_OPTIONS $EXTRA_JVM_OPTIONS org.protege.osgi.framework.Launcher $1
 

diff --git a/protege-desktop/src/main/env/win/Protege.exe b/protege-desktop/src/main/env/win/Protege.exe
diff --git a/protege-editor-core/pom.xml b/protege-editor-core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>edu.stanford.protege</groupId>
 		<artifactId>protege-parent</artifactId>
-		<version>5.6.3</version>
+		<version>5.6.4</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -105,6 +105,8 @@
 						</_exportcontents>
 						<Import-Package>
 							!com.sun.*,
+							!com.apple.*,
+							!sun.swing,
 							org.eclipse.core.runtime;registry="split",
 							*
 						</Import-Package>

diff --git a/protege-editor-owl/pom.xml b/protege-editor-owl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>edu.stanford.protege</groupId>
         <artifactId>protege-parent</artifactId>
-        <version>5.6.3</version>
+        <version>5.6.4</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/protege-launcher/pom.xml b/protege-launcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>edu.stanford.protege</groupId>
 		<artifactId>protege-parent</artifactId>
-		<version>5.6.3</version>
+		<version>5.6.4</version>
 		<relativePath>../</relativePath>
 	</parent>