diff --git a/.gitignore b/.gitignore index 370f608589..ef063ec9b2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,9 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +# Maven artifacts target/ +.flattened-pom.xml # Ignore private and public keys *id_rsa* @@ -35,3 +37,4 @@ target/ *.log /backend/src-common/src/main/resources/sw360.properties + diff --git a/backend/pom.xml b/backend/pom.xml index c35ea1ded6..7d2a646996 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -17,7 +17,7 @@ org.eclipse.sw360 sw360 - 3.4.0-SNAPSHOT + ${revision} backend diff --git a/backend/src-common/pom.xml b/backend/src-common/pom.xml index e8afc3528a..d0c899a965 100644 --- a/backend/src-common/pom.xml +++ b/backend/src-common/pom.xml @@ -15,7 +15,7 @@ backend org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/backend/src/pom.xml b/backend/src/pom.xml index 0288ea6316..6850e18e92 100644 --- a/backend/src/pom.xml +++ b/backend/src/pom.xml @@ -19,7 +19,7 @@ org.eclipse.sw360 backend - 3.4.0-SNAPSHOT + ${revision} backend-src diff --git a/backend/src/src-attachments/pom.xml b/backend/src/src-attachments/pom.xml index f712aa8eb8..7e323f07ac 100644 --- a/backend/src/src-attachments/pom.xml +++ b/backend/src/src-attachments/pom.xml @@ -22,19 +22,10 @@ org.eclipse.sw360 backend-src - 3.4.0-SNAPSHOT + ${revision} src-attachments jar src-attachments - - - - cedric.bodet@tngtech.com - - - johannes.najjar@tngtech.com - - diff --git a/backend/src/src-codescoop/pom.xml b/backend/src/src-codescoop/pom.xml index 2c1a261e6b..6545121acb 100644 --- a/backend/src/src-codescoop/pom.xml +++ b/backend/src/src-codescoop/pom.xml @@ -44,16 +44,10 @@ org.eclipse.sw360 backend-src - 3.4.0-SNAPSHOT + ${revision} src-codescoop jar src-codescoop - - - - alex.skorohod@codescoop.com - - diff --git a/backend/src/src-components/pom.xml b/backend/src/src-components/pom.xml index 9e124ab30a..a1fc26dec1 100644 --- a/backend/src/src-components/pom.xml +++ b/backend/src/src-components/pom.xml @@ -13,30 +13,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - - org.eclipse.sw360 - src-attachments - 3.4.0-SNAPSHOT - - org.eclipse.sw360 backend-src - 3.4.0-SNAPSHOT + ${revision} src-components jar src-components - - - cedric.bodet@tngtech.com - - - johannes.najjar@tngtech.com - - + + + org.eclipse.sw360 + src-attachments + ${project.version} + + diff --git a/backend/src/src-cvesearch/pom.xml b/backend/src/src-cvesearch/pom.xml index 01bddbba76..667b59b040 100644 --- a/backend/src/src-cvesearch/pom.xml +++ b/backend/src/src-cvesearch/pom.xml @@ -14,40 +14,32 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + + org.eclipse.sw360 + backend-src + ${revision} + + + src-cvesearch + jar + src-cvesearch + org.eclipse.sw360 datahandler - 3.4.0-SNAPSHOT + ${project.version} + + org.eclipse.sw360 + src-vulnerabilities + ${project.version} + com.google.code.gson gson 2.8.0 - - org.eclipse.sw360 - src-vulnerabilities - 3.4.0-SNAPSHOT - - - - - org.eclipse.sw360 - backend-src - 3.4.0-SNAPSHOT - - - - - birgit.heydenreich@tngtech.com - - - maximilian.huber@tngtech.com - - - - src-cvesearch - jar - src-cvesearch + diff --git a/backend/src/src-fossology/pom.xml b/backend/src/src-fossology/pom.xml index 45e4482c26..f47c6bd1b6 100644 --- a/backend/src/src-fossology/pom.xml +++ b/backend/src/src-fossology/pom.xml @@ -16,25 +16,13 @@ org.eclipse.sw360 backend-src - 3.4.0-SNAPSHOT + ${revision} src-fossology jar src-fossology - - - cedric.bodet@tngtech.com - - - johannes.najjar@tngtech.com - - - daniele.fognini@tngtech.com - - - com.jcraft @@ -57,5 +45,4 @@ ${spring.version} - diff --git a/backend/src/src-licenseinfo/pom.xml b/backend/src/src-licenseinfo/pom.xml index 0f2b5ddfcd..4f5238b599 100644 --- a/backend/src/src-licenseinfo/pom.xml +++ b/backend/src/src-licenseinfo/pom.xml @@ -11,6 +11,16 @@ 4.0.0 + + + org.eclipse.sw360 + backend-src + ${revision} + + + src-licenseinfo + jar + src-licenseinfo @@ -24,6 +34,11 @@ + + org.eclipse.sw360 + src-attachments + ${project.version} + junit junit @@ -36,11 +51,6 @@ 1.12.0 test - - org.eclipse.sw360 - src-attachments - 3.4.0-SNAPSHOT - org.spdx spdx-tools @@ -101,22 +111,4 @@ test - - org.eclipse.sw360 - backend-src - 3.4.0-SNAPSHOT - - - src-licenseinfo - jar - src-licenseinfo - - - - alex.borodin@evosoft.com - - - maximilian.huber@tngtech.com - - diff --git a/backend/src/src-licenses/pom.xml b/backend/src/src-licenses/pom.xml index a7aebf0cce..e2cadd6ff7 100644 --- a/backend/src/src-licenses/pom.xml +++ b/backend/src/src-licenses/pom.xml @@ -13,6 +13,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + + org.eclipse.sw360 + backend-src + ${revision} + + + src-licenses + jar + src-licenses + org.spdx @@ -31,21 +42,4 @@ 3.8.1 - - - org.eclipse.sw360 - backend-src - 3.4.0-SNAPSHOT - - - src-licenses - jar - src-licenses - - - - cedric.bodet@tngtech.com - - - - \ No newline at end of file + diff --git a/backend/src/src-moderation/pom.xml b/backend/src/src-moderation/pom.xml index 0e086b0772..9eb82cf62b 100644 --- a/backend/src/src-moderation/pom.xml +++ b/backend/src/src-moderation/pom.xml @@ -15,7 +15,7 @@ backend-src org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -23,19 +23,11 @@ jar src-moderation - - - cedric.bodet@tngtech.com - - - johannes.najjar@tngtech.com - - org.eclipse.sw360 src-licenses - 3.4.0-SNAPSHOT + ${project.version} diff --git a/backend/src/src-projects/pom.xml b/backend/src/src-projects/pom.xml index 939ef0f31c..bd8b489c5b 100644 --- a/backend/src/src-projects/pom.xml +++ b/backend/src/src-projects/pom.xml @@ -16,7 +16,7 @@ backend-src org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -24,20 +24,11 @@ jar src-projects - - - cedric.bodet@tngtech.com - - - johannes.najjar@tngtech.com - - org.eclipse.sw360 src-attachments - 3.4.0-SNAPSHOT + ${project.version} - diff --git a/backend/src/src-schedule/pom.xml b/backend/src/src-schedule/pom.xml index bd4f49e2bc..11d000ca0f 100644 --- a/backend/src/src-schedule/pom.xml +++ b/backend/src/src-schedule/pom.xml @@ -14,33 +14,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - - org.eclipse.sw360 - datahandler - 3.4.0-SNAPSHOT - - - + org.eclipse.sw360 backend-src - 3.4.0-SNAPSHOT + ${revision} - - - birgit.heydenreich@tngtech.com - - - maximilian.huber@tngtech.com - - - stefan.jaeger@evosoft.com - - - src-schedule jar src-schedule + + + + org.eclipse.sw360 + datahandler + ${project.version} + + diff --git a/backend/src/src-search/pom.xml b/backend/src/src-search/pom.xml index d79c577df5..53e2279e09 100644 --- a/backend/src/src-search/pom.xml +++ b/backend/src/src-search/pom.xml @@ -15,11 +15,10 @@ org.eclipse.sw360 backend-src - 3.4.0-SNAPSHOT + ${revision} src-search jar src-search - diff --git a/backend/src/src-users/pom.xml b/backend/src/src-users/pom.xml index 271a2804cd..35e0d99f0e 100644 --- a/backend/src/src-users/pom.xml +++ b/backend/src/src-users/pom.xml @@ -17,11 +17,10 @@ backend-src org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} src-users jar src-users - - \ No newline at end of file + diff --git a/backend/src/src-vendors/pom.xml b/backend/src/src-vendors/pom.xml index 66e7abb90f..3fb6889787 100644 --- a/backend/src/src-vendors/pom.xml +++ b/backend/src/src-vendors/pom.xml @@ -12,13 +12,14 @@ + backend-src org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} + 4.0.0 - src-vendors jar - \ No newline at end of file + diff --git a/backend/src/src-vulnerabilities/pom.xml b/backend/src/src-vulnerabilities/pom.xml index e8e435300f..8bd8edc136 100644 --- a/backend/src/src-vulnerabilities/pom.xml +++ b/backend/src/src-vulnerabilities/pom.xml @@ -17,19 +17,13 @@ org.eclipse.sw360 backend-src - 3.4.0-SNAPSHOT + ${revision} src-vulnerabilities jar src-vulnerabilities - - - stefan.jaeger@evosoft.com - - - com.googlecode.json-simple diff --git a/backend/src/src-wsimport/pom.xml b/backend/src/src-wsimport/pom.xml index 3624a68757..20628fd4be 100644 --- a/backend/src/src-wsimport/pom.xml +++ b/backend/src/src-wsimport/pom.xml @@ -16,7 +16,7 @@ org.eclipse.sw360 backend-src - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -36,10 +36,4 @@ 1.1.1 - - - - ksoranko@verifa.io - - diff --git a/backend/svc-common/pom.xml b/backend/svc-common/pom.xml index a8a7e9d479..9eca7bd8c1 100644 --- a/backend/svc-common/pom.xml +++ b/backend/svc-common/pom.xml @@ -15,7 +15,7 @@ backend org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/backend/svc/pom.xml b/backend/svc/pom.xml index ed4b0c1c44..1a262c4f20 100644 --- a/backend/svc/pom.xml +++ b/backend/svc/pom.xml @@ -19,7 +19,7 @@ org.eclipse.sw360 backend - 3.4.0-SNAPSHOT + ${revision} backend-svc diff --git a/backend/svc/svc-attachments/pom.xml b/backend/svc/svc-attachments/pom.xml index 026f2dc484..ce23b36888 100644 --- a/backend/svc/svc-attachments/pom.xml +++ b/backend/svc/svc-attachments/pom.xml @@ -14,22 +14,13 @@ org.eclipse.sw360 backend-svc - 3.4.0-SNAPSHOT + ${revision} svc-attachments war svc-attachments - - - cedric.bodet@tngtech.com - - - johannes.najjar@tngtech.com - - - attachments diff --git a/backend/svc/svc-codescoop/pom.xml b/backend/svc/svc-codescoop/pom.xml index 54ef29be51..43c12621c5 100644 --- a/backend/svc/svc-codescoop/pom.xml +++ b/backend/svc/svc-codescoop/pom.xml @@ -16,19 +16,13 @@ org.eclipse.sw360 backend-svc - 3.4.0-SNAPSHOT + ${revision} 4.0.0 svc-codescoop war - - - alex.skorohod@codescoop.com - - - codescoop diff --git a/backend/svc/svc-components/pom.xml b/backend/svc/svc-components/pom.xml index 639c16ab7f..d25bebff3d 100644 --- a/backend/svc/svc-components/pom.xml +++ b/backend/svc/svc-components/pom.xml @@ -17,25 +17,13 @@ org.eclipse.sw360 backend-svc - 3.4.0-SNAPSHOT + ${revision} svc-components war svc-components - - - cedric.bodet@tngtech.com - - - daniele.fognini@tngtech.com - - - johannes.najjar@tngtech.com - - - components @@ -77,4 +65,4 @@ - \ No newline at end of file + diff --git a/backend/svc/svc-cvesearch/pom.xml b/backend/svc/svc-cvesearch/pom.xml index 1ffde0a3ca..7e84ffa2da 100644 --- a/backend/svc/svc-cvesearch/pom.xml +++ b/backend/svc/svc-cvesearch/pom.xml @@ -17,22 +17,13 @@ backend-svc org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 svc-cvesearch war - - - birgit.heydenreich@tngtech.com - - - maximilian.huber@tngtech.com - - - cvesearch diff --git a/backend/svc/svc-fossology/pom.xml b/backend/svc/svc-fossology/pom.xml index 133b284477..c78a2ea851 100644 --- a/backend/svc/svc-fossology/pom.xml +++ b/backend/svc/svc-fossology/pom.xml @@ -16,24 +16,13 @@ org.eclipse.sw360 backend-svc - 3.4.0-SNAPSHOT + ${revision} svc-fossology war svc-fossology - - - cedric.bodet@tngtech.com - - - johannes.najjar@tngtech.com - - - daniele.fognini@tngtech.com - - @@ -77,4 +66,4 @@ - \ No newline at end of file + diff --git a/backend/svc/svc-licenseinfo/pom.xml b/backend/svc/svc-licenseinfo/pom.xml index 10955dbba6..9b6f4c3355 100644 --- a/backend/svc/svc-licenseinfo/pom.xml +++ b/backend/svc/svc-licenseinfo/pom.xml @@ -14,19 +14,13 @@ org.eclipse.sw360 backend-svc - 3.4.0-SNAPSHOT + ${revision} svc-licenseinfo war svc-licenseinfo - - - alex.borodin@evosoft.com - - - licenseinfo diff --git a/backend/svc/svc-licenses/pom.xml b/backend/svc/svc-licenses/pom.xml index 0f5c3fdbae..ee077b01f9 100644 --- a/backend/svc/svc-licenses/pom.xml +++ b/backend/svc/svc-licenses/pom.xml @@ -17,19 +17,13 @@ org.eclipse.sw360 backend-svc - 3.4.0-SNAPSHOT + ${revision} svc-licenses war svc-licenses - - - cedric.bodet@tngtech.com - - - licenses @@ -70,4 +64,4 @@ jar - \ No newline at end of file + diff --git a/backend/svc/svc-moderation/pom.xml b/backend/svc/svc-moderation/pom.xml index 16f4c7bff8..00fed9574a 100644 --- a/backend/svc/svc-moderation/pom.xml +++ b/backend/svc/svc-moderation/pom.xml @@ -15,7 +15,7 @@ backend-svc org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -23,15 +23,6 @@ war svc-moderation - - - cedric.bodet@tngtech.com - - - johannes.najjar@tngtech.com - - - moderation @@ -72,4 +63,4 @@ jar - \ No newline at end of file + diff --git a/backend/svc/svc-projects/pom.xml b/backend/svc/svc-projects/pom.xml index 5351a314fc..2a08a1b435 100644 --- a/backend/svc/svc-projects/pom.xml +++ b/backend/svc/svc-projects/pom.xml @@ -16,7 +16,7 @@ backend-svc org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -24,15 +24,6 @@ war svc-projects - - - cedric.bodet@tngtech.com - - - johannes.najjar@tngtech.com - - - projects @@ -73,4 +64,4 @@ jar - \ No newline at end of file + diff --git a/backend/svc/svc-schedule/pom.xml b/backend/svc/svc-schedule/pom.xml index 9ad436d593..3b2468b328 100644 --- a/backend/svc/svc-schedule/pom.xml +++ b/backend/svc/svc-schedule/pom.xml @@ -17,22 +17,13 @@ backend-svc org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 svc-schedule war - - - birgit.heydenreich@tngtech.com - - - maximilian.huber@tngtech.com - - - schedule diff --git a/backend/svc/svc-search/pom.xml b/backend/svc/svc-search/pom.xml index 2bc7c402db..459a8b708b 100644 --- a/backend/svc/svc-search/pom.xml +++ b/backend/svc/svc-search/pom.xml @@ -15,7 +15,7 @@ org.eclipse.sw360 backend-svc - 3.4.0-SNAPSHOT + ${revision} svc-search diff --git a/backend/svc/svc-users/pom.xml b/backend/svc/svc-users/pom.xml index ed164142b4..0602e66310 100644 --- a/backend/svc/svc-users/pom.xml +++ b/backend/svc/svc-users/pom.xml @@ -17,7 +17,7 @@ backend-svc org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} svc-users @@ -64,4 +64,4 @@ - \ No newline at end of file + diff --git a/backend/svc/svc-vendors/pom.xml b/backend/svc/svc-vendors/pom.xml index 239d32257a..2089f72baa 100644 --- a/backend/svc/svc-vendors/pom.xml +++ b/backend/svc/svc-vendors/pom.xml @@ -15,7 +15,7 @@ backend-svc org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/backend/svc/svc-vulnerabilities/pom.xml b/backend/svc/svc-vulnerabilities/pom.xml index 245bc3a8ab..706b36ae37 100644 --- a/backend/svc/svc-vulnerabilities/pom.xml +++ b/backend/svc/svc-vulnerabilities/pom.xml @@ -17,19 +17,13 @@ org.eclipse.sw360 backend-svc - 3.4.0-SNAPSHOT + ${revision} svc-vulnerabilities war svc-vulnerabilities - - - stefan.jaeger@evosoft.com - - - vulnerabilities diff --git a/backend/svc/svc-wsimport/pom.xml b/backend/svc/svc-wsimport/pom.xml index cbc301ba13..edb0267447 100644 --- a/backend/svc/svc-wsimport/pom.xml +++ b/backend/svc/svc-wsimport/pom.xml @@ -17,7 +17,7 @@ org.eclipse.sw360 backend-svc - 3.4.0-SNAPSHOT + ${revision} svc-wsimport @@ -64,10 +64,4 @@ jar - - - - ksoranko@verifa.io - - diff --git a/backend/utils/pom.xml b/backend/utils/pom.xml index b312a746db..3b703c38f0 100644 --- a/backend/utils/pom.xml +++ b/backend/utils/pom.xml @@ -14,18 +14,12 @@ org.eclipse.sw360 backend - 3.4.0-SNAPSHOT + ${revision} backend-utils backend-utils - - - daniele.fognini@tngtech.com - - - org.eclipse.sw360 diff --git a/build-configuration/pom.xml b/build-configuration/pom.xml index eebe945c9c..b9a6a3ccdf 100644 --- a/build-configuration/pom.xml +++ b/build-configuration/pom.xml @@ -17,7 +17,7 @@ org.eclipse.sw360 sw360 - 3.4.0-SNAPSHOT + ${revision} build-configuration diff --git a/frontend/layouttpl/pom.xml b/frontend/layouttpl/pom.xml index 8000d9cb24..07d785a8a7 100644 --- a/frontend/layouttpl/pom.xml +++ b/frontend/layouttpl/pom.xml @@ -16,7 +16,7 @@ org.eclipse.sw360 frontend - 3.4.0-SNAPSHOT + ${revision} layouttpl diff --git a/frontend/pom.xml b/frontend/pom.xml index cfb133c115..c59cbc02c6 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -17,7 +17,7 @@ org.eclipse.sw360 sw360 - 3.4.0-SNAPSHOT + ${revision} frontend diff --git a/frontend/sw360-portlet/pom.xml b/frontend/sw360-portlet/pom.xml index 544788efd6..4d97b42728 100644 --- a/frontend/sw360-portlet/pom.xml +++ b/frontend/sw360-portlet/pom.xml @@ -18,7 +18,7 @@ frontend org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} diff --git a/frontend/sw360-theme/pom.xml b/frontend/sw360-theme/pom.xml index abb9d96f45..ab62ebfc6d 100644 --- a/frontend/sw360-theme/pom.xml +++ b/frontend/sw360-theme/pom.xml @@ -13,14 +13,14 @@ org.eclipse.sw360 frontend - 3.4.0-SNAPSHOT + ${revision} 4.0.0 sw360-theme war sw360-theme Theme - 3.4.0-SNAPSHOT + diff --git a/libraries/commonIO/pom.xml b/libraries/commonIO/pom.xml index 7c4593eb1c..2c37e4545b 100644 --- a/libraries/commonIO/pom.xml +++ b/libraries/commonIO/pom.xml @@ -17,7 +17,7 @@ libraries org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/libraries/exporters/pom.xml b/libraries/exporters/pom.xml index 323ca12e61..ff218bb6d9 100644 --- a/libraries/exporters/pom.xml +++ b/libraries/exporters/pom.xml @@ -18,7 +18,7 @@ libraries org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} exporters diff --git a/libraries/importers/component-importer/pom.xml b/libraries/importers/component-importer/pom.xml index 7c80eb9793..bc29960e1b 100644 --- a/libraries/importers/component-importer/pom.xml +++ b/libraries/importers/component-importer/pom.xml @@ -16,7 +16,7 @@ importers org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -58,4 +58,4 @@ - \ No newline at end of file + diff --git a/libraries/importers/license-importer/pom.xml b/libraries/importers/license-importer/pom.xml index df584a8e14..11778a3e5f 100644 --- a/libraries/importers/license-importer/pom.xml +++ b/libraries/importers/license-importer/pom.xml @@ -16,7 +16,7 @@ importers org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/libraries/importers/pom.xml b/libraries/importers/pom.xml index d33176c987..53e364a0c9 100644 --- a/libraries/importers/pom.xml +++ b/libraries/importers/pom.xml @@ -16,7 +16,7 @@ libraries org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 @@ -68,4 +68,4 @@ - \ No newline at end of file + diff --git a/libraries/lib-datahandler/pom.xml b/libraries/lib-datahandler/pom.xml index 02a156eb41..f70f9eec07 100644 --- a/libraries/lib-datahandler/pom.xml +++ b/libraries/lib-datahandler/pom.xml @@ -17,7 +17,7 @@ libraries org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} datahandler diff --git a/libraries/pom.xml b/libraries/pom.xml index 57399e7131..265b79a1a7 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -17,7 +17,7 @@ sw360 org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/pom.xml b/pom.xml index 675b70303b..222fe7cde3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,18 +21,34 @@ + org.eclipse.sw360 + sw360 + pom + ${revision} + - scm:git:https://github.com/eclipse/sw360 + scm:git:https://github.com/eclipse/sw360 - - artifact-repository - https://github.com/eclipse/sw360 - - + + artifact-repository + https://github.com/eclipse/sw360 + + + + + build-configuration + libraries + backend + frontend + rest + + + 4.0.0-M1 + 1.8 6.2.2 1.5.0 @@ -71,19 +87,6 @@ - org.eclipse.sw360 - sw360 - pom - 3.4.0-SNAPSHOT - - - build-configuration - libraries - backend - frontend - rest - - @@ -308,6 +311,30 @@ 7 + + org.codehaus.mojo + flatten-maven-plugin + 1.0.0 + + true + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + diff --git a/rest/authorization-server/pom.xml b/rest/authorization-server/pom.xml index f01a226399..e26cf24531 100644 --- a/rest/authorization-server/pom.xml +++ b/rest/authorization-server/pom.xml @@ -18,7 +18,7 @@ rest org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} authorization-server diff --git a/rest/pom.xml b/rest/pom.xml index 4513379f21..e1f3e9273b 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -17,7 +17,7 @@ org.eclipse.sw360 sw360 - 3.4.0-SNAPSHOT + ${revision} rest @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/rest/resource-server/pom.xml b/rest/resource-server/pom.xml index da84ce8a83..e16133198d 100644 --- a/rest/resource-server/pom.xml +++ b/rest/resource-server/pom.xml @@ -18,7 +18,7 @@ rest org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} resource-server diff --git a/rest/rest-common/pom.xml b/rest/rest-common/pom.xml index 2af468abab..1cb2ad8177 100644 --- a/rest/rest-common/pom.xml +++ b/rest/rest-common/pom.xml @@ -18,7 +18,7 @@ rest org.eclipse.sw360 - 3.4.0-SNAPSHOT + ${revision} rest-common