BGBM BDI Projects / taxeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / pom.xml
diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 3e8048d54ba2a3acf011d08522be20544aacb541..537a4c65ae3aa61e7fec9e9147edbce3c34f6c72 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project>\r
 \r
@@ -595,4 +596,163 @@
     </dependency>\r
     <!-- For Hibernate Mapping End -->\r
   </dependencies>\r
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>eu.etaxonomy</groupId>
+    <artifactId>taxeditor-parent</artifactId>
+    <version>3.6.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <name>CDM Library Dependencies Plugin</name>
+  <description>CDM Library and dependencies as a plugin</description>
+  <build>
+    <plugins>      
+      <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-dependency-plugin</artifactId>
+       <version>2.4</version>
+       <executions>
+         <execution>
+           <id>copy-dependencies</id>
+           <phase>validate</phase>
+           <goals>
+             <goal>copy-dependencies</goal>
+           </goals>
+           <configuration>
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
+             <outputDirectory>lib</outputDirectory>
+             <overWriteReleases>true</overWriteReleases>
+             <overWriteSnapshots>true</overWriteSnapshots>
+             <excludeTransitive>true</excludeTransitive>             
+           </configuration>
+         </execution>
+         <execution>
+           <id>copy-dependencies-sources</id>
+           <phase>validate</phase>
+           <goals>
+             <goal>copy-dependencies</goal>
+           </goals>
+           <configuration>
+             <classifier>sources</classifier>
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
+             <outputDirectory>lib</outputDirectory>
+             <overWriteReleases>true</overWriteReleases>
+             <overWriteSnapshots>true</overWriteSnapshots>
+             <excludeTransitive>true</excludeTransitive>
+             <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+           </configuration>
+         </execution>
+       </executions>
+      </plugin>
+      <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-antrun-plugin</artifactId>
+       <version>1.7</version>
+       <executions>
+         <execution>
+           <id>remove-existing-jars</id>
+           <phase>clean</phase>
+           <goals>
+             <goal>run</goal>
+           </goals>
+           <configuration>
+             <target>
+               <echo>Remove all cdmlib jars</echo>
+               <delete>
+                 <fileset dir="./lib" includes="cdmlib-*" />
+               </delete>
+             </target> 
+           </configuration>
+         </execution>
+         <execution>
+           <id>update-snapshot-jar-names</id>
+           <phase>validate</phase>
+           <goals>
+             <goal>run</goal>
+           </goals>
+           <configuration>           
+             <target>
+               <echo>Update cdmlib jars to SNAPSHOT when build with timestamp</echo>
+               <move todir="./lib">
+                 <fileset dir="./lib" />
+                 <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
+               </move>                           
+               <move todir="./lib">
+                 <fileset dir="./lib" />
+                 <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" to="\1SNAPSHOT\2" />
+               </move>                           
+             </target> 
+           </configuration>
+         </execution>
+       </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>identificationKeyAPI</groupId>
+      <artifactId>identificationKeyAPI</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-commons</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-model</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-persistence</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-remote</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-print</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-services</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-io</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-ext</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+       <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+         <version>1.7.1</version>
+       </dependency>
+         <dependency>
+         <groupId>org.aspectj</groupId>
+         <artifactId>aspectjweaver</artifactId>
+         <version>1.7.1</version>
+        </dependency>
+        
+    <!--  for ikey-plus 
+        TODO this should not be needed but the utils class contained  in this jar 
+        seems to be loaded as bean by spring
+    -->
+  </dependencies>
+>>>>>>> d24b444b7bf4e1bd048f864bcfede121794caddf
 </project>