Fix for Java 10

wismill · Apr 24, 2018 · 7efdfae · 7efdfae
1 parent 387e1e8
commit 7efdfae
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 33 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 			<url>http://opensource.org/licenses/BSD-2-Clause</url>
 		</license>
 	</licenses>
-	
+
 	<!-- Alphabetical by last name -->
 	<developers>
 		<developer>
@@ -49,14 +49,14 @@
 			<email>vendetti@stanford.edu</email>
 		</developer>
 	</developers>
-	
+
 	<contributors>
 		<contributor>
 			<name>Nick Drummond</name>
 			<email>nickdrummond@yahoo.com</email>
 		</contributor>
 	</contributors>
-	
+
 	<mailingLists>
 		<!-- For end users of Protege Desktop. -->
 		<mailingList>
@@ -69,7 +69,7 @@
 				<otherArchive>https://mailman.stanford.edu/pipermail/protege-user/</otherArchive>
 			</otherArchives>
 		</mailingList>
-		
+
 		<!-- For developers with questions about source code, developing Protege Desktop plug-ins, and/or programmatic access of ontologies.  -->
 		<mailingList>
 			<name>protege-dev</name>
@@ -82,15 +82,15 @@
 			</otherArchives>
 		</mailingList>
 	</mailingLists>
-		
+
 	<modules>
 		<module>protege-launcher</module>
 		<module>protege-common</module>
 		<module>protege-editor-core</module>
 		<module>protege-editor-owl</module>
 		<module>protege-desktop</module>
 	</modules>
-	
+
 	<scm>
 		<connection>scm:git:git@github.com:protegeproject/protege.git</connection>
 		<developerConnection>scm:git:git@github.com:protegeproject/protege.git</developerConnection>
@@ -101,7 +101,7 @@
 		<system>GitHub</system>
 		<url>https://github.com/protegeproject/protege/issues</url>
 	</issueManagement>
-	
+
 	<!-- Protege libraries are hosted on Sonatype OSSRH (OSS Repository Hosting Service). -->
 	<distributionManagement>
 		<snapshotRepository>
@@ -113,15 +113,15 @@
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 	</distributionManagement>
-	
+
 	<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>
 		<lib.location>target/lib</lib.location>
 	</properties>
-	
+
 	<dependencyManagement>
 		<dependencies>
 
@@ -134,7 +134,7 @@
 			<dependency>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.main</artifactId>
-				<version>4.4.1</version>
+				<version>5.6.10</version>
 			</dependency>
 
 			<dependency>
@@ -196,7 +196,7 @@
 				<artifactId>org.eclipse.equinox.registry</artifactId>
 				<version>3.5.0.v20100503</version>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>org.eclipse.equinox</groupId>
 				<artifactId>org.eclipse.equinox.supplement</artifactId>
@@ -220,13 +220,13 @@
 				<artifactId>maven-artifact</artifactId>
 				<version>3.3.9</version>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>commons-io</groupId>
 				<artifactId>commons-io</artifactId>
 				<version>2.4</version>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>edu.stanford.protege</groupId>
 				<artifactId>org.protege.xmlcatalog</artifactId>
@@ -242,7 +242,7 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>org.eclipse.jgit</groupId>
 				<artifactId>org.eclipse.jgit</artifactId>
@@ -254,7 +254,7 @@
 				<artifactId>JavaEWAH</artifactId>
 				<version>1.1.6</version>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
@@ -292,7 +292,7 @@
 
 		</dependencies>
 	</dependencyManagement>
-				
+
 	<build>
 		<pluginManagement>
 			<plugins>
@@ -305,7 +305,7 @@
 						<target>1.8</target>
 					</configuration>
 				</plugin>
-							
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
@@ -317,7 +317,7 @@
 						</descriptors>
 					</configuration>
 				</plugin>
-				
+
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
 					<version>2.5.3</version>
@@ -338,20 +338,20 @@
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>2.4.0</version>
+					<version>3.5.0</version>
 					<extensions>true</extensions>
 					<configuration>
-						<instructions>							
+						<instructions>
 							<Bundle-Vendor>The Protege Development Team</Bundle-Vendor>
-							<Embed-Directory>${lib.location}</Embed-Directory>							
+							<Embed-Directory>${lib.location}</Embed-Directory>
 						</instructions>
 					</configuration>
 				</plugin>
 
 			</plugins>
 		</pluginManagement>
 	</build>
