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/04/20 14:16:48 UTC
[1/2] syncope git commit: [SYNCOPE-808] Clearing up the root pom.xml
after merge
Repository: syncope
Updated Branches:
refs/heads/2_0_X a31ce3c6d -> 69657ca44
refs/heads/master b03947a33 -> d76ed3e8b
[SYNCOPE-808] Clearing up the root pom.xml after merge
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d76ed3e8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d76ed3e8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d76ed3e8
Branch: refs/heads/master
Commit: d76ed3e8b73a5947d286077208f22f741f4f3561
Parents: b03947a
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Thu Apr 20 16:11:25 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Thu Apr 20 16:11:25 2017 +0200
----------------------------------------------------------------------
ide/netbeans/pom.xml | 21 ++++++++++++---------
pom.xml | 42 ++++++++++++++++--------------------------
2 files changed, 28 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d76ed3e8/ide/netbeans/pom.xml
----------------------------------------------------------------------
diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml
index abaa216..c12edb9 100644
--- a/ide/netbeans/pom.xml
+++ b/ide/netbeans/pom.xml
@@ -20,7 +20,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-ide</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope IDE Netbeans</name>
@@ -36,6 +36,17 @@ under the License.
<dependencies>
<dependency>
+ <groupId>org.apache.syncope.common</groupId>
+ <artifactId>syncope-common-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.syncope.client</groupId>
+ <artifactId>syncope-client-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
</dependency>
@@ -64,14 +75,6 @@ under the License.
<artifactId>org-netbeans-modules-settings</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.syncope.common</groupId>
- <artifactId>syncope-common-lib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.syncope.client</groupId>
- <artifactId>syncope-client-lib</artifactId>
- </dependency>
- <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/syncope/blob/d76ed3e8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 794144e..d669fe8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,7 +442,7 @@ under the License.
<ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
<maven-jar-plugin-version>3.0.0</maven-jar-plugin-version>
- <tycho-version>1.0.0</tycho-version>
+ <tycho.version>1.0.0</tycho.version>
<netbeans.version>RELEASE82</netbeans.version>
<testds.port>1389</testds.port>
@@ -567,10 +567,10 @@ under the License.
<version>${cxf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-sso-saml</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-sso-saml</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
<exclusion>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-impl</artifactId>
@@ -579,26 +579,26 @@ under the License.
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-saml-impl</artifactId>
</exclusion>
- <exclusion>
+ <exclusion>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- </exclusion>
- </exclusions>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.wss4j</groupId>
+ <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- <version>2.1.9</version>
- <exclusions>
- <exclusion>
- <groupId>org.jasypt</groupId>
- <artifactId>jasypt</artifactId>
- </exclusion>
+ <version>2.1.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<!-- /CXF -->
@@ -1458,16 +1458,6 @@ under the License.
<version>${netbeans.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.syncope.common</groupId>
- <artifactId>syncope-common-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.syncope.client</groupId>
- <artifactId>syncope-client-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-io</artifactId>
<version>${netbeans.version}</version>
[2/2] syncope git commit: [SYNCOPE-808] Clearing up the root pom.xml
after merge
Posted by il...@apache.org.
[SYNCOPE-808] Clearing up the root pom.xml after merge
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/69657ca4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/69657ca4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/69657ca4
Branch: refs/heads/2_0_X
Commit: 69657ca44cdfc24461e247960b4f65a7076e827e
Parents: a31ce3c
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Thu Apr 20 16:16:41 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Thu Apr 20 16:16:41 2017 +0200
----------------------------------------------------------------------
ide/netbeans/pom.xml | 19 +++++++++++--------
pom.xml | 28 ----------------------------
2 files changed, 11 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/69657ca4/ide/netbeans/pom.xml
----------------------------------------------------------------------
diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml
index abaa216..4e791ed 100644
--- a/ide/netbeans/pom.xml
+++ b/ide/netbeans/pom.xml
@@ -36,6 +36,17 @@ under the License.
<dependencies>
<dependency>
+ <groupId>org.apache.syncope.common</groupId>
+ <artifactId>syncope-common-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.syncope.client</groupId>
+ <artifactId>syncope-client-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
</dependency>
@@ -64,14 +75,6 @@ under the License.
<artifactId>org-netbeans-modules-settings</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.syncope.common</groupId>
- <artifactId>syncope-common-lib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.syncope.client</groupId>
- <artifactId>syncope-client-lib</artifactId>
- </dependency>
- <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/syncope/blob/69657ca4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 286d8c5..677bee6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,24 +447,6 @@ under the License.
<tycho.version>0.23.1</tycho.version>
<netbeans.version>RELEASE82</netbeans.version>
- <org-netbeans-api-version>RELEASE802</org-netbeans-api-version>
- <org-netbeans-version>RELEASE82</org-netbeans-version>
- <ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
- <maven-jar-plugin-version>3.0.0</maven-jar-plugin-version>
-
- <tycho.version>0.23.1</tycho.version>
- <netbeans.version>RELEASE82</netbeans.version>
-
- <org-netbeans-api-version>RELEASE802</org-netbeans-api-version>
- <org-netbeans-version>RELEASE82</org-netbeans-version>
- <ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
- <maven-jar-plugin-version>3.0.0</maven-jar-plugin-version>
-
- <org-netbeans-api-version>RELEASE802</org-netbeans-api-version>
- <org-netbeans-version>RELEASE82</org-netbeans-version>
- <ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
- <maven-jar-plugin-version>3.0.0</maven-jar-plugin-version>
-
<testds.port>1389</testds.port>
<testdb.webport>9082</testdb.webport>
@@ -1531,16 +1513,6 @@ under the License.
<version>${netbeans.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.syncope.common</groupId>
- <artifactId>syncope-common-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.syncope.client</groupId>
- <artifactId>syncope-client-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-io</artifactId>
<version>${netbeans.version}</version>