Merge pull request #603 from siemens/lepokle/release-4-0-0-M1

Prepare release version 4.0.0-M1 review-by:michael.c.jaeger@siemens.com
eclipse-sw360 · Aug 1, 2019 · 0d70bee · 0d70bee
2 parents 8b26f2a + 23f3707
commit 0d70bee
Show file tree

Hide file tree

Showing 54 changed files with 178 additions and 351 deletions.
diff --git 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
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.eclipse.sw360</groupId>
         <artifactId>sw360</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>backend</artifactId>

diff --git a/backend/src-common/pom.xml b/backend/src-common/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>backend</artifactId>
         <groupId>org.eclipse.sw360</groupId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,4 +37,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/backend/src/pom.xml b/backend/src/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.eclipse.sw360</groupId>
         <artifactId>backend</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>backend-src</artifactId>

diff --git a/backend/src/src-attachments/pom.xml b/backend/src/src-attachments/pom.xml
@@ -22,19 +22,10 @@
     <parent>
         <groupId>org.eclipse.sw360</groupId>
         <artifactId>backend-src</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>src-attachments</artifactId>
     <packaging>jar</packaging>
     <name>src-attachments</name>
-
-    <developers>
-        <developer>
-            <name>cedric.bodet@tngtech.com</name>
-        </developer>
-        <developer>
-            <name>johannes.najjar@tngtech.com</name>
-        </developer>
-    </developers>
 </project>
diff --git a/backend/src/src-codescoop/pom.xml b/backend/src/src-codescoop/pom.xml
@@ -44,16 +44,10 @@
     <parent>
         <groupId>org.eclipse.sw360</groupId>
         <artifactId>backend-src</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>src-codescoop</artifactId>
     <packaging>jar</packaging>
     <name>src-codescoop</name>
-
-    <developers>
-        <developer>
-            <name>alex.skorohod@codescoop.com</name>
-        </developer>
-    </developers>
 </project>
diff --git 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">
     <modelVersion>4.0.0</modelVersion>
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.sw360</groupId>
-            <artifactId>src-attachments</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
 
     <parent>
         <groupId>org.eclipse.sw360</groupId>
         <artifactId>backend-src</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>src-components</artifactId>
     <packaging>jar</packaging>
     <name>src-components</name>
 
-    <developers>
-        <developer>
-            <name>cedric.bodet@tngtech.com</name>
-        </developer>
-        <developer>
-            <name>johannes.najjar@tngtech.com</name>
-        </developer>
-    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.sw360</groupId>
+            <artifactId>src-attachments</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 </project>
diff --git 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">
     <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.sw360</groupId>
+        <artifactId>backend-src</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>src-cvesearch</artifactId>
+    <packaging>jar</packaging>
+    <name>src-cvesearch</name>
+
     <dependencies>
         <dependency>
             <groupId>org.eclipse.sw360</groupId>
             <artifactId>datahandler</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
+        <dependency>
+                <groupId>org.eclipse.sw360</groupId>
+                <artifactId>src-vulnerabilities</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.8.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.sw360</groupId>
-            <artifactId>src-vulnerabilities</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <parent>
-        <groupId>org.eclipse.sw360</groupId>
-        <artifactId>backend-src</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
-    </parent>
-
-    <developers>
-        <developer>
-            <name>birgit.heydenreich@tngtech.com</name>
-        </developer>
-        <developer>
-            <name>maximilian.huber@tngtech.com</name>
-        </developer>
-    </developers>
-
-    <artifactId>src-cvesearch</artifactId>
-    <packaging>jar</packaging>
-    <name>src-cvesearch</name>
+    </dependencies>    
 </project>
diff --git a/backend/src/src-fossology/pom.xml b/backend/src/src-fossology/pom.xml
@@ -16,25 +16,13 @@
     <parent>
         <groupId>org.eclipse.sw360</groupId>
         <artifactId>backend-src</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>src-fossology</artifactId>
     <packaging>jar</packaging>
     <name>src-fossology</name>
 
