Project

General

Profile

« Previous | Next » 

Revision f04ebb2b

Added by Cherian Mathew over 8 years ago

Update eclipse compile / runtime to JavaSE-1.7

Conflicts:
eu.etaxonomy.taxeditor.application/.classpath

View differences:

eu.etaxonomy.taxeditor.application/.classpath
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6 6
	<classpathentry kind="src" path="src/test/java"/>
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
8 8
Bundle-Localization: OSGI-INF/l10n/plugin
9 9
Export-Package: eu.etaxonomy.taxeditor
10 10
Bundle-ActivationPolicy: lazy
11
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
11
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
12 12
Import-Package: eu.etaxonomy.cdm.database,
13 13
 org.apache.log4j,
14 14
 org.eclipse.equinox.app,
eu.etaxonomy.taxeditor.bulkeditor/.classpath
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6 6
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
19 19
 org.eclipse.core.expressions,
20 20
 eu.etaxonomy.taxeditor.store,
21 21
 eu.etaxonomy.taxeditor.cdmlib
22
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
22
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
23 23
Bundle-ActivationPolicy: lazy
24 24
Import-Package: eu.etaxonomy.taxeditor.editor,
25 25
 org.eclipse.core.runtime,
eu.etaxonomy.taxeditor.cdmlib/.classpath
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry kind="src" path="src/main/java"/>
6 6
	<classpathentry kind="src" path="src/main/resources"/>
......
193 193
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.12.0-SNAPSHOT.jar"/>
194 194
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.12.0-SNAPSHOT.jar"/>
195 195
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.12.0-SNAPSHOT.jar"/>
196
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar"/>
196
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar" sourcepath="/home/cmathew/.m2/repository/eu/etaxonomy/cdmlib-persistence/3.12.0-SNAPSHOT/cdmlib-persistence-3.12.0-SNAPSHOT-sources.jar"/>
197 197
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.12.0-SNAPSHOT.jar"/>
198 198
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.12.0-SNAPSHOT.jar"/>
199 199
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.12.0-SNAPSHOT.jar"/>
200 200
	<classpathentry kind="output" path="target/classes"/>
201 201
</classpath>
202

  
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
467 467
   org.springframework.ui,
468 468
   javax.servlet.http"
469 469
Bundle-Vendor: EDIT
470
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
470
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
471 471
Require-Bundle: org.eclipse.osgi,
472 472
 org.eclipse.equinox.common,
473 473
 org.apache.commons.httpclient;bundle-version="3.1.0",
eu.etaxonomy.taxeditor.editor/.classpath
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
7
	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
8
	<classpathentry kind="output" path="target/classes"/>
9
</classpath>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
7
	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
8
	<classpathentry kind="output" path="target/classes"/>
9
</classpath>
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
29 29
 org.eclipse.zest.layouts,
30 30
 eu.etaxonomy.taxeditor.cdmlib,
31 31
 org.eclipse.ui.ide
32
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
32
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
33 33
Bundle-ActivationPolicy: lazy
34 34
Import-Package: org.eclipse.core.databinding.beans,
35 35
 org.eclipse.core.databinding.observable.list,
eu.etaxonomy.taxeditor.help/.classpath
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry kind="src" path="src"/>
6
	<classpathentry kind="output" path="target"/>
7
</classpath>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry kind="src" path="src"/>
6
	<classpathentry kind="output" path="target"/>
7
</classpath>
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
9 9
 org.eclipse.core.runtime,
10 10
 org.eclipse.help.ui,
11 11
 org.eclipse.help.webapp
12
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
12
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
13 13
Bundle-ActivationPolicy: lazy
eu.etaxonomy.taxeditor.molecular.lib/.classpath
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-bio-2-SNAPSHOT.jar"/>
6 6
	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-core-2-SNAPSHOT.jar"/>
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
162 162
Bundle-ActivationPolicy: lazy
163 163
Import-Package: javax.swing
164 164
Require-Bundle: org.eclipse.swt
165
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
eu.etaxonomy.taxeditor.molecular/.classpath
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6 6
	<classpathentry kind="output" path="target/classes"/>
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
13 13
 eu.etaxonomy.taxeditor.editor,
14 14
 eu.etaxonomy.taxeditor.store,
