mirror of https://github.com/apache/archiva.git
[MRM-181,MRM-182] fix build and runtime configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@448856 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter
parent
09164151bb
commit
30bfe0adda
|
|
@ -48,6 +48,18 @@
|
||||||
<artifactId>commons-logging-api</artifactId>
|
<artifactId>commons-logging-api</artifactId>
|
||||||
<version>1.0.4</version>
|
<version>1.0.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.derby</groupId>
|
||||||
|
<artifactId>derby</artifactId>
|
||||||
|
<version>10.1.3.1</version>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
<artifactId>plexus-naming</artifactId>
|
||||||
|
<version>1.0-SNAPSHOT</version>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
@ -71,6 +83,14 @@
|
||||||
<runtimePath>target/plexus-archiva-runtime</runtimePath>
|
<runtimePath>target/plexus-archiva-runtime</runtimePath>
|
||||||
<additionalCoreArtifacts>
|
<additionalCoreArtifacts>
|
||||||
<additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
|
<additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
|
||||||
|
<additionalCoreArtifact>org.apache.derby:derby</additionalCoreArtifact>
|
||||||
|
<additionalCoreArtifact>org.codehaus.plexus:plexus-naming</additionalCoreArtifact>
|
||||||
|
<additionalCoreArtifact>commons-pool:commons-pool</additionalCoreArtifact>
|
||||||
|
<additionalCoreArtifact>commons-dbcp:commons-dbcp</additionalCoreArtifact>
|
||||||
|
<additionalCoreArtifact>commons-collections:commons-collections</additionalCoreArtifact>
|
||||||
|
<additionalCoreArtifact>directory-naming:naming-core</additionalCoreArtifact>
|
||||||
|
<additionalCoreArtifact>directory-naming:naming-factory</additionalCoreArtifact>
|
||||||
|
<additionalCoreArtifact>directory-naming:naming-java</additionalCoreArtifact>
|
||||||
</additionalCoreArtifacts>
|
</additionalCoreArtifacts>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
|
||||||
|
|
@ -1 +1,44 @@
|
||||||
<plexus/>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<plexus>
|
||||||
|
<load-on-start>
|
||||||
|
<component>
|
||||||
|
<role>org.codehaus.plexus.naming.Naming</role>
|
||||||
|
<role-hint>dataSources</role-hint>
|
||||||
|
</component>
|
||||||
|
</load-on-start>
|
||||||
|
<components>
|
||||||
|
<component>
|
||||||
|
<role>org.codehaus.plexus.naming.Naming</role>
|
||||||
|
<implementation>org.codehaus.plexus.naming.DefaultNaming</implementation>
|
||||||
|
<role-hint>dataSources</role-hint>
|
||||||
|
<configuration>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<name>jdbc/users</name>
|
||||||
|
<type>javax.sql.DataSource</type>
|
||||||
|
<properties>
|
||||||
|
<property>
|
||||||
|
<name>driverClassName</name>
|
||||||
|
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
|
||||||
|
</property>
|
||||||
|
<property>
|
||||||
|
<name>url</name>
|
||||||
|
<value>jdbc:derby:${plexus.home}/database;create=true</value>
|
||||||
|
</property>
|
||||||
|
<property>
|
||||||
|
<name>username</name>
|
||||||
|
<value>sa</value>
|
||||||
|
</property>
|
||||||
|
<property>
|
||||||
|
<name>password</name>
|
||||||
|
<value></value>
|
||||||
|
</property>
|
||||||
|
</properties>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
|
</components>
|
||||||
|
</plexus>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -339,13 +339,6 @@
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<!-- TODO: remove once xwork integration is released -->
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>codehaus.snapshots</id>
|
|
||||||
<url>http://snapshots.repository.codehaus.org</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
<pluginRepositories>
|
<pluginRepositories>
|
||||||
<pluginRepository>
|
<pluginRepository>
|
||||||
<id>codehaus.org</id>
|
<id>codehaus.org</id>
|
||||||
|
|
|
||||||
7
pom.xml
7
pom.xml
|
|
@ -376,6 +376,13 @@
|
||||||
<url>http://snapshots.repository.codehaus.org</url>
|
<url>http://snapshots.repository.codehaus.org</url>
|
||||||
</pluginRepository>
|
</pluginRepository>
|
||||||
</pluginRepositories>
|
</pluginRepositories>
|
||||||
|
<!-- TODO: remove once xwork integration, plexus container is released -->
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>codehaus.snapshots</id>
|
||||||
|
<url>http://snapshots.repository.codehaus.org</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
<properties>
|
<properties>
|
||||||
<maven.version>2.0.4</maven.version>
|
<maven.version>2.0.4</maven.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue