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 2017/10/24 08:48:47 UTC
[1/4] syncope git commit: Tomcat 9,
cargo 1.6.5 and surefire / failsafe back to 2.19.1 as temporary
downgrade for junit-platform-surefire-provider
Repository: syncope
Updated Branches:
refs/heads/master 52bb4b309 -> d0d090981
Tomcat 9, cargo 1.6.5 and surefire / failsafe back to 2.19.1 as temporary downgrade for junit-platform-surefire-provider
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/21dff179
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/21dff179
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/21dff179
Branch: refs/heads/master
Commit: 21dff17927ab0df646de8d550aaaeb386571fe45
Parents: 52bb4b3
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Oct 24 10:46:56 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Oct 24 10:46:56 2017 +0200
----------------------------------------------------------------------
pom.xml | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/21dff179/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index edd7463..92bc222 100644
--- a/pom.xml
+++ b/pom.xml
@@ -481,7 +481,7 @@ under the License.
<cargo.log>${log.directory}/cargo.log</cargo.log>
<cargo.output>${log.directory}/cargo-output.log</cargo.output>
- <tomcat.version>8.5.23</tomcat.version>
+ <tomcat.version>9.0.1</tomcat.version>
<phantomjs.driver.version>1.2.0</phantomjs.driver.version>
<phantomjs.version>2.1.1</phantomjs.version>
@@ -1795,10 +1795,10 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<configuration>
<container>
- <containerId>tomcat8x</containerId>
+ <containerId>tomcat9x</containerId>
<zipUrlInstaller>
<url>http://central.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
@@ -1811,10 +1811,12 @@ under the License.
</configuration>
</plugin>
+ <!-- Keep the following plugins on 2.19.1 / 1.0.1 until
+ https://github.com/junit-team/junit5/issues/809 is properly fixed -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.19.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -1825,14 +1827,14 @@ under the License.
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.19.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -1843,7 +1845,7 @@ under the License.
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1</version>
</dependency>
</dependencies>
<executions>
[4/4] syncope git commit: Updating docs to Tomcat 9 and Wildfly 11
Posted by il...@apache.org.
Updating docs to Tomcat 9 and Wildfly 11
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d0d09098
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d0d09098
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d0d09098
Branch: refs/heads/master
Commit: d0d0909817e948e262711cada64a95e83eaef3a4
Parents: 4a0b748
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Oct 24 10:48:41 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Oct 24 10:48:41 2017 +0200
----------------------------------------------------------------------
src/main/asciidoc/getting-started/systemRequirements.adoc | 4 ++--
.../systemadministration/dbcp.adoc | 6 ++----
.../systemadministration/javaeecontainer.adoc | 10 ++++++++--
3 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d0d09098/src/main/asciidoc/getting-started/systemRequirements.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/systemRequirements.adoc b/src/main/asciidoc/getting-started/systemRequirements.adoc
index 09ee9be..f659705 100644
--- a/src/main/asciidoc/getting-started/systemRequirements.adoc
+++ b/src/main/asciidoc/getting-started/systemRequirements.adoc
@@ -36,10 +36,10 @@ Apache Syncope {docVersion} requires the latest JDK 7 or JDK 8 that is available
Apache Syncope {docVersion} is verified with the following Java EE containers:
- . http://tomcat.apache.org/download-80.cgi[Apache Tomcat 8 and 8.5^]
+ . http://tomcat.apache.org/download-90.cgi[Apache Tomcat 9^]
. https://glassfish.java.net/[Glassfish 4.1^]
. http://www.payara.fish/[Payara Server^]
- . http://www.wildfly.org/[Wildfly 9 and 10^]
+ . http://www.wildfly.org/[Wildfly 11^]
=== Internal Storage
http://git-wip-us.apache.org/repos/asf/syncope/blob/d0d09098/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
index a5013f9..53b2d4f 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
@@ -31,9 +31,7 @@ for the Master domain.
. <<JavaEE Container>>-managed, via the JNDI resource matching the name specified for a given <<domains,domain>>, e.g.
`java:comp/env/jdbc/syncopeMasterDataSource` for the Master domain. +
Each JavaEE Container provides its own way to accomplish this task:
- * https://tomcat.apache.org/tomcat-8.0-doc/jdbc-pool.html[Apache Tomcat 8^]
- * https://tomcat.apache.org/tomcat-8.5-doc/jdbc-pool.html[Apache Tomcat 8.5^]
+ * https://tomcat.apache.org/tomcat-9.0-doc/jdbc-pool.html[Apache Tomcat 9^]
* https://javaee.github.io/glassfish/doc/4.0/administration-guide.pdf[Glassfish 4.1^]
* https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara^]
- * https://docs.jboss.org/author/display/WFLY9/DataSource+configuration[Wildfly 9^]
- * https://docs.jboss.org/author/display/WFLY10/DataSource+configuration[Wildfly 10^]
\ No newline at end of file
+ * https://docs.jboss.org/author/display/WFLY11/DataSource+configuration[Wildfly 11^]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/d0d09098/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
index 917ccea..724b43e 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -18,7 +18,7 @@
//
==== JavaEE Container
-===== Apache Tomcat 8 and 8.5
+===== Apache Tomcat 9
On GNU / Linux - Mac OS X, create `$CATALINA_HOME/bin/setenv.sh` with similar content
(keep everything on a single line):
@@ -72,7 +72,7 @@ When using a datasource for internal storage, be sure to add
right after `</context-root>` in `core/src/main/webapp/WEB-INF/glassfish-web.xml`, assuming that your Glassfish instance
provides a datasource named `jdbc/syncopeMasterDataSource`.
-===== Wildfly 9 and 10
+===== Wildfly 11
Add
@@ -103,6 +103,12 @@ Add
<artifactId>cxf-rt-wsdl</artifactId>
<version>${cxf.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.reactivestreams</groupId>
+ <artifactId>reactive-streams</artifactId>
+ <version>1.0.1</version>
+ </dependency>
....
as additional dependencies in `core/pom.xml`, `console/pom.xml` and `enduser/pom.xml`.
[2/4] syncope git commit: More robust account policy test handling
Posted by il...@apache.org.
More robust account policy test handling
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cd5a28aa
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cd5a28aa
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cd5a28aa
Branch: refs/heads/master
Commit: cd5a28aad3d378f489b4c9bffd1c4f6735219359
Parents: 21dff17
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Oct 24 10:47:24 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Oct 24 10:47:24 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/syncope/fit/core/RealmITCase.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/cd5a28aa/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
index 23c202a..7f2a9cc 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
@@ -150,12 +150,21 @@ public class RealmITCase extends AbstractITCase {
// 2. create realm with policy assigned
RealmTO realm = new RealmTO();
realm.setName("withppolicy");
- realm.setAccountPolicy(policy.getKey());
response = realmService.create(SyncopeConstants.ROOT_REALM, realm);
RealmTO[] actuals = getObject(response.getLocation(), RealmService.class, RealmTO[].class);
assertNotNull(actuals);
assertTrue(actuals.length > 0);
+ realm = actuals[0];
+
+ String existingAccountPolicy = realm.getAccountPolicy();
+
+ realm.setAccountPolicy(policy.getKey());
+ realmService.update(realm);
+
+ actuals = getObject(response.getLocation(), RealmService.class, RealmTO[].class);
+ assertNotNull(actuals);
+ assertTrue(actuals.length > 0);
RealmTO actual = actuals[0];
assertEquals(policy.getKey(), actual.getAccountPolicy());
@@ -164,7 +173,7 @@ public class RealmITCase extends AbstractITCase {
// 4. verify
actual = getRealm(actual.getFullPath()).get();
- assertNull(actual.getAccountPolicy());
+ assertEquals(existingAccountPolicy, actual.getAccountPolicy());
}
@Test
[3/4] syncope git commit: Wildfly 11 support
Posted by il...@apache.org.
Wildfly 11 support
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4a0b748d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4a0b748d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4a0b748d
Branch: refs/heads/master
Commit: 4a0b748dae05a017562b781bc75dd30c025c7601
Parents: cd5a28a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Oct 24 10:47:38 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Oct 24 10:47:38 2017 +0200
----------------------------------------------------------------------
fit/core-reference/pom.xml | 10 ++++++++--
.../src/main/resources/jboss/domains/MasterDomain.xml | 4 ++--
.../src/main/resources/jboss/domains/TwoDomain.xml | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4a0b748d/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index aebc662..9b5195b 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -797,6 +797,12 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.reactivestreams</groupId>
+ <artifactId>reactive-streams</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
@@ -828,9 +834,9 @@ under the License.
<inherited>true</inherited>
<configuration>
<container>
- <containerId>wildfly10x</containerId>
+ <containerId>wildfly11x</containerId>
<zipUrlInstaller>
- <url>http://download.jboss.org/wildfly/10.1.0.Final/wildfly-10.1.0.Final.zip</url>
+ <url>http://download.jboss.org/wildfly/11.0.0.Final/wildfly-11.0.0.Final.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4a0b748d/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
index 5daee06..517d0ac 100644
--- a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
+++ b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
@@ -101,7 +101,7 @@ under the License.
<property name="jpaPropertyMap">
<map>
<entry key="openjpa.MetaDataFactory"
- value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly10x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar, Resources=${Master.orm})"/>
+ value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly11x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar, Resources=${Master.orm})"/>
</map>
</property>
</bean>
@@ -113,4 +113,4 @@ under the License.
<tx:annotation-driven transaction-manager="MasterTransactionManager"/>
-</beans>
\ No newline at end of file
+</beans>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4a0b748d/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
index 00c72d4..8fe3c0c 100644
--- a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
+++ b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
@@ -101,7 +101,7 @@ under the License.
<property name="jpaPropertyMap">
<map>
<entry key="openjpa.MetaDataFactory"
- value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly10x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar, Resources=${Master.orm})"/>
+ value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly11x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar, Resources=${Master.orm})"/>
</map>
</property>
</bean>