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 2017/06/23 23:06:51 UTC
[02/13] archiva git commit: start work using jetty maven plugin
start work using jetty maven plugin
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/c8fd32bb
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/c8fd32bb
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/c8fd32bb
Branch: refs/heads/feature/jcr_oak
Commit: c8fd32bbb7e1ad8d390d2bb478b9317480903588
Parents: 63827f4
Author: olivier lamy <ol...@apache.org>
Authored: Fri Jun 16 15:38:50 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Fri Jun 16 16:30:26 2017 +1000
----------------------------------------------------------------------
.../DefaultArchivaConfiguration.java | 1 -
.../archiva-web/archiva-webapp/pom.xml | 117 ++++---------------
.../plugins/metadata-store-cassandra/pom.xml | 2 +-
pom.xml | 8 +-
4 files changed, 30 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/c8fd32bb/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index 44f2521..4547787 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -698,7 +698,6 @@ public class DefaultArchivaConfiguration
return false;
}
}
-
FileUtils.writeStringToFile( file, contents, "UTF-8" );
return true;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/c8fd32bb/archiva-modules/archiva-web/archiva-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index ce7b826..1b203dd 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -31,12 +31,11 @@
<properties>
<tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml>
- <tomcatRunPort>9091</tomcatRunPort>
- <tomcatRunPath>/archiva</tomcatRunPath>
<archiva.devMode>true</archiva.devMode>
<archiva.javascriptLog>true</archiva.javascriptLog>
<archiva.logMissingI18n>true</archiva.logMissingI18n>
<archivaAppServerBase>${project.build.directory}/appserver-base</archivaAppServerBase>
+ <jettyDumpOnStart>false</jettyDumpOnStart>
<archiva.baseRestUrl />
<rest.admin.pwd />
<test.useTomcat>false</test.useTomcat>
@@ -925,8 +924,8 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.5.v20170502</version>
<configuration>
+ <dumpOnStart>${jettyDumpOnStart}</dumpOnStart>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webApp>
<contextPath>/archiva</contextPath>
@@ -997,98 +996,6 @@
</systemProperties>
</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>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>9.4.5.v20170502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>9.4.5.v20170502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>9.4.5.v20170502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-client</artifactId>
- <version>9.4.5.v20170502</version>
- </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>
@@ -1121,6 +1028,26 @@
<version>1.15.1</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jettyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jettyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jettyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-client</artifactId>
+ <version>${jettyVersion}</version>
+ </dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/archiva/blob/c8fd32bb/archiva-modules/plugins/metadata-store-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index 3e32549..5253ab0 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -239,7 +239,7 @@
<executions>
<execution>
<id>start-cassandra</id>
- <phase>test-compile</phase>
+ <phase>process-test-classes</phase>
<goals>
<goal>start</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/archiva/blob/c8fd32bb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c5ef325..ae60174 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,8 @@
<httpclient.version>4.5.2</httpclient.version>
<httpclient.core.version>4.4.4</httpclient.core.version>
<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>
<openjpaVersion>2.4.1</openjpaVersion>
@@ -1751,6 +1752,11 @@
<version>${asfTomcatMavenPluginVersion}</version>
</plugin>
<plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jettyVersion}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>