You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/01/09 19:15:06 UTC
svn commit: r1650616 - /directory/studio/branches/studio-tycho/pom.xml
Author: elecharny
Date: Fri Jan 9 18:15:06 2015
New Revision: 1650616
URL: http://svn.apache.org/r1650616
Log:
Bumped up ldap api to 1.0.0-M28, and slf4j dependency to work with this version. Added the tycho-compiler-plugin with a target version to avoid having compialtion errors with generics
Modified:
directory/studio/branches/studio-tycho/pom.xml
Modified: directory/studio/branches/studio-tycho/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/pom.xml?rev=1650616&r1=1650615&r2=1650616&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/pom.xml (original)
+++ directory/studio/branches/studio-tycho/pom.xml Fri Jan 9 18:15:06 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.directory.project</groupId>
<artifactId>project</artifactId>
- <version>32</version>
+ <version>34-SNAPSHOT</version>
</parent>
<groupId>org.apache.directory.studio</groupId>
@@ -61,7 +61,7 @@
<studio.dist.url>${project.distributionManagement.repository.url}</studio.dist.url>
<distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/studio/gen-docs/${project.version}</distMgmtSiteUrl>
- <tycho.version>0.20.0</tycho.version>
+ <tycho.version>0.22.0</tycho.version>
<!-- Set versions for dependencies -->
<!-- <com.bandlem.eclipse.fullscreen.version>1.0.4.201108061054</com.bandlem.eclipse.fullscreen.version> -->
@@ -80,8 +80,8 @@
<!-- <org.apache.commons.logging.version>1.1.3</org.apache.commons.logging.version> -->
<org.apache.commons.pool.version>1.6</org.apache.commons.pool.version>
<org.apache.commons.pool.bundleversion>1.6.0</org.apache.commons.pool.bundleversion>
- <org.apache.directory.api.version>1.0.0-M28-SNAPSHOT</org.apache.directory.api.version>
- <org.apache.directory.api.bundleversion>1.0.0.M28-SNAPSHOT</org.apache.directory.api.bundleversion>
+ <org.apache.directory.api.version>1.0.0-M28</org.apache.directory.api.version>
+ <org.apache.directory.api.bundleversion>1.0.0.M28</org.apache.directory.api.bundleversion>
<!-- <org.apache.directory.server.validversion>2.0.0.M17</org.apache.directory.server.validversion> -->
<org.apache.directory.server.version>2.0.0-M20-SNAPSHOT</org.apache.directory.server.version>
<org.apache.directory.server.bundleversion>2.0.0.M20-SNAPSHOT</org.apache.directory.server.bundleversion>
@@ -93,8 +93,8 @@
<!-- <org.apache.xmlgraphics.fop.version>1.0</org.apache.xmlgraphics.fop.version> -->
<org.bouncycastle.bcprov.jdk15.version>140</org.bouncycastle.bcprov.jdk15.version>
<org.bouncycastle.bcprov.jdk15.bundleversion>140.0.0</org.bouncycastle.bcprov.jdk15.bundleversion>
- <org.slf4j.version>1.7.7</org.slf4j.version>
- <org.slf4j.bundleversion>1.7.7</org.slf4j.bundleversion>
+ <org.slf4j.version>1.7.10</org.slf4j.version>
+ <org.slf4j.bundleversion>1.7.10</org.slf4j.bundleversion>
<org.xpp3.version>1.1.0.4c</org.xpp3.version>
<org.xpp3.bundleversion>1.1.0.4c</org.xpp3.bundleversion>
<org.apache.poi.version>3.9</org.apache.poi.version>
@@ -135,6 +135,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<target>
@@ -188,6 +197,12 @@
<version>${tycho.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho.version}</version>
+ </plugin>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>