You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/01/07 16:51:33 UTC
syncope git commit: [SYNCOPE-752] Removing Selenium and re-enabiling
parallel build
Repository: syncope
Updated Branches:
refs/heads/master 3a17fef16 -> 5dda24d48
[SYNCOPE-752] Removing Selenium and re-enabiling parallel build
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5dda24d4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5dda24d4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5dda24d4
Branch: refs/heads/master
Commit: 5dda24d48d8454b6164d18e353fa970417b42b96
Parents: 3a17fef
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Jan 7 16:51:26 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Jan 7 16:51:26 2016 +0100
----------------------------------------------------------------------
fit/console-reference/pom.xml | 23 +++++++++--------------
pom.xml | 19 ++-----------------
2 files changed, 11 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/5dda24d4/fit/console-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index ffa35ec..a73941e 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -99,6 +99,11 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-webapp-explorer2</artifactId>
<type>war</type>
@@ -118,22 +123,12 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- SELENIUM INTEGRATION TEST -->
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
+ <groupId>org.apache.syncope.fit</groupId>
+ <artifactId>syncope-fit-core-reference</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/syncope/blob/5dda24d4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b0ab7c9..13608b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -364,7 +364,6 @@ under the License.
<h2.version>1.4.190</h2.version>
<junit.version>4.12</junit.version>
- <selenium.version>2.48.2</selenium.version>
<conf.directory>${project.build.directory}/test-classes</conf.directory>
<bundles.directory>${project.build.directory}/bundles</bundles.directory>
@@ -372,7 +371,7 @@ under the License.
<log.directory>${project.build.directory}/log</log.directory>
<activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
- <swagger-core.version>1.5.5</swagger-core.version>
+ <swagger-core.version>1.5.6</swagger-core.version>
<swagger-ui.version>2.1.3</swagger-ui.version>
<jquery.version>2.1.4</jquery.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
@@ -1155,22 +1154,8 @@ under the License.
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
- <!-- SELENIUM INTEGRATION TEST -->
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-api</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
-
+
</dependencyManagement>
<repositories>