-    <developers>
-        <developer>
-            <name>cedric.bodet@tngtech.com</name>
-        </developer>
-        <developer>
-            <name>johannes.najjar@tngtech.com</name>
-        </developer>
-        <developer>
-            <name>daniele.fognini@tngtech.com</name>
-        </developer>
-    </developers>
-
     <dependencies>
         <dependency>
             <groupId>com.jcraft</groupId>
@@ -57,5 +45,4 @@
             <version>${spring.version}</version>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/backend/src/src-licenseinfo/pom.xml b/backend/src/src-licenseinfo/pom.xml
@@ -11,6 +11,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.sw360</groupId>
+        <artifactId>backend-src</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>src-licenseinfo</artifactId>
+    <packaging>jar</packaging>
+    <name>src-licenseinfo</name>
 
     <dependencyManagement>
         <dependencies>
@@ -24,6 +34,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.eclipse.sw360</groupId>
+            <artifactId>src-attachments</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -36,11 +51,6 @@
             <version>1.12.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.sw360</groupId>
-            <artifactId>src-attachments</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.spdx</groupId>
             <artifactId>spdx-tools</artifactId>
@@ -101,22 +111,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <parent>
-        <groupId>org.eclipse.sw360</groupId>
-        <artifactId>backend-src</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>src-licenseinfo</artifactId>
-    <packaging>jar</packaging>
-    <name>src-licenseinfo</name>
-
-    <developers>
-        <developer>
-            <name>alex.borodin@evosoft.com</name>
-        </developer>
-        <developer>
-            <name>maximilian.huber@tngtech.com</name>
-        </developer>
-    </developers>
 </project>
diff --git 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">
     <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.sw360</groupId>
+        <artifactId>backend-src</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>src-licenses</artifactId>
+    <packaging>jar</packaging>
+    <name>src-licenses</name>
+
     <dependencies>
         <dependency>
             <groupId>org.spdx</groupId>
@@ -31,21 +42,4 @@
             <version>3.8.1</version>
         </dependency>
     </dependencies>
-
-    <parent>
-        <groupId>org.eclipse.sw360</groupId>
-        <artifactId>backend-src</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>src-licenses</artifactId>
-    <packaging>jar</packaging>
-    <name>src-licenses</name>
-
-    <developers>
-        <developer>
-            <name>cedric.bodet@tngtech.com</name>
-        </developer>
-    </developers>
-
-</project>
+</project>
diff --git a/backend/src/src-moderation/pom.xml b/backend/src/src-moderation/pom.xml
@@ -15,27 +15,19 @@
     <parent>
         <artifactId>backend-src</artifactId>
         <groupId>org.eclipse.sw360</groupId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>src-moderation</artifactId>
     <packaging>jar</packaging>
     <name>src-moderation</name>
 
-    <developers>
-        <developer>
-            <name>cedric.bodet@tngtech.com</name>
-        </developer>
-        <developer>
-            <name>johannes.najjar@tngtech.com</name>
-        </developer>
-    </developers>
     <dependencies>
         <dependency>
             <groupId>org.eclipse.sw360</groupId>
             <artifactId>src-licenses</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/backend/src/src-projects/pom.xml b/backend/src/src-projects/pom.xml
@@ -16,28 +16,19 @@
     <parent>
         <artifactId>backend-src</artifactId>
         <groupId>org.eclipse.sw360</groupId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>src-projects</artifactId>
     <packaging>jar</packaging>
     <name>src-projects</name>
 
-    <developers>
-        <developer>
-            <name>cedric.bodet@tngtech.com</name>
-        </developer>
-        <developer>
-            <name>johannes.najjar@tngtech.com</name>
-        </developer>
-    </developers>
     <dependencies>
         <dependency>
             <groupId>org.eclipse.sw360</groupId>
             <artifactId>src-attachments</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
-
 </project>