-	
+
 	<!-- Generate source and Javadoc JAR files, and sign artifacts.  Required by Sonatype OSSRH for deployment. -->
     <profiles>
 		<profile>
@@ -374,7 +374,7 @@
 							</execution>
 						</executions>
 					</plugin>
-		
+
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
@@ -392,7 +392,7 @@
 							</execution>
 						</executions>
 					</plugin>
-		
+
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
@@ -441,10 +441,10 @@
 			<build>
 				<pluginManagement>
 					<plugins>
-						<!-- Including this plug-in eliminates the "maven-dependency-plugin 
+						<!-- Including this plug-in eliminates the "maven-dependency-plugin
 							(goals "copy-dependencies", "unpack") is not supported by m2e" Eclipse error. -->
 						<!-- See stackoverflow for full discussion: http://stackoverflow.com/q/8706017. -->
-						<!-- This plugin's configuration is used to store Eclipse m2e settings 
+						<!-- This plugin's configuration is used to store Eclipse m2e settings
 							only. It has no influence on the Maven build itself. -->
 						<plugin>
 							<groupId>org.eclipse.m2e</groupId>
@@ -481,7 +481,7 @@
 								</instructions>
 							</configuration>
 						</plugin>
-						<!-- Copy all Maven dependencies so that it is possible to run Protege 
+						<!-- Copy all Maven dependencies so that it is possible to run Protege
 							in Eclipse (PDE + m2e + OSGi Framework launcher). -->
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
@@ -501,7 +501,7 @@
 								<outputDirectory>${project.build.directory}/dependency</outputDirectory>
 							</configuration>
 						</plugin>
-						<!-- Copy plugin.xml where PDE in Eclipse can find it (PDE + m2e + 
+						<!-- Copy plugin.xml where PDE in Eclipse can find it (PDE + m2e +
 							OSGi Framework launcher). -->
 						<plugin>
 							<artifactId>maven-resources-plugin</artifactId>
@@ -527,7 +527,7 @@
 								</execution>
 							</executions>
 						</plugin>
-						<!-- Remove META-INF and plugin.xml from project root, placed there 
+						<!-- Remove META-INF and plugin.xml from project root, placed there
 							when this profile is active. -->
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>

diff --git a/protege-desktop/src/main/env/platform-independent/run.bat b/protege-desktop/src/main/env/platform-independent/run.bat
@@ -1,3 +1,3 @@
 setlocal
 cd /d %~dp0
-java -Xmx${conf.mem.xmx}M -Xms${conf.mem.xms}M -Xss${conf.mem.xss}M ${conf.extra.args} -DentityExpansionLimit=100000000 -Dlogback.configurationFile=conf/logback-win.xml -Dfile.encoding=utf-8 -Dorg.protege.plugin.dir=plugins -classpath bundles/guava.jar;bundles/logback-classic.jar;bundles/logback-core.jar;bundles/slf4j-api.jar;bin/org.apache.felix.main.jar;bin/maven-artifact.jar;bin/protege-launcher.jar org.protege.osgi.framework.Launcher %1
+java -Xmx${conf.mem.xmx}M -Xms${conf.mem.xms}M -Xss${conf.mem.xss}M ${conf.extra.args} -DentityExpansionLimit=100000000 -Dlogback.configurationFile=conf/logback-win.xml -Dfile.encoding=utf-8 --add-modules java.xml.bind -Dorg.protege.plugin.dir=plugins -classpath bundles/guava.jar;bundles/logback-classic.jar;bundles/logback-core.jar;bundles/slf4j-api.jar;bin/org.apache.felix.main.jar;bin/maven-artifact.jar;bin/protege-launcher.jar org.protege.osgi.framework.Launcher %1
diff --git a/protege-desktop/src/main/env/platform-independent/run.sh b/protege-desktop/src/main/env/platform-independent/run.sh
@@ -13,9 +13,7 @@ java -Xmx${conf.mem.xmx}M -Xms${conf.mem.xms}M \
      -Dlogback.configurationFile=conf/logback.xml \
      -DentityExpansionLimit=100000000 \
      -Dfile.encoding=UTF-8 \
+     --add-modules java.xml.bind \
      ${conf.extra.args} \
      -classpath bundles/guava.jar:bundles/logback-classic.jar:bundles/logback-core.jar:bundles/slf4j-api.jar:bin/org.apache.felix.main.jar:bin/maven-artifact.jar:bin/protege-launcher.jar \
      $CMD_OPTIONS org.protege.osgi.framework.Launcher $1
-
-
-