ANY23-322 Any23 embedded service is broken
authorLewis John McGibbney <lewis.mcgibbney@gmail.com>
Wed, 18 Apr 2018 20:10:04 +0000 (13:10 -0700)
committerLewis John McGibbney <lewis.mcgibbney@gmail.com>
Wed, 18 Apr 2018 20:10:04 +0000 (13:10 -0700)
service/pom.xml
service/src/main/assembly/README.txt
service/src/main/assembly/server-embedded.xml
service/src/main/bin/any23server
service/src/main/bin/any23server.bat

index 5f8947a..0555bc4 100644 (file)
@@ -33,7 +33,7 @@
 
   <properties>
     <!-- the following property is used in the bash script as well, don't remove it! -->
 
   <properties>
     <!-- the following property is used in the bash script as well, don't remove it! -->
-    <jetty.runner.version>8.1.16.v20140903</jetty.runner.version>
+    <jetty.runner.version>9.4.10.RC0</jetty.runner.version>
     <output.directory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib/apache-any23-openie</output.directory>
   </properties>
 
     <output.directory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib/apache-any23-openie</output.directory>
   </properties>
 
@@ -93,7 +93,7 @@
 
     <!-- BEGIN: Jetty Deps. -->
     <dependency>
 
     <!-- BEGIN: Jetty Deps. -->
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-runner</artifactId>
       <version>${jetty.runner.version}</version>
       <scope>provided</scope>
       <artifactId>jetty-runner</artifactId>
       <version>${jetty.runner.version}</version>
       <scope>provided</scope>
   <build>
     <plugins>
       <plugin>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>8.1.16.v20140903</version>
+        <version>${jetty.runner.version}</version>
         <configuration>
           <webAppConfig>
             <contextPath>/${project.artifactId}</contextPath>
         <configuration>
           <webAppConfig>
             <contextPath>/${project.artifactId}</contextPath>
index 51f3d7d..0a54677 100644 (file)
@@ -62,7 +62,7 @@ Apache Any23 Service ${project.version} (${implementation.build.tstamp})
 
   4) Optional: In the same dialog, add the EXTRA_JVM_ARGUMENTS environment variable in the user variables to specify
         JVM properties, e.g. the value -Xms256m -Xmx512m. This environment variable can be used to supply extra options.
 
   4) Optional: In the same dialog, add the EXTRA_JVM_ARGUMENTS environment variable in the user variables to specify
         JVM properties, e.g. the value -Xms256m -Xmx512m. This environment variable can be used to supply extra options.
-        By default, it is set to: -Xms500m -Xmx500m -XX:PermSize=128m -XX:-UseGCOverheadLimit
+        By default, it is set to: -Xms500m -Xmx500m -XX:-UseGCOverheadLimit
 
   5) In the same dialog, update/create the Path environment variable in the user variables and prepend the value
         %ANY23% to add Apache Any23 available in the command line.
 
   5) In the same dialog, update/create the Path environment variable in the user variables and prepend the value
         %ANY23% to add Apache Any23 available in the command line.
index f93c2e3..6cd2b0c 100644 (file)
@@ -78,7 +78,7 @@
       <outputDirectory>/lib</outputDirectory>
       <scope>provided</scope>
       <includes>
       <outputDirectory>/lib</outputDirectory>
       <scope>provided</scope>
       <includes>
-        <include>org.mortbay.jetty:jetty-runner</include>
+        <include>org.eclipse.jetty:jetty-runner</include>
       </includes>
     </dependencySet>
   </dependencySets>
       </includes>
     </dependencySet>
   </dependencySets>
index edaa6bf..eb15488 100755 (executable)
@@ -73,7 +73,7 @@ then
   REPO="$BASEDIR"/lib
 fi
 
   REPO="$BASEDIR"/lib
 fi
 
-EXTRA_JVM_ARGUMENTS="-Xms500m -Xmx500m -XX:PermSize=128m -XX:-UseGCOverheadLimit"
+EXTRA_JVM_ARGUMENTS="-Xms500m -Xmx500m -XX:-UseGCOverheadLimit"
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
index c35048b..7362704 100644 (file)
@@ -70,7 +70,7 @@ if "%JAVACMD%"=="" set JAVACMD=java
 
 if "%REPO%"=="" set REPO=%BASEDIR%\lib
 
 
 if "%REPO%"=="" set REPO=%BASEDIR%\lib
 
-set EXTRA_JVM_ARGUMENTS=-Xms500m -Xmx500m -XX:PermSize=128m -XX:-UseGCOverheadLimit
+set EXTRA_JVM_ARGUMENTS=-Xms500m -Xmx500m -XX:-UseGCOverheadLimit
 goto endInit
 
 @REM Reaching here means variables are defined and arguments have been captured
 goto endInit
 
 @REM Reaching here means variables are defined and arguments have been captured