diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-10-05 14:50:56 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-10-05 14:50:56 +0000 |
| commit | 2aed326efb069c113ab20e6a105bd9f63aa7880e (patch) | |
| tree | 41c0bec30e02e494c8cc70333e4a2532735eec4f | |
| parent | a80460a0417392440063bb1318c29ae39636eab2 (diff) | |
| download | archiva-2aed326efb069c113ab20e6a105bd9f63aa7880e.tar.gz archiva-2aed326efb069c113ab20e6a105bd9f63aa7880e.zip | |
simplify enunciate generation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1394555 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml | 45 | ||||
| -rw-r--r-- | pom.xml | 4 |
2 files changed, 4 insertions, 45 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml index 9219e3356..c36541d75 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml @@ -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 @@ -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> |