bug5440: trying to turn ingestion project also into an OSGi bundle and avoid m2e Maven build in Eclipse

java/com.sap.sailing.ingestion/.classpath

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -13,11 +15,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

java/com.sap.sailing.ingestion/.project

@@ -11,14 +11,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
+        <buildCommand>
+            <name>org.eclipse.pde.ManifestBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>org.eclipse.pde.SchemaBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+        <nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>

java/com.sap.sailing.ingestion/META-INF/MANIFEST.MF

@@ -0,0 +1,14 @@
+Manifest-Version: 1.0gwt.ui
+Bundle-ManifestVersion: 2
+Bundle-Name: Sailing App GWT UI
+Bundle-SymbolicName: com.sap.sailing.ingestion
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: com.sap.sailing.domain.common,
+ org.junit;bundle-version="4.8.2",
+ com.amazon.aws.aws-java-api;bundle-version="2.17.124"
+Bundle-ActivationPolicy: lazy
+Import-Package: javax.servlet;version="3.1.0"
+Bundle-ClassPath: target/classes/
+Automatic-Module-Name: com.sap.sailing.ingestion

java/com.sap.sailing.ingestion/README.md

@@ -41,11 +41,31 @@ Deployment can easily be done by right clicking on the lambda class and selectin
 > Java 8 which is not allowed as an startup environment for Eclipse 2022-06. Use the described method for the deployment with Maven.
 
 Alternatively, you can build the project with Maven, but you have to take some precautions to be able to build the package. The pom.xml of the project ``com.sap.sailing.ingestion`` declares dependencies to the following other projects of the codebase to reuse code for types, deserializers, etc.:
+- com.google.gwt.dev
 - org.json.simple
-- com.sap.sailing.domain.common
 - com.sap.sse.common
-- com.sap.sailing.domain.shared.android
+- com.sap.sse.datamining.annotations
 - com.sap.sse.shared.android
+- com.googlecode.java-diff-utils
+- com.sap.sailing.domain
+- com.sap.sailing.domain.common
+- com.sap.sailing.domain.shared.android
+- com.sap.sailing.geocoding
+- com.sap.sse.datamining.shared
+- com.sap.sse
+- com.sap.sailing.declination
+- com.sap.sse.security
+- com.sap.sse.operationaltransformation
+- com.sap.sse.mail
+- com.sap.sse.replication.interfaces
+- com.sap.sse.security.persistence
+- com.sap.sse.security.interface
+- com.sap.sse.mongodb
+- com.sap.sse.replication
+- com.sap.sse.replication.persistence
+- com.sap.sailing.shared.server
+- com.sap.sailing.shared.persistence
+- com.sap.sailing.server.gateway.interfaces
 - com.sap.sailing.server.gateway.serialization
 - com.sap.sailing.server.gateway.serialization.shared.android
 

java/com.sap.sailing.ingestion/build.properties

@@ -0,0 +1,3 @@
+source.. = src/main/java,\
+           src/main/resources
+output.. = target/classes

java/com.sap.sailing.ingestion/pom.xml

@@ -93,32 +93,32 @@
         <dependency>
             <groupId>com.sap.sailing</groupId>
             <artifactId>com.sap.sailing.domain.common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sap.sailing</groupId>
             <artifactId>com.sap.sse.common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sap.sailing</groupId>
             <artifactId>com.sap.sailing.domain.shared.android</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sap.sailing</groupId>
             <artifactId>com.sap.sse.shared.android</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sap.sailing</groupId>
             <artifactId>com.sap.sailing.server.gateway.serialization</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sap.sailing</groupId>
             <artifactId>com.sap.sailing.server.gateway.serialization.shared.android</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 	</dependencies>
 </project>

java/pom.xml

@@ -389,25 +389,29 @@
   <profile>
     <id>with-aws-lambda</id>
     <modules>
+      <module>com.google.gwt.dev</module>
+      <module>com.sap.sse.common</module>
+      <module>com.sap.sse.datamining.annotations</module>
       <module>com.googlecode.java-diff-utils</module>
-	  <module>com.sap.sailing.domain</module>
-	  <module>com.sap.sailing.geocoding</module>
-	  <module>com.sap.sse.datamining.shared</module>
-	  <module>com.sap.sse</module>
-	  <module>com.sap.sailing.declination</module>
-	  <module>com.sap.sse.security</module>
-	  <module>com.sap.sse.operationaltransformation</module>
-	  <module>com.sap.sse.mail</module>
-	  <module>com.sap.sse.replication.interfaces</module>
-	  <module>com.sap.sse.security.persistence</module>
-	  <module>com.sap.sse.security.interface</module>
-	  <module>com.sap.sse.mongodb</module>
-	  <module>com.sap.sse.replication</module>
-	  <module>com.sap.sse.replication.persistence</module>
-	  <module>com.sap.sailing.shared.server</module>
-	  <module>com.sap.sailing.shared.persistence</module>
-	  <module>com.sap.sailing.server.gateway.interfaces</module>
+      <module>com.sap.sailing.domain</module>
+      <module>com.sap.sailing.geocoding</module>
+      <module>com.sap.sse.datamining.shared</module>
+      <module>com.sap.sse</module>
+      <module>com.sap.sailing.declination</module>
+      <module>com.sap.sse.security</module>
+      <module>com.sap.sse.operationaltransformation</module>
+      <module>com.sap.sse.mail</module>
+      <module>com.sap.sse.replication.interfaces</module>
+      <module>com.sap.sse.security.persistence</module>
+      <module>com.sap.sse.security.interface</module>
+      <module>com.sap.sse.mongodb</module>
+      <module>com.sap.sse.replication</module>
+      <module>com.sap.sse.replication.persistence</module>
+      <module>com.sap.sailing.shared.server</module>
+      <module>com.sap.sailing.shared.persistence</module>
+      <module>com.sap.sailing.server.gateway.interfaces</module>
       <module>com.sap.sailing.server.gateway.serialization</module>
+      <module>com.sap.sailing.server.gateway.serialization.shared.android</module>
       <module>com.sap.sailing.ingestion</module>
     </modules>
   </profile>