Permalink
Browse files

remove javax.servlet dep that is covered by jetty deps, use latest lo…

…ck_jar
  • Loading branch information...
1 parent 8b9d0c5 commit e54852957d14a3e2614d557434fbd6aca95de567 mguymon committed Oct 16, 2012
Showing with 129 additions and 102 deletions.
  1. +1 −3 Gemfile
  2. +6 −8 Gemfile.lock
  3. +114 −89 Jarfile.lock
  4. +1 −1 VERSION
  5. +7 −1 pom.xml
View
@@ -1,12 +1,10 @@
source "http://rubygems.org"
-gem "lock_jar", "~> 0.6.0"
-gem "thor", "> 0.14.0"
+gem "lock_jar", "~> 0.7.0"
group :development do
gem 'rsolr', "~> 1.0.0"
gem "rspec", "~> 2.11.0"
- gem "bundler", "~> 1.1.4"
gem "jeweler", "~> 1.8.4"
gem 'jruby-openssl'
gem 'yard'
View
@@ -14,10 +14,10 @@ GEM
bouncy-castle-java (>= 1.5.0146.1)
json (1.7.5)
json (1.7.5-java)
- lock_jar (0.6.0)
- naether (~> 0.9.0)
- thor (> 0.14.0)
- naether (0.9.2-java)
+ lock_jar (0.7.0)
+ naether (~> 0.10.0)
+ thor (~> 0.14.6)
+ naether (0.10.0-java)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
@@ -31,18 +31,16 @@ GEM
rspec-expectations (2.11.2)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.2)
- thor (0.16.0)
+ thor (0.14.6)
yard (0.8.2.1)
PLATFORMS
java
DEPENDENCIES
- bundler (~> 1.1.4)
jeweler (~> 1.8.4)
jruby-openssl
- lock_jar (~> 0.6.0)
+ lock_jar (~> 0.7.0)
rsolr (~> 1.0.0)
rspec (~> 2.11.0)
- thor (> 0.14.0)
yard
View
@@ -1,89 +1,114 @@
----
-scopes:
- compile:
- dependencies:
- - pom.xml
- resolved_dependencies:
- - com.tobedevoured.command:core:jar:0.0.1
- - org.modeshape:modeshape-common:jar:2.8.2.Final
- - com.metapossum:metapossum-scanner:jar:1.0.1
- - commons-beanutils:commons-beanutils:jar:1.8.3
- - commons-logging:commons-logging:jar:1.1.1
- - com.typesafe:config:jar:0.5.0
- - org.slf4j:slf4j-api:jar:1.6.6
- - org.eclipse.jetty:jetty-server:jar:8.1.4.v20120524
- - org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016
- - org.eclipse.jetty:jetty-continuation:jar:8.1.4.v20120524
- - org.eclipse.jetty:jetty-http:jar:8.1.4.v20120524
- - org.eclipse.jetty:jetty-io:jar:8.1.4.v20120524
- - org.eclipse.jetty:jetty-jndi:jar:8.1.4.v20120524
- - org.eclipse.jetty.orbit:javax.mail.glassfish:jar:1.4.1.v201005082020
- - org.eclipse.jetty.orbit:javax.activation:jar:1.1.0.v201105071233
- - org.eclipse.jetty:jetty-jmx:jar:8.1.4.v20120524
- - org.eclipse.jetty:jetty-util:jar:8.1.4.v20120524
- - org.eclipse.jetty:jetty-webapp:jar:8.1.4.v20120524
- - org.eclipse.jetty:jetty-xml:jar:8.1.4.v20120524
- - org.eclipse.jetty:jetty-servlet:jar:8.1.4.v20120524
- - org.eclipse.jetty:jetty-security:jar:8.1.4.v20120524
- - org.eclipse.jetty:jetty-plus:jar:8.1.4.v20120524
- - org.eclipse.jetty.orbit:javax.transaction:jar:1.1.1.v201105210645
- - org.eclipse.jetty:jetty-jsp:jar:8.1.4.v20120524
- - org.eclipse.jetty.orbit:javax.servlet.jsp:jar:2.2.0.v201112011158
- - org.eclipse.jetty.orbit:org.apache.jasper.glassfish:jar:2.2.2.v201112011158
- - org.eclipse.jetty.orbit:javax.servlet.jsp.jstl:jar:1.2.0.v201105211821
- - org.eclipse.jetty.orbit:org.apache.taglibs.standard.glassfish:jar:1.2.0.v201112081803
- - org.eclipse.jetty.orbit:javax.el:jar:2.2.0.v201108011116
- - org.eclipse.jetty.orbit:com.sun.el:jar:2.2.0.v201108011116
- - org.eclipse.jetty.orbit:org.eclipse.jdt.core:jar:3.7.1
- - org.eclipse.jdt.core.compiler:ecj:jar:3.7.2
- - org.apache.solr:solr-core:jar:3.6.1
- - org.apache.solr:solr-solrj:jar:3.6.1
- - commons-httpclient:commons-httpclient:jar:3.1
- - org.codehaus.woodstox:wstx-asl:jar:3.2.7
- - org.apache.lucene:lucene-core:jar:3.6.1
- - org.apache.lucene:lucene-analyzers:jar:3.6.1
- - org.apache.lucene:lucene-highlighter:jar:3.6.1
- - org.apache.lucene:lucene-kuromoji:jar:3.6.1
- - org.apache.lucene:lucene-memory:jar:3.6.1
- - org.apache.lucene:lucene-misc:jar:3.6.1
- - org.apache.lucene:lucene-phonetic:jar:3.6.1
- - org.apache.lucene:lucene-queries:jar:3.6.1
- - jakarta-regexp:jakarta-regexp:jar:1.4
- - org.apache.lucene:lucene-spatial:jar:3.6.1
- - org.apache.lucene:lucene-spellchecker:jar:3.6.1
- - org.apache.lucene:lucene-grouping:jar:3.6.1
- - commons-codec:commons-codec:jar:1.6
- - commons-fileupload:commons-fileupload:jar:1.2.1
- - org.slf4j:jcl-over-slf4j:jar:1.6.1
- - commons-io:commons-io:jar:2.1
- - commons-lang:commons-lang:jar:2.6
- - com.google.guava:guava:jar:r05
- - javax.servlet:servlet-api:jar:2.4
- - ch.qos.logback:logback-classic:jar:1.0.6
- - ch.qos.logback:logback-core:jar:1.0.6
- runtime:
- dependencies:
- - pom.xml
- resolved_dependencies: []
-
- test:
- dependencies:
- - pom.xml
- resolved_dependencies:
- - junit:junit:jar:4.10
- - org.hamcrest:hamcrest-core:jar:1.1
- - org.apache.solr:solr-solrj:jar:3.6.1
- - commons-httpclient:commons-httpclient:jar:3.1
- - commons-io:commons-io:jar:2.1
- - org.codehaus.woodstox:wstx-asl:jar:3.2.7
- - org.slf4j:jcl-over-slf4j:jar:1.6.1
- - org.slf4j:slf4j-api:jar:1.6.1
- - org.apache.httpcomponents:httpclient:jar:4.2.1
- - org.apache.httpcomponents:httpcore:jar:4.2.1
- - commons-logging:commons-logging:jar:1.1.1
- - commons-codec:commons-codec:jar:1.6
- - org.apache.httpcomponents:httpmime:jar:4.2.1
-repositories:
- - http://repo1.maven.org/maven2/
- - http://repository.jboss.org/nexus/content/groups/public-jboss
- - https://oss.sonatype.org/content/groups/public
+---
+version: 0.7.0
+groups:
+ default:
+ dependencies:
+ - ch.qos.logback:logback-classic:jar:1.0.6
+ - ch.qos.logback:logback-core:jar:1.0.6
+ - com.google.guava:guava:jar:r05
+ - com.metapossum:metapossum-scanner:jar:1.0.1
+ - com.tobedevoured.command:core:jar:0.0.1
+ - com.typesafe:config:jar:0.5.0
+ - commons-beanutils:commons-beanutils:jar:1.8.3
+ - commons-codec:commons-codec:jar:1.6
+ - commons-fileupload:commons-fileupload:jar:1.2.1
+ - commons-httpclient:commons-httpclient:jar:3.1
+ - commons-io:commons-io:jar:2.1
+ - commons-lang:commons-lang:jar:2.6
+ - commons-logging:commons-logging:jar:1.1.1
+ - jakarta-regexp:jakarta-regexp:jar:1.4
+ - org.apache.lucene:lucene-analyzers:jar:3.6.1
+ - org.apache.lucene:lucene-core:jar:3.6.1
+ - org.apache.lucene:lucene-grouping:jar:3.6.1
+ - org.apache.lucene:lucene-highlighter:jar:3.6.1
+ - org.apache.lucene:lucene-kuromoji:jar:3.6.1
+ - org.apache.lucene:lucene-memory:jar:3.6.1
+ - org.apache.lucene:lucene-misc:jar:3.6.1
+ - org.apache.lucene:lucene-phonetic:jar:3.6.1
+ - org.apache.lucene:lucene-queries:jar:3.6.1
+ - org.apache.lucene:lucene-spatial:jar:3.6.1
+ - org.apache.lucene:lucene-spellchecker:jar:3.6.1
+ - org.apache.solr:solr-core:jar:3.6.1
+ - org.apache.solr:solr-solrj:jar:3.6.1
+ - org.codehaus.woodstox:wstx-asl:jar:3.2.7
+ - org.eclipse.jdt.core.compiler:ecj:jar:3.7.2
+ - org.eclipse.jetty.orbit:com.sun.el:jar:2.2.0.v201108011116
+ - org.eclipse.jetty.orbit:javax.activation:jar:1.1.0.v201105071233
+ - org.eclipse.jetty.orbit:javax.el:jar:2.2.0.v201108011116
+ - org.eclipse.jetty.orbit:javax.mail.glassfish:jar:1.4.1.v201005082020
+ - org.eclipse.jetty.orbit:javax.servlet.jsp.jstl:jar:1.2.0.v201105211821
+ - org.eclipse.jetty.orbit:javax.servlet.jsp:jar:2.2.0.v201112011158
+ - org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016
+ - org.eclipse.jetty.orbit:javax.transaction:jar:1.1.1.v201105210645
+ - org.eclipse.jetty.orbit:org.apache.jasper.glassfish:jar:2.2.2.v201112011158
+ - org.eclipse.jetty.orbit:org.apache.taglibs.standard.glassfish:jar:1.2.0.v201112081803
+ - org.eclipse.jetty.orbit:org.eclipse.jdt.core:jar:3.7.1
+ - org.eclipse.jetty:jetty-continuation:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-http:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-io:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-jmx:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-jndi:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-jsp:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-plus:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-security:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-server:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-servlet:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-util:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-webapp:jar:8.1.4.v20120524
+ - org.eclipse.jetty:jetty-xml:jar:8.1.4.v20120524
+ - org.modeshape:modeshape-common:jar:2.8.2.Final
+ - org.slf4j:jcl-over-slf4j:jar:1.6.1
+ - org.slf4j:slf4j-api:jar:1.6.6
+ artifacts:
+ - pom:pom.xml:
+ scopes:
+ - runtime
+ - compile
+ transitive:
+ commons-beanutils:commons-beanutils:jar:1.8.3:
+ commons-logging:commons-logging:jar:1.1.1: {}
+ com.typesafe:config:jar:0.5.0: {}
+ com.metapossum:metapossum-scanner:jar:1.0.1: {}
+ org.slf4j:slf4j-api:jar:1.6.6: {}
+ org.modeshape:modeshape-common:jar:2.8.2.Final: {}
+ org.eclipse.jetty:jetty-continuation:jar:8.1.4.v20120524: {}
+ org.eclipse.jetty:jetty-http:jar:8.1.4.v20120524:
+ org.eclipse.jetty:jetty-io:jar:8.1.4.v20120524: {}
+ org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016: {}
+ org.eclipse.jetty.orbit:javax.mail.glassfish:jar:1.4.1.v201005082020:
+ org.eclipse.jetty.orbit:javax.activation:jar:1.1.0.v201105071233: {}
+ org.eclipse.jetty:jetty-util:jar:8.1.4.v20120524: {}
+ org.eclipse.jetty:jetty-xml:jar:8.1.4.v20120524: {}
+ org.eclipse.jetty:jetty-servlet:jar:8.1.4.v20120524:
+ org.eclipse.jetty:jetty-security:jar:8.1.4.v20120524: {}
+ org.eclipse.jetty.orbit:javax.transaction:jar:1.1.1.v201105210645: {}
+ org.eclipse.jetty.orbit:javax.el:jar:2.2.0.v201108011116: {}
+ org.eclipse.jetty.orbit:javax.servlet.jsp.jstl:jar:1.2.0.v201105211821: {}
+ org.eclipse.jetty.orbit:org.apache.taglibs.standard.glassfish:jar:1.2.0.v201112081803: {}
+ org.eclipse.jetty.orbit:com.sun.el:jar:2.2.0.v201108011116: {}
+ org.eclipse.jetty.orbit:org.eclipse.jdt.core:jar:3.7.1: {}
+ org.eclipse.jetty.orbit:org.apache.jasper.glassfish:jar:2.2.2.v201112011158: {}
+ org.eclipse.jetty.orbit:javax.servlet.jsp:jar:2.2.0.v201112011158: {}
+ org.apache.lucene:lucene-phonetic:jar:3.6.1: {}
+ org.apache.lucene:lucene-misc:jar:3.6.1: {}
+ org.apache.lucene:lucene-core:jar:3.6.1: {}
+ org.apache.lucene:lucene-grouping:jar:3.6.1: {}
+ org.apache.lucene:lucene-memory:jar:3.6.1: {}
+ org.apache.lucene:lucene-analyzers:jar:3.6.1: {}
+ commons-lang:commons-lang:jar:2.6: {}
+ commons-fileupload:commons-fileupload:jar:1.2.1: {}
+ org.apache.lucene:lucene-spatial:jar:3.6.1: {}
+ org.apache.lucene:lucene-spellchecker:jar:3.6.1: {}
+ org.slf4j:jcl-over-slf4j:jar:1.6.1: {}
+ org.apache.lucene:lucene-queries:jar:3.6.1:
+ jakarta-regexp:jakarta-regexp:jar:1.4: {}
+ com.google.guava:guava:jar:r05: {}
+ commons-io:commons-io:jar:2.1: {}
+ commons-codec:commons-codec:jar:1.6: {}
+ org.apache.lucene:lucene-highlighter:jar:3.6.1: {}
+ org.apache.solr:solr-solrj:jar:3.6.1:
+ org.codehaus.woodstox:wstx-asl:jar:3.2.7: {}
+ commons-httpclient:commons-httpclient:jar:3.1: {}
+ org.apache.lucene:lucene-kuromoji:jar:3.6.1: {}
+ ch.qos.logback:logback-core:jar:1.0.6: {}
+...
View
@@ -1 +1 @@
-0.0.7
+0.1.0
View
@@ -4,7 +4,7 @@
<groupId>com.tobedevoured</groupId>
<artifactId>solr_sail</artifactId>
- <version>0.0.6</version>
+ <version>0.1.0</version>
<packaging>jar</packaging>
<name>Solr Sail</name>
@@ -108,6 +108,12 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>3.6.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Logging -->

0 comments on commit e548529

Please sign in to comment.