15 15
 eu.etaxonomy.taxeditor.molecular.lib
16
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
16
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
17 17
Bundle-ActivationPolicy: lazy
18 18
Bundle-Vendor: EDIT
19 19
Export-Package: eu.etaxonomy.taxeditor.molecular,
eu.etaxonomy.taxeditor.navigation/.classpath
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
7
	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
8
	<classpathentry kind="output" path="target/classes"/>
9
</classpath>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
7
	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
8
	<classpathentry kind="output" path="target/classes"/>
9
</classpath>
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
27 27
 org.eclipse.ui.forms.widgets,
28 28
 org.osgi.framework
29 29
Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
30
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
30
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
31 31
Bundle-ClassPath: .,
32 32
 activation-1.1.jar,
33 33
 antlr-2.7.6.jar,
eu.etaxonomy.taxeditor.printpublisher/.classpath
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6 6
	<classpathentry kind="output" path="target/classes"/>
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
15 15
Bundle-ActivationPolicy: lazy
16 16
Bundle-Vendor: EDIT
17 17
Bundle-Activator: eu.etaxonomy.taxeditor.printpublisher.internal.PrintpublisherPlugin
18
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
18
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
19 19
Bundle-ClassPath: .,
20 20
 activation-1.1.jar,
21 21
 antlr-2.7.6.jar,
eu.etaxonomy.taxeditor.store/.classpath
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
7
	<classpathentry kind="src" path="src/main/resources"/>
8
	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
9
	<classpathentry kind="output" path="target/classes"/>
10
</classpath>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
7
	<classpathentry kind="src" path="src/main/resources"/>
8
	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
9
	<classpathentry kind="output" path="target/classes"/>
10
</classpath>
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
90 90
 org.osgi.framework,
91 91
 org.osgi.service.prefs;version="1.1.1"
92 92
Bundle-ActivationPolicy: lazy
93
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
93
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
94 94
Bundle-ClassPath: .,
95 95
 activation-1.1.1.jar,
96 96
 antlr-2.7.7.jar,
eu.etaxonomy.taxeditor.test/.classpath
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
6 6
	<classpathentry excluding="**/*.java" kind="src" path="src/test/resources"/>
eu.etaxonomy.taxeditor.test/.settings/org.eclipse.jdt.core.prefs
1 1
eclipse.preferences.version=1
2 2
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4
org.eclipse.jdt.core.compiler.compliance=1.6
3
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4
org.eclipse.jdt.core.compiler.compliance=1.7
5 5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
6 6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7
org.eclipse.jdt.core.compiler.source=1.6
7
org.eclipse.jdt.core.compiler.source=1.7
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
5 5
Bundle-Version: 3.12.0.qualifier
6 6
Bundle-ActivationPolicy: lazy
7 7
Bundle-Vendor: EDIT
8
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
8
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
9 9
Require-Bundle: org.eclipse.ui,
10 10
 org.eclipse.core.runtime,
11 11
 org.eclipse.ui.ide,
12 12
 org.junit;bundle-version="4.8.2",
13
 eu.etaxonomy.taxeditor.webapp,
13 14
 eu.etaxonomy.taxeditor.cdmlib,
14 15
 eu.etaxonomy.taxeditor.bulkeditor,
15 16
 eu.etaxonomy.taxeditor.editor,
......
30 31
 lib/unitils-dbmaintainer-3.4.2.jar,
31 32
 lib/unitils-dbunit-3.4.2.jar,
32 33
 lib/unitils-spring-3.4.2.jar,
33
 lib/dbunit-2.4.9.jar
34
 lib/dbunit-2.4.9.jar
eu.etaxonomy.taxeditor/.classpath
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.application"/>
4
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.bulkeditor"/>
5
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.cdmlib"/>
6
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.editor"/>
7
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.navigation"/>
8
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.printpublisher"/>
9
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.store"/>
10
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
11
	<classpathentry kind="output" path="target/classes"/>
12
</classpath>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.application"/>
5
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.bulkeditor"/>
6
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.cdmlib"/>
7
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.editor"/>
8
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.navigation"/>
9
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.printpublisher"/>
10
	<classpathentry kind="src" path="/eu.etaxonomy.taxeditor.store"/>
11
	<classpathentry kind="output" path="target/classes"/>
12
</classpath>

Also available in: Unified diff