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/05/08 12:20:32 UTC
[1/2] syncope git commit: [SYNCOPE-1077] Conditionally build
ext/elasticsearch, only when jdk8 is available
Repository: syncope
Updated Branches:
refs/heads/2_0_X 07e31980a -> 464276089
refs/heads/master d70c841bf -> ed21ef02d
[SYNCOPE-1077] Conditionally build ext/elasticsearch, only when jdk8 is available
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/46427608
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/46427608
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/46427608
Branch: refs/heads/2_0_X
Commit: 46427608914cb4fa52c39cd4af960cbe3ff20896
Parents: 07e3198
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 8 14:16:37 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 8 14:16:48 2017 +0200
----------------------------------------------------------------------
ext/pom.xml | 13 ++++++++++++-
fit/core-reference/src/test/resources/rebel.xml | 4 ++--
pom.xml | 3 ++-
3 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/46427608/ext/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pom.xml b/ext/pom.xml
index c5ede76..f40a95e 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -39,6 +39,18 @@ under the License.
<profiles>
<profile>
+ <id>jdk8</id>
+
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+
+ <modules>
+ <module>elasticsearch</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>site</id>
<build>
@@ -80,7 +92,6 @@ under the License.
<module>camel</module>
<module>swagger-ui</module>
<module>saml2sp</module>
- <module>elasticsearch</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/46427608/fit/core-reference/src/test/resources/rebel.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/resources/rebel.xml b/fit/core-reference/src/test/resources/rebel.xml
index 12d68ec..6cb85c4 100644
--- a/fit/core-reference/src/test/resources/rebel.xml
+++ b/fit/core-reference/src/test/resources/rebel.xml
@@ -85,11 +85,11 @@ under the License.
<dir name="${basedir}/../../ext/elasticsearch/client-elasticsearch/target/classes">
<exclude name="elasticsearchClientContext.xml"/>
</dir>
- <dir name="${basedir}/../../ext/elasticsearch/persistence-jpa/target/classes">
+ <dir name="${basedir}/../../ext/elasticsearch/client-elasticsearch/target/classes">
</dir>
<dir name="${basedir}/../../ext/elasticsearch/provisioning-java/target/classes">
</dir>
- <dir name="${basedir}/../../ext/elasticsearch/workflow-java/target/classes">
+ <dir name="${basedir}/../../ext/elasticsearch/persistence-jpa/target/classes">
</dir>
</classpath>
http://git-wip-us.apache.org/repos/asf/syncope/blob/46427608/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 99549cc..2528164 100644
--- a/pom.xml
+++ b/pom.xml
@@ -380,7 +380,7 @@ under the License.
<slf4j.version>1.7.25</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
- <elasticsearch.version>5.3.2</elasticsearch.version>
+ <elasticsearch.version>5.4.0</elasticsearch.version>
<log4j.version>2.8.2</log4j.version>
<disruptor.version>3.3.6</disruptor.version>
@@ -2177,6 +2177,7 @@ under the License.
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>
+ <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/5.4.0</link>
</links>
</configuration>
<reportSets>
[2/2] syncope git commit: Upgrading Camel
Posted by il...@apache.org.
Upgrading Camel
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ed21ef02
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ed21ef02
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ed21ef02
Branch: refs/heads/master
Commit: ed21ef02d82b62913b82febdf5b7d951b30935f4
Parents: d70c841
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 8 14:20:23 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 8 14:20:23 2017 +0200
----------------------------------------------------------------------
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ed21ef02/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 494106f..eb57306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -374,7 +374,7 @@ under the License.
<activiti.version>5.22.0</activiti.version>
- <camel.version>2.18.3</camel.version>
+ <camel.version>2.19.0</camel.version>
<slf4j.version>1.7.25</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
@@ -2122,6 +2122,7 @@ under the License.
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>
+ <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/5.4.0</link>
</links>
</configuration>
<reportSets>