Jetty port switch

pulibrary · Feb 23, 2016 · b3d2946 · b3d2946
1 parent 558ec3c
commit b3d2946
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bin/jetty_wait b/bin/jetty_wait
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-until $(curl --output /dev/null --silent --head --fail http://localhost:8983/solr); do
+until $(curl --output /dev/null --silent --head --fail http://localhost:8980/solr); do
     printf '.'
     sleep 1
 done
diff --git a/circle.yml b/circle.yml
@@ -13,7 +13,7 @@ dependencies:
     - sudo sh bin/ci_kakadu_install.sh
     - RAILS_ENV=development bundle exec rake jetty:unzip
     - bundle exec rake jetty:configure_solr
-    - cd jetty && java -Djetty.port=8983 -Dsolr.solr.home=/home/ubuntu/pomegranate/jetty/solr -XX:MaxPermSize=256m -Xmx512m -jar start.jar:
+    - cd jetty && java -Djetty.port=8980 -Dsolr.solr.home=/home/ubuntu/pomegranate/jetty/solr -XX:MaxPermSize=256m -Xmx512m -jar start.jar:
         background: true
     - bin/jetty_wait
 test:

diff --git a/config/jetty.yml b/config/jetty.yml
@@ -4,7 +4,7 @@ development:
   java_version: ">= 1.7"
 test:
   startup_wait: 60
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8980 %>
   <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
   java_version: ">= 1.7"
 production: