Author: ilgrosso
Date: Sat Jan 26 14:25:49 2013
New Revision: 1438898
URL: http://svn.apache.org/viewvc?rev=1438898&view=rev
Log:
Updating various dependencies and plugins (including upgrade to Solr 4.1)
Modified:
cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml
cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
cocoon/cocoon3/trunk/cocoon-optional/solr/conf/schema.xml
cocoon/cocoon3/trunk/cocoon-optional/solr/conf/solrconfig.xml
cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumer.java
cocoon/cocoon3/trunk/parent/pom.xml
cocoon/cocoon3/trunk/pom.xml
Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml?rev=1438898&r1=1438897&r2=1438898&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/pom.xml Sat Jan 26 14:25:49 2013
@@ -29,9 +29,9 @@
<!-- FIXME this props should come from the parent! -->
<properties>
<cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
- <spring.version>3.1.3.RELEASE</spring.version>
+ <spring.version>3.2.1.RELEASE</spring.version>
- <logback.version>1.0.7</logback.version>
+ <logback.version>1.0.9</logback.version>
<slf4j.version>1.7.2</slf4j.version>
</properties>
Modified: cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml?rev=1438898&r1=1438897&r2=1438898&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-parent/src/main/resources/archetype-resources/pom.xml Sat Jan 26 14:25:49 2013
@@ -34,9 +34,9 @@
<properties>
<cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
- <spring.version>3.1.3.RELEASE</spring.version>
+ <spring.version>3.2.1.RELEASE</spring.version>
- <logback.version>1.0.7</logback.version>
+ <logback.version>1.0.9</logback.version>
<slf4j.version>1.7.2</slf4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -147,17 +147,17 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.14</version>
+ <version>1.17</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.14</version>
+ <version>1.17</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.14</version>
+ <version>1.17</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -212,22 +212,22 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
- <version>2.6.0</version>
+ <version>2.6.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.16</version>
+ <version>1.9.17</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>ST4</artifactId>
- <version>4.0.4</version>
+ <version>4.0.7</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>3.6.1</version>
+ <version>4.1.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -242,7 +242,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- <version>3.6.1</version>
+ <version>4.1.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -266,13 +266,13 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>6.3.0</version>
+ <version>6.5.0</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>6.3.0</version>
+ <version>6.5.0</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -405,7 +405,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -448,7 +448,7 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
+ <version>1.2</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -467,7 +467,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.0</version>
<configuration>
<source>${javac.src.version}</source>
<target>${javac.target.version}</target>
@@ -485,7 +485,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -539,7 +539,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -548,12 +548,12 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.2</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -568,17 +568,17 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml?rev=1438898&r1=1438897&r2=1438898&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml Sat Jan 26 14:25:49 2013
@@ -36,7 +36,7 @@
<cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
- <logback.version>1.0.7</logback.version>
+ <logback.version>1.0.9</logback.version>
<slf4j.version>1.7.2</slf4j.version>
</properties>
@@ -75,7 +75,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
@@ -103,17 +103,17 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.14</version>
+ <version>1.17</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.14</version>
+ <version>1.17</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.14</version>
+ <version>1.17</version>
</dependency>
<!-- Logging dependencies -->
Modified: cocoon/cocoon3/trunk/cocoon-optional/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/solr/conf/schema.xml?rev=1438898&r1=1438897&r2=1438898&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/solr/conf/schema.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/solr/conf/schema.xml Sat Jan 26 14:25:49 2013
@@ -15,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<schema name="example" version="1.1">
<types>
@@ -42,7 +41,7 @@
/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
+ <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
</analyzer>
<analyzer type="query">
@@ -51,28 +50,28 @@
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
+ <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
</analyzer>
</fieldType>
- </types>
+ </types>
- <fields>
- <field name="id" type="integer" indexed="true" stored="true" required="true" />
- <field name="title" type="text" indexed="true" stored="true" />
- <field name="content" type="text" indexed="true" stored="true" />
- </fields>
-
- <!-- Field to use to determine and enforce document uniqueness.
- Unless this field is marked with required="false", it will be a required field
- -->
- <uniqueKey>id</uniqueKey>
+ <fields>
+ <field name="id" type="integer" indexed="true" stored="true" required="true" />
+ <field name="title" type="text" indexed="true" stored="true" />
+ <field name="content" type="text" indexed="true" stored="true" />
+ </fields>
+
+ <!-- Field to use to determine and enforce document uniqueness.
+ Unless this field is marked with required="false", it will be a required field
+ -->
+ <uniqueKey>id</uniqueKey>
- <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <defaultSearchField>content</defaultSearchField>
+ <!-- field for the QueryParser to use when an explicit fieldname is absent -->
+ <defaultSearchField>content</defaultSearchField>
- <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
+ <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
+ <solrQueryParser defaultOperator="OR"/>
</schema>
Modified: cocoon/cocoon3/trunk/cocoon-optional/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/solr/conf/solrconfig.xml?rev=1438898&r1=1438897&r2=1438898&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/solr/conf/solrconfig.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/solr/conf/solrconfig.xml Sat Jan 26 14:25:49 2013
@@ -22,8 +22,10 @@
<!-- must specify a data directory -->
<dataDir>target/solr</dataDir>
+ <luceneMatchVersion>LUCENE_41</luceneMatchVersion>
- <indexDefaults>
+ <indexConfig>
+<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
<useCompoundFile>false</useCompoundFile>
@@ -47,7 +49,6 @@
<lockType>single</lockType>
</indexDefaults>
- <mainIndex>
<!-- options specific to the main on-disk lucene index -->
<useCompoundFile>false</useCompoundFile>
<ramBufferSizeMB>32</ramBufferSizeMB>
@@ -91,9 +92,8 @@
<str name="maxCommitAge">1DAY</str>
-->
</deletionPolicy>
-
- </mainIndex>
-
+ </indexConfig>
+
<jmx />
<!-- the default high-performance update handler -->
@@ -109,8 +109,8 @@
<query>
<!-- Maximum number of clauses in a boolean query... can affect
- range or prefix queries that expand to big boolean
- queries. An exception is thrown if exceeded. -->
+ range or prefix queries that expand to big boolean
+ queries. An exception is thrown if exceeded. -->
<maxBooleanClauses>1024</maxBooleanClauses>
<filterCache
@@ -133,57 +133,60 @@
<enableLazyFieldLoading>true</enableLazyFieldLoading>
- <!-- An optimization for use with the queryResultCache. When a search
- is requested, a superset of the requested number of document ids
- are collected. For example, if a search for a particular query
- requests matching documents 10 through 19, and queryWindowSize is 50,
- then documents 0 through 49 will be collected and cached. Any further
- requests in that range can be satisfied via the cache. -->
+ <!-- An optimization for use with the queryResultCache. When a search
+ is requested, a superset of the requested number of document ids
+ are collected. For example, if a search for a particular query
+ requests matching documents 10 through 19, and queryWindowSize is 50,
+ then documents 0 through 49 will be collected and cached. Any further
+ requests in that range can be satisfied via the cache. -->
<queryResultWindowSize>50</queryResultWindowSize>
<!-- Maximum number of documents to cache for any entry in the
- queryResultCache. -->
+ queryResultCache. -->
<queryResultMaxDocsCached>200</queryResultMaxDocsCached>
<!-- This entry enables an int hash representation for filters (DocSets)
- when the number of items in the set is less than maxSize. For smaller
- sets, this representation is more memory efficient, more efficient to
- iterate over, and faster to take intersections. -->
+ when the number of items in the set is less than maxSize. For smaller
+ sets, this representation is more memory efficient, more efficient to
+ iterate over, and faster to take intersections. -->
<HashDocSet maxSize="3000" loadFactor="0.75"/>
<!-- If a search request comes in and there is no current registered searcher,
- then immediately register the still warming searcher and use it. If
- "false" then all requests will block until the first searcher is done
- warming. -->
+ then immediately register the still warming searcher and use it. If
+ "false" then all requests will block until the first searcher is done
+ warming. -->
<useColdSearcher>false</useColdSearcher>
<!-- Maximum number of searchers that may be warming in the background
- concurrently. An error is returned if this limit is exceeded. Recommend
- 1-2 for read-only slaves, higher for masters w/o cache warming. -->
+ concurrently. An error is returned if this limit is exceeded. Recommend
+ 1-2 for read-only slaves, higher for masters w/o cache warming. -->
<maxWarmingSearchers>2</maxWarmingSearchers>
</query>
<!--
- Let the dispatch filter handler /select?qt=XXX
- handleSelect=true will use consistent error handling for /select and /update
- handleSelect=false will use solr1.1 style error formatting
- -->
+ Let the dispatch filter handler /select?qt=XXX
+ handleSelect=true will use consistent error handling for /select and /update
+ handleSelect=false will use solr1.1 style error formatting
+ -->
<requestDispatcher handleSelect="true" />
<requestHandler name="standard" class="solr.SearchHandler" default="true">
<!-- default values for query parameters -->
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- <!--
- <int name="rows">10</int>
- <str name="fl">*</str>
- <str name="version">2.1</str>
- -->
- </lst>
+ <lst name="defaults">
+ <str name="echoParams">explicit</str>
+ <!--
+ <int name="rows">10</int>
+ <str name="fl">*</str>
+ <str name="version">2.1</str>
+ -->
+ </lst>
+ <shardHandlerFactory class="HttpShardHandlerFactory">
+ <int name="socketTimeOut">1000</int>
+ <int name="connTimeOut">5000</int>
+ </shardHandlerFactory>
</requestHandler>
-
<requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
<requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumer.java?rev=1438898&r1=1438897&r2=1438898&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumer.java Sat Jan 26 14:25:49 2013
@@ -19,11 +19,10 @@
package org.apache.cocoon.optional.pipeline.components.sax.solr;
import java.net.MalformedURLException;
-
import org.apache.cocoon.pipeline.ProcessingException;
import org.apache.cocoon.sax.AbstractSAXTransformer;
import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.StrUtils;
import org.xml.sax.Attributes;
@@ -31,89 +30,88 @@ import org.xml.sax.SAXException;
public class SolrConsumer extends AbstractSAXTransformer {
- private static final String FIELD = "field";
+ private static final String FIELD = "field";
- private static final String NAME = "name";
+ private static final String NAME = "name";
- private static final String BOOST = "boost";
+ private static final String BOOST = "boost";
- private static final String NULL = "null";
+ private static final String NULL = "null";
- private static final String DOC = "doc";
+ private static final String DOC = "doc";
- private static final String DOCS = "docs";
+ private static final String DOCS = "docs";
- private SolrServer solr = null;
+ private SolrServer solr = null;
- private boolean isNull = false;
+ private boolean isNull = false;
- private SolrInputDocument doc = new SolrInputDocument();
+ private SolrInputDocument doc = new SolrInputDocument();
- private float boost = 1.0f;
+ private float boost = 1.0f;
- private String name = null;
+ private String name = null;
- private StringBuilder text = new StringBuilder();
+ private StringBuilder text = new StringBuilder();
- public SolrConsumer(String url) throws MalformedURLException {
- this.solr = new CommonsHttpSolrServer(url);
- }
+ public SolrConsumer(String url) throws MalformedURLException {
+ this.solr = new HttpSolrServer(url);
+ }
- public SolrConsumer(SolrServer server) {
- this.solr = server;
- }
+ public SolrConsumer(SolrServer server) {
+ this.solr = server;
+ }
- @Override
- public void characters(char[] ch, int start, int length) throws SAXException {
- this.text.append(ch, start, length);
- this.getSAXConsumer().characters(ch, start, length);
- }
+ @Override
+ public void characters(char[] ch, int start, int length) throws SAXException {
+ this.text.append(ch, start, length);
+ this.getSAXConsumer().characters(ch, start, length);
+ }
+
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
+ if (FIELD.equals(localName)) {
+ this.text = new StringBuilder();
+ this.boost = 1.0f;
+
+ if (atts.getValue(NAME) != null) {
+ this.name = atts.getValue(NAME);
+ }
- @Override
- public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
- if (FIELD.equals(localName)) {
- this.text = new StringBuilder();
- this.boost = 1.0f;
-
- if (atts.getValue(NAME) != null) {
- this.name = atts.getValue(NAME);
- }
-
- if (atts.getValue(BOOST) != null) {
- this.boost = Float.parseFloat(atts.getValue(BOOST));
- }
-
- if (atts.getValue(NULL) != null) {
- this.isNull = StrUtils.parseBoolean(atts.getValue(NULL));
- }
- }
+ if (atts.getValue(BOOST) != null) {
+ this.boost = Float.parseFloat(atts.getValue(BOOST));
+ }
- this.getSAXConsumer().startElement(uri, localName, qName, atts);
+ if (atts.getValue(NULL) != null) {
+ this.isNull = StrUtils.parseBoolean(atts.getValue(NULL));
+ }
}
- @Override
- public void endElement(String uri, String localName, String qName) throws SAXException {
- if (DOCS.equals(localName)) {
- try {
- this.solr.commit();
- } catch (Exception e) {
- throw new ProcessingException("Unable to commit the Solr documents.", e);
- }
- } else if (DOC.equals(localName)) {
- try {
- this.solr.add(this.doc);
- this.doc = new SolrInputDocument();
- } catch (Exception e) {
- throw new ProcessingException("Unable to add the Solr document.", e);
- }
- } else if (FIELD.equals(localName)) {
- if (!this.isNull && this.text.length() > 0) {
- this.doc.addField(this.name, this.text.toString(), this.boost);
- this.boost = 1.0f;
- }
- }
+ this.getSAXConsumer().startElement(uri, localName, qName, atts);
+ }
- this.getSAXConsumer().endElement(uri, localName, qName);
+ @Override
+ public void endElement(String uri, String localName, String qName) throws SAXException {
+ if (DOCS.equals(localName)) {
+ try {
+ this.solr.commit();
+ } catch (Exception e) {
+ throw new ProcessingException("Unable to commit the Solr documents.", e);
+ }
+ } else if (DOC.equals(localName)) {
+ try {
+ this.solr.add(this.doc);
+ this.doc = new SolrInputDocument();
+ } catch (Exception e) {
+ throw new ProcessingException("Unable to add the Solr document.", e);
+ }
+ } else if (FIELD.equals(localName)) {
+ if (!this.isNull && this.text.length() > 0) {
+ this.doc.addField(this.name, this.text.toString(), this.boost);
+ this.boost = 1.0f;
+ }
}
+ this.getSAXConsumer().endElement(uri, localName, qName);
+ }
}
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1438898&r1=1438897&r2=1438898&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Sat Jan 26 14:25:49 2013
@@ -59,9 +59,9 @@
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
<implementation.build>${scmBranch}@r${buildNumber}; ${maven.build.timestamp}</implementation.build>
- <spring.version>3.1.3.RELEASE</spring.version>
+ <spring.version>3.2.1.RELEASE</spring.version>
- <logback.version>1.0.7</logback.version>
+ <logback.version>1.0.9</logback.version>
<slf4j.version>1.7.2</slf4j.version>
<!-- docs properties -->
@@ -302,17 +302,17 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.14</version>
+ <version>1.17</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.14</version>
+ <version>1.17</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.14</version>
+ <version>1.17</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -367,22 +367,22 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
- <version>2.6.0</version>
+ <version>2.6.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.16</version>
+ <version>1.9.17</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>ST4</artifactId>
- <version>4.0.4</version>
+ <version>4.0.7</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- <version>3.6.1</version>
+ <version>4.1.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -401,7 +401,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>3.6.1</version>
+ <version>4.1.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -426,13 +426,13 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>6.3.0</version>
+ <version>6.5.0</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>6.3.0</version>
+ <version>6.5.0</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -448,7 +448,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
@@ -607,7 +607,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -670,7 +670,9 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -690,7 +692,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.0</version>
<configuration>
<source>${javac.src.version}</source>
<target>${javac.target.version}</target>
@@ -709,7 +711,9 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -860,14 +864,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<configuration>
<locales>en</locales>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.7.1</version>
+ <version>2.8</version>
<reportSets>
<reportSet>
<reports>
@@ -879,7 +883,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.9</version>
<reportSets>
<reportSet>
<reports>
@@ -914,7 +918,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -923,12 +927,12 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -943,12 +947,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>1.3.1</version>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -973,7 +977,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.2</version>
+ <version>2.13</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
@@ -1235,7 +1239,7 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1260,7 +1264,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.9</version>
</plugin>
</plugins>
</reporting>
Modified: cocoon/cocoon3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/pom.xml?rev=1438898&r1=1438897&r2=1438898&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/pom.xml (original)
+++ cocoon/cocoon3/trunk/pom.xml Sat Jan 26 14:25:49 2013
@@ -10,13 +10,13 @@
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- $Id$ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -73,15 +73,15 @@
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.2.2</version>
- <configuration>
- <mavenExecutorId>forked-path</mavenExecutorId>
- <useReleaseProfile>false</useReleaseProfile>
- <goals>deploy</goals>
- <tagBase>https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/${project.artifactId}</tagBase>
- <arguments>-Papache-release</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
+ <version>2.4</version>
+ <configuration>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy</goals>
+ <tagBase>https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/${project.artifactId}</tagBase>
+ <arguments>-Papache-release</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -96,7 +96,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</extension>
</extensions>
</build>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.