Author: olamy
Date: Fri Oct 5 14:50:56 2012
New Revision: 1394555
URL: http://svn.apache.org/viewvc?rev=1394555&view=rev
Log:
simplify enunciate generation
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml?rev=1394555&r1=1394554&r2=1394555&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
Fri Oct 5 14:50:56 2012
@@ -31,8 +31,7 @@
<name>Archiva Web :: REST support :: Api</name>
<properties>
- <enunciate.version>1.26.1</enunciate.version>
- <enunciate.debug>false</enunciate.debug>
+
<enunciate.docsDir>${project.build.outputDirectory}/rest-docs-archiva-rest-api</enunciate.docsDir>
</properties>
<dependencies>
@@ -102,20 +101,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>enunciate-core</artifactId>
- <scope>provided</scope>
- <version>${enunciate.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>${jacksonVersion}</version>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
<build>
@@ -179,33 +164,7 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>maven-enunciate-plugin</artifactId>
- <version>${enunciate.version}</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>docs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<docsDir>${project.build.outputDirectory}/rest-docs-archiva-rest-api</docsDir>
- <configFile>src/enunciate/enunciate.xml</configFile>
- <compileDebug>${enunciate.debug}</compileDebug>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>enunciate-docs</artifactId>
- <version>${enunciate.version}</version>
- </dependency>
- </dependencies>
- </plugin>
-
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1394555&r1=1394554&r2=1394555&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Fri Oct 5 14:50:56 2012
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-parent</artifactId>
- <version>9</version>
+ <version>10-SNAPSHOT</version>
<relativePath />
</parent>
@@ -92,7 +92,7 @@
<httpclient.core.version>4.2.2</httpclient.core.version>
<javaxMailVersion>1.4</javaxMailVersion>
<jettyVersion>8.1.7.v20120910</jettyVersion>
- <jacksonVersion>1.9.9</jacksonVersion>
+
<!-- restore when we will be able to use a derby in memory database -->
<redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
<redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver>
