Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

start work using jetty maven plugin 

Signed-off-by: olivier lamy <olamy@apache.org>
This commit is contained in:
olivier lamy 2017-06-16 15:38:50 +10:00
parent 63827f482b
commit c8fd32bbb7
4 changed files with 30 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
View File

@ -698,7 +698,6 @@ public class DefaultArchivaConfiguration
return false; return false;
} }
} }
FileUtils.writeStringToFile( file, contents, "UTF-8" ); FileUtils.writeStringToFile( file, contents, "UTF-8" );
return true; return true;
} }

85
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -31,12 +31,11 @@
<properties> <properties>
<tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml> <tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml>
<tomcatRunPort>9091</tomcatRunPort>
<tomcatRunPath>/archiva</tomcatRunPath>
<archiva.devMode>true</archiva.devMode> <archiva.devMode>true</archiva.devMode>
<archiva.javascriptLog>true</archiva.javascriptLog> <archiva.javascriptLog>true</archiva.javascriptLog>
<archiva.logMissingI18n>true</archiva.logMissingI18n> <archiva.logMissingI18n>true</archiva.logMissingI18n>
<archivaAppServerBase>${project.build.directory}/appserver-base</archivaAppServerBase> <archivaAppServerBase>${project.build.directory}/appserver-base</archivaAppServerBase>
<jettyDumpOnStart>false</jettyDumpOnStart>
<archiva.baseRestUrl /> <archiva.baseRestUrl />
<rest.admin.pwd /> <rest.admin.pwd />
<test.useTomcat>false</test.useTomcat> <test.useTomcat>false</test.useTomcat>
@ -925,8 +924,8 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>9.4.5.v20170502</version>
<configuration> <configuration>
<dumpOnStart>${jettyDumpOnStart}</dumpOnStart>
<scanIntervalSeconds>10</scanIntervalSeconds> <scanIntervalSeconds>10</scanIntervalSeconds>
<webApp> <webApp>
<contextPath>/archiva</contextPath> <contextPath>/archiva</contextPath>
@ -1032,95 +1031,23 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId> <artifactId>jetty-io</artifactId>
<version>9.4.5.v20170502</version> <version>${jettyVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId> <artifactId>jetty-util</artifactId>
<version>9.4.5.v20170502</version> <version>${jettyVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId> <artifactId>jetty-client</artifactId>
<version>9.4.5.v20170502</version> <version>${jettyVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId> <artifactId>websocket-client</artifactId>
<version>9.4.5.v20170502</version> <version>${jettyVersion}</version>
</dependency> </dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<configuration>
<port>${tomcatRunPort}</port>
<path>${tomcatRunPath}</path>
<contextFile>${tomcatContextXml}</contextFile>
<useTestClasspath>false</useTestClasspath>
<systemProperties>
<plexus.home>${archivaAppServerBase}</plexus.home>
<appserver.base>${archivaAppServerBase}</appserver.base>
<appserver.home>${archivaAppServerBase}</appserver.home>
<derby.system.home>${archivaAppServerBase}/logs</derby.system.home>
<!-- remove admin auto creation that must be tested too -->
<!--redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties</redback.admin.creation.file-->
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
<archiva.user.configFileName>${archivaAppServerBase}/conf/archiva.xml</archiva.user.configFileName>
<archiva.devMode>${archiva.devMode}</archiva.devMode>
<archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
<archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
<cassandra.host>${cassandra.host}</cassandra.host>
<cassandra.port>${cassandra.port}</cassandra.port>
<archiva.repositorySessionFactory.id>${archiva.repositorySessionFactory.id}</archiva.repositorySessionFactory.id>
<AsyncLoggerConfig.WaitStrategy>Block</AsyncLoggerConfig.WaitStrategy>
<AsyncLogger.WaitStrategy>Block</AsyncLogger.WaitStrategy>
<openjpa.Log>${openjpa.Log}</openjpa.Log>
</systemProperties>
<additionalClasspathDirs>
<additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
</additionalClasspathDirs>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derbyVersion}</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javaxMailVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpaVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.serp</groupId>
<artifactId>serp</artifactId>
<version>1.15.1</version>
</dependency>
</dependencies> </dependencies>
</plugin> </plugin>

2
archiva-modules/plugins/metadata-store-cassandra/pom.xml
View File

@ -239,7 +239,7 @@
<executions> <executions>
<execution> <execution>
<id>start-cassandra</id> <id>start-cassandra</id>
<phase>test-compile</phase> <phase>process-test-classes</phase>
<goals> <goals>
<goal>start</goal> <goal>start</goal>
</goals> </goals>

8
pom.xml
View File

@ -83,7 +83,8 @@
<httpclient.version>4.5.2</httpclient.version> <httpclient.version>4.5.2</httpclient.version>
<httpclient.core.version>4.4.4</httpclient.core.version> <httpclient.core.version>4.4.4</httpclient.core.version>
<javaxMailVersion>1.4</javaxMailVersion> <javaxMailVersion>1.4</javaxMailVersion>
<jettyVersion>9.4.5.v20170502</jettyVersion> <!--jettyVersion>9.4.5.v20170502</jettyVersion-->
<jettyVersion>9.4.7-SNAPSHOT</jettyVersion>
<guava.version>22.0</guava.version> <guava.version>22.0</guava.version>
<openjpaVersion>2.4.1</openjpaVersion> <openjpaVersion>2.4.1</openjpaVersion>
@ -1750,6 +1751,11 @@
<artifactId>tomcat7-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<version>${asfTomcatMavenPluginVersion}</version> <version>${asfTomcatMavenPluginVersion}</version>
</plugin> </plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jettyVersion}</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>