You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/06/13 11:30:33 UTC
[1/3] archiva git commit: Adding empty tags avoid schema errors in IDE
Repository: archiva
Updated Branches:
refs/heads/master eedd8d655 -> 5608f7bba
Adding empty tags avoid schema errors in IDE
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/0ebdedcb
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/0ebdedcb
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/0ebdedcb
Branch: refs/heads/master
Commit: 0ebdedcbe5e1d460286c70079b45f95355e407ab
Parents: eedd8d6
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Jun 13 13:18:59 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Jun 13 13:18:59 2017 +0200
----------------------------------------------------------------------
archiva-modules/archiva-web/archiva-webapp-test/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/0ebdedcb/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 868f2f5..1e7318c 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -374,6 +374,11 @@
<portName>container.http.port</portName>
<portName>container.stop.port</portName>
</portNames>
+ <fileSet/>
+ <name/>
+ <regex/>
+ <source/>
+ <value/>
</configuration>
<executions>
<execution>
[3/3] archiva git commit: Cleaning up pom.xml
Posted by ma...@apache.org.
Cleaning up pom.xml
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/5608f7bb
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/5608f7bb
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/5608f7bb
Branch: refs/heads/master
Commit: 5608f7bbafd0951c2d65c170d7f1ba0eb88c507c
Parents: c958387
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Jun 13 13:29:52 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Jun 13 13:29:52 2017 +0200
----------------------------------------------------------------------
.../archiva-web/archiva-webapp-test/pom.xml | 58 +-------------------
1 file changed, 2 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/5608f7bb/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 1e7318c..b68c2ad 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -36,9 +36,7 @@
<selenium-server.version>3.4.0</selenium-server.version>
<fluentlenium.version>3.2.0</fluentlenium.version>
<fluentlenium.festassert.version>0.13.2</fluentlenium.festassert.version>
-
-
- <browserPath></browserPath>
+ <browserPath/>
</properties>
<dependencies>
@@ -358,7 +356,6 @@
<exclude>src/test/resources/local-repo/**</exclude>
<exclude>src/test/resources/projects/**</exclude>
<exclude>src/test/resources/snapshots/**</exclude>
- <exclude>src/test/tomcat*/conf/catalina.policy</exclude>
</excludes>
</configuration>
</plugin>
@@ -615,57 +612,6 @@
</execution>
</executions>
</plugin>
-
-<!-- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <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>
- </dependencies>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run-war-only</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <path>/archiva</path>
- <port>${container.http.port}</port>
- <uriEncoding>UTF-8</uriEncoding>
- <warDirectory>${webappDirectory}</warDirectory>
- <fork>true</fork>
- <ignorePackaging>true</ignorePackaging>
- <systemProperties>
- <appserver.base>${project.build.directory}/appserver-base</appserver.base>
- <appserver.home>${project.build.directory}/appserver-base</appserver.home>
- <derby.system.home>${project.build.directory}</derby.system.home>
- <archiva.devMode>true</archiva.devMode>
- <openjpa.Log>${openjpa.Log}</openjpa.Log>
- </systemProperties>
- <contextFile>${project.build.testOutputDirectory}/archiva.xml</contextFile>
- <propertiesPortFilePath>${container.propertiesPortFilePath}</propertiesPortFilePath>
- <useNaming>true</useNaming>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <goals>
- <goal>shutdown</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>-->
</plugins>
</build>
</profile>
@@ -701,7 +647,7 @@
</property>
</activation>
<properties>
- <seleniumPort></seleniumPort>
+ <seleniumPort/>
</properties>
</profile>
<profile>
[2/3] archiva git commit: Fixing another timing issue with htmlunit
tests
Posted by ma...@apache.org.
Fixing another timing issue with htmlunit tests
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/c9583879
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/c9583879
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/c9583879
Branch: refs/heads/master
Commit: c958387951669cdf29eb25fa2356b11282e845b3
Parents: 0ebdedc
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Jun 13 13:29:24 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Jun 13 13:29:24 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/archiva/web/test/RolesManagementTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/c9583879/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RolesManagementTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RolesManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RolesManagementTest.java
index b31ab23..c7b1889 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RolesManagementTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/RolesManagementTest.java
@@ -23,6 +23,7 @@ import org.apache.commons.lang.StringUtils;
import org.junit.Assert;
import org.junit.Test;
import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
@@ -39,9 +40,10 @@ public class RolesManagementTest
throws Exception
{
login( getAdminUsername(), getAdminPassword() );
- clickLinkWithLocator( "menu-roles-list-a");
WebDriverWait wait = new WebDriverWait(getWebDriver(), 10);
- wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("roles-view"),"Archiva System Administrator"));
+ WebElement link = wait.until(ExpectedConditions.elementToBeClickable( By.id("menu-roles-list-a") ));
+ tryClick( link, ExpectedConditions.textToBePresentInElementLocated(By.id("roles-view"),"Archiva System Administrator"),
+ "Roles view not available");
Assert.assertTrue( StringUtils.isEmpty( getText( "role-description-Guest" ) ) );
clickLinkWithLocator( "edit-role-Guest" );
wait.until(ExpectedConditions.elementToBeClickable(By.id("role-edit-description-save")));