You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by le...@apache.org on 2018/04/19 19:01:59 UTC
any23 git commit: ANY23-322 Any23 embedded service is broken
Repository: any23
Updated Branches:
refs/heads/master f9be73609 -> c271cdb33
ANY23-322 Any23 embedded service is broken
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/c271cdb3
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/c271cdb3
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/c271cdb3
Branch: refs/heads/master
Commit: c271cdb33855f1d9e35c89e39e61df5216449952
Parents: f9be736
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Wed Apr 18 13:10:04 2018 -0700
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Wed Apr 18 13:10:04 2018 -0700
----------------------------------------------------------------------
service/pom.xml | 8 ++++----
service/src/main/assembly/README.txt | 2 +-
service/src/main/assembly/server-embedded.xml | 2 +-
service/src/main/bin/any23server | 2 +-
service/src/main/bin/any23server.bat | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/c271cdb3/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index 5f8947a..0555bc4 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -33,7 +33,7 @@
<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>
@@ -93,7 +93,7 @@
<!-- 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>
@@ -114,9 +114,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>8.1.16.v20140903</version>
+ <version>${jetty.runner.version}</version>
<configuration>
<webAppConfig>
<contextPath>/${project.artifactId}</contextPath>
http://git-wip-us.apache.org/repos/asf/any23/blob/c271cdb3/service/src/main/assembly/README.txt
----------------------------------------------------------------------
diff --git a/service/src/main/assembly/README.txt b/service/src/main/assembly/README.txt
index 51f3d7d..0a54677 100644
--- a/service/src/main/assembly/README.txt
+++ b/service/src/main/assembly/README.txt
@@ -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.
- 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.
http://git-wip-us.apache.org/repos/asf/any23/blob/c271cdb3/service/src/main/assembly/server-embedded.xml
----------------------------------------------------------------------
diff --git a/service/src/main/assembly/server-embedded.xml b/service/src/main/assembly/server-embedded.xml
index f93c2e3..6cd2b0c 100644
--- a/service/src/main/assembly/server-embedded.xml
+++ b/service/src/main/assembly/server-embedded.xml
@@ -78,7 +78,7 @@
<outputDirectory>/lib</outputDirectory>
<scope>provided</scope>
<includes>
- <include>org.mortbay.jetty:jetty-runner</include>
+ <include>org.eclipse.jetty:jetty-runner</include>
</includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/any23/blob/c271cdb3/service/src/main/bin/any23server
----------------------------------------------------------------------
diff --git a/service/src/main/bin/any23server b/service/src/main/bin/any23server
index edaa6bf..eb15488 100755
--- a/service/src/main/bin/any23server
+++ b/service/src/main/bin/any23server
@@ -73,7 +73,7 @@ then
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
http://git-wip-us.apache.org/repos/asf/any23/blob/c271cdb3/service/src/main/bin/any23server.bat
----------------------------------------------------------------------
diff --git a/service/src/main/bin/any23server.bat b/service/src/main/bin/any23server.bat
index c35048b..7362704 100644
--- a/service/src/main/bin/any23server.bat
+++ b/service/src/main/bin/any23server.bat
@@ -70,7 +70,7 @@ if "%JAVACMD%"=="" set JAVACMD=java
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