From 98432a1a606a8ca17137259cf79e9827f47cd20f Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Wed, 15 Jul 2015 08:47:19 +0000
Subject: [PATCH 1/1] - fixed dependencies
---
eu.etaxonomy.taxeditor.molecular/.classpath | 24 ++-
eu.etaxonomy.taxeditor.molecular/.project | 47 ------
.../META-INF/MANIFEST.MF | 27 +--
.../build.properties | 17 +-
eu.etaxonomy.taxeditor.molecular/pom.xml | 159 +++++++++++++-----
5 files changed, 152 insertions(+), 122 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.molecular/.classpath b/eu.etaxonomy.taxeditor.molecular/.classpath
index c5dd8f359..fa2d0d0b9 100644
--- a/eu.etaxonomy.taxeditor.molecular/.classpath
+++ b/eu.etaxonomy.taxeditor.molecular/.classpath
@@ -1,20 +1,18 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/eu.etaxonomy.taxeditor.molecular/.project b/eu.etaxonomy.taxeditor.molecular/.project
index c19e3549e..3826881f3 100644
--- a/eu.etaxonomy.taxeditor.molecular/.project
+++ b/eu.etaxonomy.taxeditor.molecular/.project
@@ -25,51 +25,4 @@
org.eclipse.jdt.core.javanature
org.eclipse.pde.PluginNature
-
-
- bioinfweb-commons-bio-2-SNAPSHOT.jar
- 1
- /home/pplitzner/.m2/repository/info/bioinfweb/commons/java/bioinfweb-commons-bio/2-SNAPSHOT/bioinfweb-commons-bio-2-SNAPSHOT.jar
-
-
- bioinfweb-commons-core-2-SNAPSHOT.jar
- 1
- /home/pplitzner/.m2/repository/info/bioinfweb/commons/java/bioinfweb-commons-core/2-SNAPSHOT/bioinfweb-commons-core-2-SNAPSHOT.jar
-
-
- bioinfweb-commons-swing-2-SNAPSHOT.jar
- 1
- /home/pplitzner/.m2/repository/info/bioinfweb/commons/java/bioinfweb-commons-swing/2-SNAPSHOT/bioinfweb-commons-swing-2-SNAPSHOT.jar
-
-
- bioinfweb-commons-swt-2-SNAPSHOT.jar
- 1
- /home/pplitzner/.m2/repository/info/bioinfweb/commons/java/bioinfweb-commons-swt/2-SNAPSHOT/bioinfweb-commons-swt-2-SNAPSHOT.jar
-
-
- commons-logging-1.1.1.jar
- 1
- /home/pplitzner/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
-
-
- libralign-core-0-SNAPSHOT.jar
- 1
- /home/pplitzner/.m2/repository/info/bioinfweb/libralign/libralign-core/0-SNAPSHOT/libralign-core-0-SNAPSHOT.jar
-
-
- libralign-swt-0-SNAPSHOT.jar
- 1
- /home/pplitzner/.m2/repository/info/bioinfweb/libralign/libralign-swt/0-SNAPSHOT/libralign-swt-0-SNAPSHOT.jar
-
-
- tic-core-2-SNAPSHOT.jar
- 1
- /home/pplitzner/.m2/repository/info/bioinfweb/tic/tic-core/2-SNAPSHOT/tic-core-2-SNAPSHOT.jar
-
-
- tic-swt-2-SNAPSHOT.jar
- 1
- /home/pplitzner/.m2/repository/info/bioinfweb/tic/tic-swt/2-SNAPSHOT/tic-swt-2-SNAPSHOT.jar
-
-
diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
index 5814c8540..c7331abc7 100644
--- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
@@ -7,20 +7,21 @@ Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.expressions,
- eu.etaxonomy.taxeditor.store,
eu.etaxonomy.taxeditor.cdmlib,
- eu.etaxonomy.taxeditor.editor
+ eu.etaxonomy.taxeditor.store,
+ eu.etaxonomy.taxeditor.editor,
+ eu.etaxonomy.taxeditor.bulkeditor
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-Vendor: EDIT
-Bundle-ClassPath: .,
- commons-logging-1.1.1.jar,
- bioinfweb-commons-bio-2-SNAPSHOT.jar,
- bioinfweb-commons-core-2-SNAPSHOT.jar,
- bioinfweb-commons-swing-2-SNAPSHOT.jar,
- bioinfweb-commons-swt-2-SNAPSHOT.jar,
- libralign-core-0-SNAPSHOT.jar,
- libralign-swt-0-SNAPSHOT.jar,
- tic-core-2-SNAPSHOT.jar,
- tic-swt-2-SNAPSHOT.jar
-Import-Package: eu.etaxonomy.cdm.model.molecular
+Bundle-ClassPath: lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,
+ lib/bioinfweb-commons-core-2-SNAPSHOT.jar,
+ lib/bioinfweb-commons-swing-2-SNAPSHOT.jar,
+ lib/bioinfweb-commons-swt-2-SNAPSHOT.jar,
+ lib/libralign-core-0-SNAPSHOT.jar,
+ lib/libralign-swt-0-SNAPSHOT.jar,
+ lib/libralign-biojava1-0-SNAPSHOT.jar,
+ lib/core-1.9.2-SNAPSHOT.jar,
+ lib/sequencing-1.9.2-SNAPSHOT.jar,
+ lib/tic-core-2-SNAPSHOT.jar,
+ lib/tic-swt-2-SNAPSHOT.jar
diff --git a/eu.etaxonomy.taxeditor.molecular/build.properties b/eu.etaxonomy.taxeditor.molecular/build.properties
index 18f963739..2884574bb 100644
--- a/eu.etaxonomy.taxeditor.molecular/build.properties
+++ b/eu.etaxonomy.taxeditor.molecular/build.properties
@@ -1,12 +1,19 @@
-source.. = src/
output.. = bin/
bin.includes = META-INF/,\
plugin.xml,\
- lib/libralign-core-0-20150713.112743-1.jar,\
- lib/libralign-swt-0-20150713.113034-1.jar,\
icons/,\
- OSGI-INF/
-source.. = src/
+ OSGI-INF/,\
+ lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,\
+ lib/bioinfweb-commons-core-2-SNAPSHOT.jar,\
+ lib/bioinfweb-commons-swing-2-SNAPSHOT.jar,\
+ lib/bioinfweb-commons-swt-2-SNAPSHOT.jar,\
+ lib/libralign-core-0-SNAPSHOT.jar,\
+ lib/libralign-swt-0-SNAPSHOT.jar,\
+ lib/libralign-biojava1-0-SNAPSHOT.jar,\
+ lib/core-1.9.2-SNAPSHOT.jar,\
+ lib/sequencing-1.9.2-SNAPSHOT.jar,\
+ lib/tic-core-2-SNAPSHOT.jar,\
+ lib/tic-swt-2-SNAPSHOT.jar
src.includes = src/,\
plugin.xml,\
icons/,\
diff --git a/eu.etaxonomy.taxeditor.molecular/pom.xml b/eu.etaxonomy.taxeditor.molecular/pom.xml
index a30133305..762eed310 100644
--- a/eu.etaxonomy.taxeditor.molecular/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular/pom.xml
@@ -14,50 +14,113 @@
Molecular Bundle
Provides editors, views and operations for handling molecular data and alignments
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.4
+
+
+ copy-dependencies
+ validate
+
+ copy-dependencies
+
+
+ libralign-swt, libralign-core,
+ bioinfweb-commons-swt, bioinfweb-commons-core,
+ bioinfweb-commons-bio, bioinfweb-commons-swing,
+ tic-core, libralign-biojava1, core, sequencing, tic-swt
+ lib
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.7
+
+
+ remove-existing-jars
+ clean
+
+ run
+
+
+
+ Remove all jars
+
+
+
+
+
+
+
+ update-snapshot-jar-names
+ validate
+
+ run
+
+
+
+ Update jars to SNAPSHOT when build with
+ timestamp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
info.bioinfweb.libralign
libralign-core
@@ -73,7 +136,8 @@
libralign-biojava1
0-SNAPSHOT
-
+
info.bioinfweb.commons.java
bioinfweb-commons-swt
2-SNAPSHOT
@@ -93,11 +157,18 @@
bioinfweb-commons-swing
2-SNAPSHOT
+
info.bioinfweb.tic
tic-core
2-SNAPSHOT
+
+ info.bioinfweb.tic
+ tic-swt
+ 2-SNAPSHOT
+
+
org.biojava
core
@@ -107,7 +178,7 @@
org.biojava
sequencing
1.9.2
- -->
+
--
2.34.1