Bumped tycho to version 0.14

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 7029e7238058fe1f191b3dfeb02c700076ab2376..81b7b552e33c6443e057b4e4ed696bdb29da21ba 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -65,7 +65,6 @@ bin.includes = META-INF/,\
                lib/jsr250-api-1.0.jar,\\r
                lib/jta.jar,\\r
                lib/jtds-1.2.2.jar,\\r
-               lib/junit-4.4.jar,\\r
                lib/junit-4.8.1.jar,\\r
                lib/log4j-1.2.14.jar,\\r
                lib/lsid-client-1.1.2.jar,\\r
@@ -132,17 +131,8 @@ bin.includes = META-INF/,\
                lib/cdmlib-services-3.0.10-SNAPSHOT.jar\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
-jre.compilation.profile = J2SE-1.6\r
 bin.excludes = lib/activation-1.1src.zip,\\r
                lib/c3p0-0.9.1src.zip,\\r
-               lib/cdmlib-commons-3.0-sources.jar,\\r
-               lib/cdmlib-ext-3.0-sources.jar,\\r
-               lib/cdmlib-io-3.0-sources.jar,\\r
-               lib/cdmlib-model-3.0-sources.jar,\\r
-               lib/cdmlib-persistence-3.0-sources.jar,\\r
-               lib/cdmlib-print-3.0-sources.jar,\\r
-               lib/cdmlib-remote-3.0-sources.jar,\\r
-               lib/cdmlib-services-3.0-sources.jar,\\r
                lib/commons-beanutils-1.7.0src.zip,\\r
                lib/commons-collections-3.2src.zip,\\r
                lib/commons-dbcp-1.2.2src.zip,\\r
@@ -188,19 +178,8 @@ bin.excludes = lib/activation-1.1src.zip,\
                lib/slf4j-log4j12-1.5.2src.zip,\\r
                lib/spring-modules-cache-0.7src.zip,\\r
                lib/spring-modules-lucene-0.8asrc.zip,\\r
-               lib/spring-security-core-3.0.0.RELEASEsrc.zip,\\r
                lib/wsdl4j-1.6.1src.zip,\\r
                lib/xml-resolver-1.2src.zip,\\r
                lib/xstream-1.3.1src.zip,\\r
-               lib/junit-4.8.1src.zip,\\r
-               lib/cdmlib-services-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.0.6-SNAPSHOT.jar\r
+               lib/junit-4.8.1src.zip\r
 \r

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index f351f7297ef4e848f69f2e770ddaa03fecffd1ce..7cb5220fe12accdb44a48105a0db991e84f2bffd 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -43,6 +43,28 @@
                                        </products>
                                </configuration>
                        </plugin>
+                       <plugin>
+                       <artifactId>maven-antrun-plugin</artifactId>
+                       <executions>
+                         <execution>
+                           <phase>package</phase>
+                           <configuration>
+                             <target>
+
+                               <!--
+                                 Place any Ant task here. You can add anything
+                                 you can add between <target> and </target> in a
+                                 build.xml.
+                               -->
+
+                             </target>
+                           </configuration>
+                           <goals>
+                             <goal>package</goal>
+                           </goals>
+                         </execution>
+                       </executions>
+                     </plugin>
                </plugins>
        </build>
 

diff --git a/pom.xml b/pom.xml
index 672005895a5d212e036bd8140892e0abe6cc54d5..b1ad12be0d45c3997c7c4a70be02880dea2dab1a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <cdmlib.version>3.0.10-SNAPSHOT</cdmlib.version>
-    <tycho.version>0.13.0</tycho.version>
+    <tycho.version>0.14.0</tycho.version>
     <taxeditor.version>3.0.10-SNAPSHOT</taxeditor.version>
   </properties>
   <modules>
@@ -315,6 +315,15 @@
         <version>1.0-beta-2</version>
       </extension>
     </extensions>
+    <pluginManagement>
+      <plugins>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-antrun-plugin</artifactId>
+         <version>1.7</version>
+       </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
   <reporting>
     <plugins>