You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/05 13:56:24 UTC
svn commit: r1585069 - in /archiva/trunk:
archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva-modules/plugins/pom.xml pom.xml
Author: olamy
Date: Sat Apr 5 11:56:24 2014
New Revision: 1585069
URL: http://svn.apache.org/r1585069
Log:
cassndra part of the build in default profile as we are now 1.7
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/plugins/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1585069&r1=1585068&r2=1585069&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Sat Apr 5 11:56:24 2014
@@ -134,6 +134,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-store-cassandra</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
@@ -1094,19 +1099,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>cassandra</id>
- <properties>
- <archiva.repositorySessionFactory.id>cassandra</archiva.repositorySessionFactory.id>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>metadata-store-cassandra</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
Modified: archiva/trunk/archiva-modules/plugins/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/pom.xml?rev=1585069&r1=1585068&r2=1585069&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/pom.xml Sat Apr 5 11:56:24 2014
@@ -39,6 +39,7 @@
<module>stage-repository-merge</module>
<module>generic-metadata-support</module>
<module>metadata-store-jcr</module>
+ <module>metadata-store-cassandra</module>
</modules>
</project>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1585069&r1=1585068&r2=1585069&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Sat Apr 5 11:56:24 2014
@@ -1876,22 +1876,6 @@
</profile>
<profile>
- <!--
- <id>jdk-1.7</id>
- -->
- <id>cassandra</id>
- <activation>
- <property>
- <name>cassandra</name>
- <value>true</value>
- </property>
- </activation>
- <modules>
- <module>archiva-modules/plugins/metadata-store-cassandra</module>
- </modules>
- </profile>
-
- <profile>
<!-- profile to run javascript webapp and it tests -->
<id>it-js</id>
<modules>