[dryad] r5720 committed - rollback non-compiling change r5719 in preparation for github move

0 views
Skip to first unread message

dr...@googlecode.com

unread,
Oct 2, 2012, 10:19:57 PM10/2/12
to dryad-...@googlegroups.com
Revision: 5720
Author: rscherle
Date: Tue Oct 2 19:19:39 2012
Log: rollback non-compiling change r5719 in preparation for github move

http://code.google.com/p/dryad/source/detail?r=5720

Modified:
/trunk/dryad/dspace/modules/api/pom.xml
/trunk/dryad/dspace/modules/xmlui/pom.xml
/trunk/dryad/dspace/pom.xml
/trunk/dryad/dspace/solr/solr.xml
/trunk/dryad/dspace/src/assemble/assembly.xml

=======================================
--- /trunk/dryad/dspace/modules/api/pom.xml Tue Oct 2 13:59:36 2012
+++ /trunk/dryad/dspace/modules/api/pom.xml Tue Oct 2 19:19:39 2012
@@ -127,26 +127,6 @@
<version>4.21</version>
</dependency>

- <dependency>
- <groupId>com.atmire</groupId>
- <artifactId>atmire-responselogging-api</artifactId>
- <version>1.10.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.dspace</groupId>
- <artifactId>dspace-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>

</project>
=======================================
--- /trunk/dryad/dspace/modules/xmlui/pom.xml Tue Oct 2 13:59:36 2012
+++ /trunk/dryad/dspace/modules/xmlui/pom.xml Tue Oct 2 19:19:39 2012
@@ -16,22 +16,6 @@
<version>1.7.2</version>
</parent>

- <repositories>
- <repository>
- <id>atmire.com-releases</id>
- <name>atmire.com-releases</name>
- <url>https://atmire.com/artifactory/atmire.com-releases</url>
- <releases>
- <enabled>true</enabled>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- </repository>
- </repositories>

<scm>

<connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/tags/dspace-1.7.2</connection>
@@ -287,51 +271,6 @@
<version>1.0.3</version>
</dependency>

- <dependency>
- <groupId>com.atmire</groupId>
- <artifactId>atmire-responselogging-api</artifactId>
- <version>1.10.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.atmire</groupId>
- <artifactId>atmire-responselogging-xmlui</artifactId>
- <version>1.10.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.dspace</groupId>
- <artifactId>dspace-api</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.dspace</groupId>
- <artifactId>dspace-stats</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.dspace</groupId>
- <artifactId>dspace-xmlui-api</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.dspace</groupId>
- <artifactId>dspace-xmlui-wing</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
-
- </exclusions>
-
- </dependency>
-
</dependencies>

</project>
=======================================
--- /trunk/dryad/dspace/pom.xml Tue Oct 2 13:59:36 2012
+++ /trunk/dryad/dspace/pom.xml Tue Oct 2 19:19:39 2012
@@ -653,35 +653,6 @@

<build>
<plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.atmire</groupId>
-
<artifactId>atmire-responselogging-common</artifactId>
- <version>1.10.0</version>
- <type>jar</type>
- <overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/atmire-modules</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>true</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<!-- overall project assembly -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -812,12 +783,6 @@
<version>${pom.version}</version>
</dependency>

- <dependency>
- <groupId>com.atmire</groupId>
- <artifactId>atmire-responselogging-api</artifactId>
- <version>1.10.0</version>
- </dependency>
-
</dependencies>


=======================================
--- /trunk/dryad/dspace/solr/solr.xml Tue Oct 2 13:59:36 2012
+++ /trunk/dryad/dspace/solr/solr.xml Tue Oct 2 19:19:39 2012
@@ -34,7 +34,6 @@
<core name="dryad" instanceDir="dryad/" dataDir="data"/>
<core name="authority" instanceDir="authority" />
<core name="dataoneMNlog" instanceDir="dataoneMNlog" />
- <core name="responselogging" instanceDir="responselogging" />
</cores>

</solr>
=======================================
--- /trunk/dryad/dspace/src/assemble/assembly.xml Tue Oct 2 13:59:36 2012
+++ /trunk/dryad/dspace/src/assemble/assembly.xml Tue Oct 2 19:19:39 2012
@@ -32,23 +32,8 @@
<excludes>
<exclude>src</exclude>
<exclude>config/dspace.cfg</exclude>
- <exclude>config/modules/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>config/modules/**</include>
- </includes>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>target/atmire-modules</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
</fileSets>

<files>
Reply all
Reply to author
Forward
0 new messages