From: jenkins Date: Fri, 23 Sep 2016 13:15:14 +0000 (+0200) Subject: Updated version in pom / project files to taxeditor version : 4.4.0-SNAPSHOT and... X-Git-Tag: 4.4.0^2~126 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/60b7d5b55997b94a5b884f074634c489c6376c38?hp=-c Updated version in pom / project files to taxeditor version : 4.4.0-SNAPSHOT and cdmlib version : 4.4.0-SNAPSHOT --- 60b7d5b55997b94a5b884f074634c489c6376c38 diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF index 87cc31988..1886bd649 100644 --- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Application Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin Bundle-Vendor: EDIT Bundle-Localization: OSGI-INF/l10n/plugin diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml index 88eea2c91..ae739dce7 100644 --- a/eu.etaxonomy.taxeditor.application/pom.xml +++ b/eu.etaxonomy.taxeditor.application/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF index befab4f7e..f6ec6308b 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Bulkeditor Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin Bundle-Vendor: EDIT Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor, diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml index 7d3d128e5..ada057cbf 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml +++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 63e7f7207..9cda2e9bb 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -28,15 +28,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 2c91b2a00..659c1aa4a 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDM Library Dependencies Plugin Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Eclipse-BundleShape: dir Export-Package: com.google.api, com.google.api.detect, @@ -498,15 +498,15 @@ Bundle-ClassPath: ., lib/batik-util-1.7.jar, lib/batik-xml-1.7.jar, lib/c3p0-0.9.5.2.jar, - lib/cdmlib-commons-4.3.0-SNAPSHOT.jar, - lib/cdmlib-ext-4.3.0-SNAPSHOT.jar, - lib/cdmlib-io-4.3.0-SNAPSHOT.jar, - lib/cdmlib-model-4.3.0-SNAPSHOT.jar, - lib/cdmlib-persistence-4.3.0-SNAPSHOT.jar, - lib/cdmlib-print-4.3.0-SNAPSHOT.jar, - lib/cdmlib-remote-4.3.0-SNAPSHOT.jar, - lib/cdmlib-services-4.3.0-SNAPSHOT.jar, - lib/cdmlib-test-4.3.0-SNAPSHOT.jar, + lib/cdmlib-commons-4.4.0-SNAPSHOT.jar, + lib/cdmlib-ext-4.4.0-SNAPSHOT.jar, + lib/cdmlib-io-4.4.0-SNAPSHOT.jar, + lib/cdmlib-model-4.4.0-SNAPSHOT.jar, + lib/cdmlib-persistence-4.4.0-SNAPSHOT.jar, + lib/cdmlib-print-4.4.0-SNAPSHOT.jar, + lib/cdmlib-remote-4.4.0-SNAPSHOT.jar, + lib/cdmlib-services-4.4.0-SNAPSHOT.jar, + lib/cdmlib-test-4.4.0-SNAPSHOT.jar, lib/cglib-3.2.0.jar, lib/cglib-nodep-3.2.0.jar, lib/classmate-1.3.1.jar, diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties index cece6c35d..5ec193ea8 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/build.properties +++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties @@ -25,15 +25,15 @@ bin.includes = META-INF/,\ lib/batik-util-1.7.jar,\ lib/batik-xml-1.7.jar,\ lib/c3p0-0.9.5.2.jar,\ - lib/cdmlib-commons-4.3.0-SNAPSHOT.jar,\ - lib/cdmlib-ext-4.3.0-SNAPSHOT.jar,\ - lib/cdmlib-io-4.3.0-SNAPSHOT.jar,\ - lib/cdmlib-model-4.3.0-SNAPSHOT.jar,\ - lib/cdmlib-persistence-4.3.0-SNAPSHOT.jar,\ - lib/cdmlib-print-4.3.0-SNAPSHOT.jar,\ - lib/cdmlib-remote-4.3.0-SNAPSHOT.jar,\ - lib/cdmlib-services-4.3.0-SNAPSHOT.jar,\ - lib/cdmlib-test-4.3.0-SNAPSHOT.jar,\ + lib/cdmlib-commons-4.4.0-SNAPSHOT.jar,\ + lib/cdmlib-ext-4.4.0-SNAPSHOT.jar,\ + lib/cdmlib-io-4.4.0-SNAPSHOT.jar,\ + lib/cdmlib-model-4.4.0-SNAPSHOT.jar,\ + lib/cdmlib-persistence-4.4.0-SNAPSHOT.jar,\ + lib/cdmlib-print-4.4.0-SNAPSHOT.jar,\ + lib/cdmlib-remote-4.4.0-SNAPSHOT.jar,\ + lib/cdmlib-services-4.4.0-SNAPSHOT.jar,\ + lib/cdmlib-test-4.4.0-SNAPSHOT.jar,\ lib/cglib-3.2.0.jar,\ lib/cglib-nodep-3.2.0.jar,\ lib/classmate-1.3.1.jar,\ diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml index 704fc08e0..e59963118 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml +++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 eu.etaxonomy.taxeditor.cdmlib diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF index dbee61992..cc25fc29c 100644 --- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Editor Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: OSGI-INF/l10n/plugin diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml index 46e3a116a..ff30b2ddb 100644 --- a/eu.etaxonomy.taxeditor.editor/pom.xml +++ b/eu.etaxonomy.taxeditor.editor/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml b/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml index ac22301de..962531a69 100644 --- a/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml +++ b/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml @@ -2,7 +2,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 eu.etaxonomy.taxeditor.feature.jre.linux64 diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml index a3f2eede2..25874bf27 100644 --- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml +++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml @@ -2,7 +2,7 @@ diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml index 5078c054c..9a3bd7d4e 100644 --- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml +++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 eu.etaxonomy.taxeditor.feature.platform diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml index 2aa44e77c..c6469d47c 100644 --- a/eu.etaxonomy.taxeditor.feature/feature.xml +++ b/eu.etaxonomy.taxeditor.feature/feature.xml @@ -2,7 +2,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 eu.etaxonomy.taxeditor.feature diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF index e7d4cacbc..3fe353b24 100644 --- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Help Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator Bundle-Vendor: EDIT Require-Bundle: org.eclipse.ui, diff --git a/eu.etaxonomy.taxeditor.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml index b434a9674..464845d6b 100644 --- a/eu.etaxonomy.taxeditor.help/pom.xml +++ b/eu.etaxonomy.taxeditor.help/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF index cb7820109..94b1e70f4 100644 --- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-ClassPath: ., lib/bioinfweb-commons-bio-2.0.0-preview-1.jar, lib/bioinfweb-commons-core-2.0.0-preview-1.jar, diff --git a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml index 579b35ede..39427a3d4 100644 --- a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml +++ b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml @@ -7,7 +7,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF index 1bd9d0e4a..889e482ee 100644 --- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Molecular Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eu.etaxonomy.taxeditor.molecular/pom.xml b/eu.etaxonomy.taxeditor.molecular/pom.xml index dd0c3c188..c707be38c 100644 --- a/eu.etaxonomy.taxeditor.molecular/pom.xml +++ b/eu.etaxonomy.taxeditor.molecular/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF index 94ed3a8c6..705263a9d 100644 --- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Navigation Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Vendor: EDIT Export-Package: eu.etaxonomy.cdm, eu.etaxonomy.taxeditor.navigation, diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml index 4b98ea85a..f60f32ce9 100644 --- a/eu.etaxonomy.taxeditor.navigation/pom.xml +++ b/eu.etaxonomy.taxeditor.navigation/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF index 5c210246b..ec3bf8857 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Printpublisher Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Require-Bundle: org.eclipse.osgi, org.eclipse.ui, eu.etaxonomy.taxeditor.cdmlib, diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml index 0a34b8e66..4c8f6d5bc 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml +++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml @@ -3,7 +3,7 @@ taxeditor-parent eu.etaxonomy - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF index 692901e49..f650c3f73 100644 --- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: DataStore Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin Bundle-Vendor: EDIT Export-Package: eu.etaxonomy.cdm, diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml index 23f40114b..ff2aa3117 100644 --- a/eu.etaxonomy.taxeditor.store/pom.xml +++ b/eu.etaxonomy.taxeditor.store/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF index 33a73b718..39e810c6c 100644 --- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Webapp Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Require-Bundle: org.eclipse.core.runtime Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml index 2f7f62c5b..de79000a8 100644 --- a/eu.etaxonomy.taxeditor.webapp/pom.xml +++ b/eu.etaxonomy.taxeditor.webapp/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 eu.etaxonomy.taxeditor.webapp diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product index 7dc1a0d92..e0c70a98b 100644 --- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product +++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product @@ -1,5 +1,5 @@ - + diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre index 045f25caf..417f6c37c 100644 --- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre +++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre @@ -1,7 +1,7 @@ - + diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml index 51b2f3719..acbd592c7 100644 --- a/eu.etaxonomy.taxeditor/pom.xml +++ b/eu.etaxonomy.taxeditor/pom.xml @@ -2,7 +2,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index b57c6c628..4e257b359 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ eu.etaxonomy taxeditor-parent - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT EDIT Taxonomic Editor The Taxonomic Editor for EDIT's platform for cybertaxonomy @@ -18,10 +18,10 @@ 1.7 UTF-8 - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT 0.22.0 - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT snapshot 3.4.2 1.2.17