Create simple exmaple

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
geckoprojects-org · Jan 22, 2024 · f49d075 · f49d075
1 parent 36587b8
commit f49d075
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 22 deletions.
diff --git a/maven/org.gecko.playground.maven.ds.simple/concrete.bndrun b/maven/org.gecko.playground.maven.ds.simple/concrete.bndrun
@@ -0,0 +1 @@
+-include: parent.bndrun
diff --git a/maven/org.gecko.playground.maven.ds.simple/hello-component.bndrun b/maven/org.gecko.playground.maven.ds.simple/hello-component.bndrun
@@ -12,6 +12,8 @@
 	org.osgi.framework.bootdelegation='sun.misc,sun.reflect',\
 	osgi.console=
 
+-runee: JavaSE-17
+-resolve: beforelaunch
 -runbundles: \
 	org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
 	org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\

diff --git a/maven/org.gecko.playground.maven.ds.simple/parent.bndrun b/maven/org.gecko.playground.maven.ds.simple/parent.bndrun
@@ -0,0 +1,25 @@
+-runfw: org.eclipse.osgi
+-runrequires: \
+	bnd.identity;id='org.gecko.playground.maven.ds.simple',\
+	bnd.identity;id='org.apache.felix.gogo.command',\
+	bnd.identity;id='org.apache.felix.gogo.shell'
+
+-runstartlevel: \
+    order=sortbynameversion,\
+    begin=-1
+
+-runproperties: \
+	org.osgi.framework.bootdelegation='sun.misc,sun.reflect',\
+	osgi.console=
+
+-runee: JavaSE-17
+-runbundles: \
+	org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
+	org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\
+	org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\
+	org.apache.felix.scr;version='[2.2.6,2.2.7)',\
+	org.gecko.playground.maven.ds.log;version='[1.0.0,1.0.1)',\
+	org.gecko.playground.maven.ds.simple;version='[1.0.0,1.0.1)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
+	org.osgi.util.function;version='[1.2.0,1.2.1)',\
+	org.osgi.util.promise;version='[1.3.0,1.3.1)'
diff --git a/maven/org.gecko.playground.maven.ds.simple/pom.xml b/maven/org.gecko.playground.maven.ds.simple/pom.xml
@@ -29,11 +29,9 @@
 							<includeDependencyManagement>true</includeDependencyManagement>
 							<bndruns>
 								<bndrun>hello-component.bndrun</bndrun>
+								<bndrun>parent.bndrun</bndrun>
+<!--								<bndrun>concrete.bndrun</bndrun>-->
 							</bndruns>
-							<scopes>
-								<scope>compile</scope>
-								<scope>runtime</scope>
-							</scopes>
 						</configuration>
 					</execution>
 				</executions>
@@ -42,10 +40,22 @@
         		<groupId>biz.aQute.bnd</groupId>
         		<artifactId>bnd-run-maven-plugin</artifactId>
         		<configuration>
-            		<failOnChanges>false</failOnChanges>
             		<includeDependencyManagement>true</includeDependencyManagement>
-            		<bndrun>hello-component.bndrun</bndrun>
         		</configuration>
+        		<executions>
+					<execution>
+						<id>hello1</id>
+						<configuration>
+		            		<bndrun>hello-component.bndrun</bndrun>
+						</configuration>
+					</execution>
+					<execution>
+						<id>concrete</id>
+						<configuration>
+		            		<bndrun>concrete.bndrun</bndrun>
+						</configuration>
+					</execution>
+				</executions>
     		</plugin>
     	</plugins>
     </build>
@@ -72,22 +82,6 @@
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.service.component.annotations</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.util.promise</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.gogo.shell</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.gogo.command</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.gogo.runtime</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
@@ -96,14 +90,17 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-junit-jupiter</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -88,16 +88,19 @@
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.gogo.shell</artifactId>
 				<version>1.1.4</version>
+				<scope>runtime</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.gogo.command</artifactId>
 				<version>1.1.2</version>
+				<scope>runtime</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.gogo.runtime</artifactId>
 				<version>1.1.6</version>
+				<scope>runtime</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.felix</groupId>
@@ -108,6 +111,7 @@
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.configadmin</artifactId>
 				<version>1.9.22</version>
+				<scope>runtime</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.osgi</groupId>
@@ -231,6 +235,11 @@
 	<pluginManagement>
 		<plugins>
 		<!-- Use the bnd-maven-plugin and assemble the symbolic names -->
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-export-maven-plugin</artifactId>
+				<version>${bnd.version}</version>
+			</plugin>
 			<plugin>
 				<groupId>biz.aQute.bnd</groupId>
 				<artifactId>bnd-maven-plugin</artifactId>