[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ò <ilgro...@apache.org> Authored: Thu Apr 20 16:16:41 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@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>
