Project

General

Profile

Download (14.9 KB) Statistics
| Branch: | Tag: | Revision:

taxeditor/pom.xml @ 2f590a3e

# Date Author Comment
d637e4ba 09/03/2015 05:11 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java...
7d7c5562 08/24/2015 11:34 AM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java...
b7c9ffee 08/18/2015 02:56 PM Patrick Plitzner

Merge branch 'develop' into LibrAlign
40243bd5 08/18/2015 01:47 PM Cherian Mathew

Correct config for molecular plugin
1bb3e750 08/17/2015 12:52 PM Patrick Plitzner

test commit
64564a32 07/22/2015 11:44 AM Patrick Plitzner

Rename aggregator to lib
104f6c96 07/22/2015 10:27 AM Cherian Mathew

Integrate molecular plugins
ad69c198 07/17/2015 06:07 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...
9c0b77f7 07/17/2015 12:07 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
8a1dc5ff 07/17/2015 12:06 PM jenkins

Updating develop poms back to pre merge state
b5419659 07/17/2015 12:00 PM jenkins

Correct for develop reset
be976ace 07/17/2015 11:53 AM jenkins

updating poms for branch'release/3.7.0' with non-snapshot versions
d4d1f350 07/17/2015 11:52 AM jenkins

Revert project versions to 3.7.0-SNAPSHOT
f95e215b 07/17/2015 11:51 AM jenkins

Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0
385fa280 07/17/2015 11:50 AM jenkins

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
0d319bba 07/17/2015 11:48 AM jenkins

updating poms for 3.7.0 branch with snapshot versions
d21d6eec 07/17/2015 11:47 AM jenkins

Revert project versions to 3.7.0-SNAPSHOT
6a39e02b 07/16/2015 06:20 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
004f558b 07/16/2015 05:47 PM Cherian Mathew

Remove unnecessary comment
ae8eab5f 07/16/2015 11:36 AM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
d2c2fbfc 07/16/2015 11:35 AM jenkins

Updating develop poms back to pre merge state
1828f87a 07/15/2015 06:31 PM jenkins

updating poms for branch'release/3.7.0' with non-snapshot versions
1842f4ff 07/15/2015 06:30 PM jenkins

Revert project versions to 3.7.0-SNAPSHOT
35d9b762 07/15/2015 06:29 PM jenkins

Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0
2b70bb2c 07/15/2015 06:26 PM jenkins

updating poms for 3.7.0 branch with snapshot versions
575cab92 07/15/2015 05:57 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
35e3b06e 07/15/2015 05:26 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
102ed16c 07/15/2015 05:25 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
a3dc6527 07/15/2015 05:21 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
f63c8f53 07/15/2015 05:03 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
35f1bdd2 07/15/2015 05:02 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
cc43d828 07/15/2015 05:00 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
34377444 07/15/2015 04:52 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
b7b91be9 07/15/2015 04:51 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
2eeb388f 07/15/2015 04:50 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
4e1119d7 07/15/2015 04:03 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
29a6d25a 07/15/2015 04:01 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
3dbbe399 07/15/2015 03:56 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
6215c3a6 07/15/2015 03:49 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
1927728a 07/15/2015 03:49 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
de0ecbd7 07/15/2015 03:47 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
044b193c 07/15/2015 03:31 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
95d60366 07/15/2015 03:31 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
880412d5 07/15/2015 03:29 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
168c15e8 07/15/2015 03:26 PM Cherian Mathew

Correct jgitflow plugin dependency
dc7c101f 07/15/2015 03:17 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
5cf2562b 07/15/2015 03:17 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
84bdee47 07/15/2015 02:25 PM Cherian Mathew

Update jgitlfow version
63b69f9e 07/15/2015 02:14 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
19a8bfe7 06/24/2015 09:40 AM Cherian Mathew

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
8b7b09a5 06/23/2015 06:22 PM Cherian Mathew

Update cdmlib version to 3.6.3-SNAPSHOT
dde2b107 06/18/2015 03:17 PM Cherian Mathew

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/.gitignore
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java...
608f7100 06/11/2015 10:50 AM Cherian Mathew

corrected merge to latest snapshot version
updated hibernate config file and test db
setup testing framework with jetty and maven
9ee1c500 06/08/2015 12:13 PM Cherian Mathew

fixed update to snapshot
36ea2506 06/08/2015 10:26 AM Cherian Mathew

corrected cdmlib version to snapshot
e8458b29 06/05/2015 06:16 PM Cherian Mathew

Updating develop poms back to pre merge state
0c924c07 06/05/2015 06:16 PM Cherian Mathew

updating poms for branch'hotfix/3.6.1' with non-snapshot versions
e51599a4 06/05/2015 06:15 PM Cherian Mathew

version updates for 3.6.1
dba3d0c2 06/05/2015 05:55 PM Cherian Mathew

updating poms for branch '3.6.1' with snapshot versions
5b9d4ad5 06/05/2015 04:42 PM Cherian Mathew

Release 3.6.0 merge
bf33700a 06/05/2015 04:31 PM Cherian Mathew

