Skip to content

Commit

Permalink
Merge pull request #1 from atmire/dspace-solr-parent-3.5.0.0
Browse files Browse the repository at this point in the history
[DS-1181] Upgrade to solr 3.5.0
  • Loading branch information
mdiggory committed Jun 8, 2012
2 parents 9deabbc + 51566e7 commit 678c279
Show file tree
Hide file tree
Showing 2 changed files with 248 additions and 248 deletions.
276 changes: 138 additions & 138 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,138 +1,138 @@
<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">

<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed
with this work for additional information regarding copyright
ownership. The ASF licenses this file to you under the Apache
License, Version 2.0 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of
the License at 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.
-->

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-pom</artifactId>
<version>10</version>
</parent>

<groupId>org.dspace</groupId>
<artifactId>dspace-solr-parent</artifactId>
<name>Apache Solr Parent POM</name>
<version>3.3.0.1-SNAPSHOT</version>
<description>Apache Solr Parent POM</description>
<url>http://lucene.apache.org/solr</url>
<packaging>pom</packaging>

<issueManagement>
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/SOLR</url>
</issueManagement>


<inceptionYear>2006</inceptionYear>

<licenses>
<license>
<name>Apache 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<scm>
<connection>
scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk
</connection>
<developerConnection>
scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk
</developerConnection>
<url>http://svn.apache.org/viewvc/maven/pom/tags/dspace-solr-parent-3.3.0.0</url>
</scm>

<modules>
<module>webapp</module>
</modules>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.google.code.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.4.0</version>
<configuration>
<header>http://scm.dspace.org/svn/repo/licenses/LICENSE_HEADER</header>
<excludes>
<exclude>src/**</exclude>
</excludes>
<properties />
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
<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">

<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed
with this work for additional information regarding copyright
ownership. The ASF licenses this file to you under the Apache
License, Version 2.0 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of
the License at 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.
-->

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-pom</artifactId>
<version>10</version>
</parent>

<groupId>org.dspace</groupId>
<artifactId>dspace-solr-parent</artifactId>
<name>Apache Solr Parent POM</name>
<version>3.5.0.0</version>
<description>Apache Solr Parent POM</description>
<url>http://lucene.apache.org/solr</url>
<packaging>pom</packaging>

<issueManagement>
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/SOLR</url>
</issueManagement>


<inceptionYear>2006</inceptionYear>

<licenses>
<license>
<name>Apache 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<scm>
<connection>
scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk
</connection>
<developerConnection>
scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk
</developerConnection>
<url>http://svn.apache.org/viewvc/maven/pom/tags/dspace-solr-parent-3.3.0.0</url>
</scm>

<modules>
<module>webapp</module>
</modules>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.google.code.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.4.0</version>
<configuration>
<header>http://scm.dspace.org/svn/repo/licenses/LICENSE_HEADER</header>
<excludes>
<exclude>src/**</exclude>
</excludes>
<properties />
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

0 comments on commit 678c279

Please sign in to comment.