merged jgitfow plugin
77e0343c 06/05/2015 04:12 PM Cherian Mathew

merged for gitflow plugin
ea69c633 06/05/2015 04:07 PM Cherian Mathew

added jgitflow plugin
43c0aada 06/05/2015 01:23 PM Cherian Mathew

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...
02176688 06/04/2015 03:49 PM edit-jenkins

Updated version in config files to 3.6.1-SNAPSHOT
ebd5e5e5 06/04/2015 02:58 PM edit-jenkins

Updated version in config files to 3.6.0
93b0eb6b 06/03/2015 01:56 PM Cherian Mathew

eu.etaxonomy.taxeditor.cdmlib/.classpath, eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF, eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF : moved test jars to test project
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF : added packages required by test project to exported package list...
9b10f34c 05/04/2015 02:43 PM edit-jenkins

Updated version in config files to 3.5.2-SNAPSHOT
dec40d07 05/04/2015 02:38 PM edit-jenkins

Updated version in config files to 3.5.1
6dcccd22 03/25/2015 01:47 PM edit-jenkins

Updated version in config files to 3.5.1-SNAPSHOT
688085e0 03/25/2015 01:40 PM edit-jenkins

Updated version in config files to 3.5.0
3007681b 03/24/2015 06:00 PM Cherian Mathew

missed in last commit
74d26d4c 03/23/2015 06:21 PM Cherian Mathew

added comments
0c737257 03/23/2015 06:15 PM Cherian Mathew

eu.etaxonomy.taxeditor/pom.xml, eu.etaxonomy.taxeditor.product.with.jre/wo.jre : configuration for product bundled with jre
eu.etaxonomy.taxeditor.feature/pom.xml, build.properties.with.jre/wo.jre : configuration for jre dir symlinks and root dir properties...
08576422 03/20/2015 12:58 AM Andreas Müller

update taxeditor version from 3.4.1 to 3.5.0
8cc3a22a 03/19/2015 04:38 PM Cherian Mathew

updating tycho version to 0.22.0
a8e762da 03/19/2015 04:36 PM Cherian Mathew

wrong target revision in the last commit
b19a1b74 03/19/2015 04:25 PM Cherian Mathew

reverting back wrongly committed files
68fe5da5 03/19/2015 04:16 PM Cherian Mathew

Updated version in config files to 3.4.1-SNAPSHOT
91759c63 03/19/2015 04:11 PM Cherian Mathew

Updated version in config files to 3.4.0
0393a168 12/15/2014 06:15 PM edit-jenkins

Updated version in config files to 3.4.1-SNAPSHOT
52a70f7b 12/15/2014 05:37 PM edit-jenkins

Updated version in config files to 3.4.0
7a46f22e 10/28/2014 05:52 PM Cherian Mathew

eu.etaxonomy.taxeditor/pom.xml : reverted addition of nebula widget jars
pom.xml : changed nebula repository to archived one
eu.etaxonomy.taxeditor/rcp.target : changed composite table jar widget to the one in the repository
029fff36 10/09/2014 02:51 PM Patrick Plitzner

increased version number
dc53482f 09/22/2014 03:36 PM Patrick Plitzner

nothing
51c00d67 09/22/2014 03:34 PM Patrick Plitzner

nothing
1c869e72 09/17/2014 02:39 PM Patrick Plitzner

merge-update from trunk
0d291022 09/15/2014 02:38 PM Cherian Mathew

adding signing of jars to maven package phase
P2Util : added snapshot dir to list of hardocded sites
eu.etaxonomy.taxeditor/pom.xml : added signJars and uploadRepo (from parent pom) profiles
pom.xml : removed uploadRepo (from parent pom) profile
feature.xml : removed update configurator plugin as it clashes with simple configurator
d98c659b 09/10/2014 02:57 PM Patrick Plitzner

merge-update from trunk
e48f844f 09/09/2014 02:53 PM Cherian Mathew

added profile for uploading plugins to update site
59be9831 09/09/2014 01:15 PM Patrick Plitzner

merge-update from trunk
ed6e20d7 09/04/2014 05:32 PM edit-jenkins

Updated version in config files to 3.3.8-SNAPSHOT
14f96448 09/04/2014 05:06 PM edit-jenkins

Updated version in config files to 3.3.7
b9e77111 07/21/2014 10:35 AM Patrick Plitzner

merge-update from trunk
80168e3c 07/08/2014 03:34 PM edit-jenkins

Updated version in config files to 3.3.7-SNAPSHOT
43c9550c 07/08/2014 03:20 PM edit-jenkins

Updated version in config files to 3.3.6
dd863ea4 06/19/2014 02:47 PM Patrick Plitzner

increased version number in parent pom
eca44d67 05/30/2014 11:12 AM edit-jenkins

Updated version in config files to 3.3.6-SNAPSHOT
652b7ec4 05/30/2014 11:02 AM edit-jenkins

Updated version in config files to 3.3.5
5463839b 05/14/2014 01:22 PM edit-jenkins

Updated version in config files to 3.3.5-SNAPSHOT