Merge pull request #1713 from officefloor/cloud-maven-plugin

Cloud maven plugin
officefloor · Jul 9, 2024 · 7800345 · 7800345
2 parents 97a0fcd + 019202d
commit 7800345
Show file tree

Hide file tree

Showing 34 changed files with 989 additions and 142 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 **/*.jar
 **/*.zip
 **/*.log
+/.java-version
diff --git a/officefloor/bom/pom.xml b/officefloor/bom/pom.xml
@@ -1105,6 +1105,11 @@
 					<artifactId>woof-archetype</artifactId>
 					<version>${revision}</version>
 				</plugin>
+				<plugin>
+					<groupId>net.officefloor.maven</groupId>
+					<artifactId>officefloor-cloud-maven-plugin</artifactId>
+					<version>${revision}</version>
+				</plugin>
 				<plugin>
 					<groupId>net.officefloor.maven</groupId>
 					<artifactId>officefloor-googlefunction-maven-plugin</artifactId>

diff --git a/officefloor/cloud/officecloud_aws/src/main/resources/META-INF/cloud/cloud.properties b/officefloor/cloud/officecloud_aws/src/main/resources/META-INF/cloud/cloud.properties
@@ -0,0 +1,2 @@
+name=AWS
+classifier=aws
diff --git a/officefloor/cloud/officecloud_aws_test/pom.xml b/officefloor/cloud/officecloud_aws_test/pom.xml
@@ -27,4 +27,12 @@
 			<artifactId>officenosql_dynamodb_test</artifactId>
 		</dependency>
 	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>				
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+	</build>
 </project>
diff --git a/...or/cloud/officecloud_aws_test/src/main/resources/META-INF/cloud/cloud-artifact.properties b/...or/cloud/officecloud_aws_test/src/main/resources/META-INF/cloud/cloud-artifact.properties
@@ -0,0 +1,4 @@
+groupId=net.officefloor.cloud
+artifactId=officecloud_aws
+version=${project.version}
+classifier=
diff --git a/officefloor/cloud/officecloud_google/src/main/resources/META-INF/cloud/cloud.properties b/officefloor/cloud/officecloud_google/src/main/resources/META-INF/cloud/cloud.properties
@@ -0,0 +1,2 @@
+name=Google
+classifier=google
diff --git a/officefloor/cloud/officecloud_google_test/pom.xml b/officefloor/cloud/officecloud_google_test/pom.xml
@@ -27,4 +27,12 @@
 			<artifactId>officenosql_firestore_test</artifactId>
 		</dependency>
 	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>				
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+	</build>
 </project>
diff --git a/...cloud/officecloud_google_test/src/main/resources/META-INF/cloud/cloud-artifact.properties b/...cloud/officecloud_google_test/src/main/resources/META-INF/cloud/cloud-artifact.properties
@@ -0,0 +1,4 @@
+groupId=net.officefloor.cloud
+artifactId=officecloud_google
+version=${project.version}
+classifier=
diff --git a/officefloor/editor/eclipse/net.officefloor.feature/feature.xml b/officefloor/editor/eclipse/net.officefloor.feature/feature.xml
@@ -29,7 +29,6 @@
       <import plugin="org.eclipse.gef.mvc.fx"/>
       <import plugin="com.google.guava"/>
       <import plugin="com.google.inject"/>
-      <import plugin="javax.inject"/>
       <import plugin="org.eclipse.core.commands"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.gef.common"/>
@@ -55,61 +54,39 @@
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.jdt.debug.ui"/>
       <import feature="org.eclipse.fx.runtime.min.feature"/>
+      <import plugin="jakarta.inject.jakarta.inject-api"/>
    </requires>
 
    <plugin
          id="net.officefloor.core"
-         download-size="0"
-         install-size="0"
          version="0.0.0"/>
 
    <plugin
          id="net.officefloor.gef.bridge"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="net.officefloor.gef.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="net.officefloor.gef.configurer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="net.officefloor.gef.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="net.officefloor.gef.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="net.officefloor.eclipse.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="net.officefloor.eclipse.launch"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/officefloor/editor/net.officefloor.gef.editor/META-INF/MANIFEST.MF b/officefloor/editor/net.officefloor.gef.editor/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Import-Package: com.google.common.collect,
  com.google.inject,
  com.google.inject.binder;version="1.3.0",
  com.google.inject.multibindings,
- javax.inject,
+ jakarta.inject;version="[2.0.0,3.0.0)",
  org.eclipse.core.commands,
  org.eclipse.core.commands.operations,
  org.eclipse.core.runtime,

diff --git a/...rc/main/java/net/officefloor/gef/editor/internal/parts/OfficeFloorContentPartFactory.java b/...rc/main/java/net/officefloor/gef/editor/internal/parts/OfficeFloorContentPartFactory.java
@@ -32,7 +32,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.eclipse.gef.geometry.planar.Point;
 import org.eclipse.gef.mvc.fx.models.GridModel;

diff --git a/officefloor/editor/net.officefloor.gef.target/2020-12.target b/officefloor/editor/net.officefloor.gef.target/2020-12.target
diff --git a/...net.officefloor.gef.target/2023-06.target → ...net.officefloor.gef.target/2024-06.target b/...net.officefloor.gef.target/2023-06.target → ...net.officefloor.gef.target/2024-06.target
@@ -3,14 +3,14 @@
 <target includeMode="feature" name="2023-06" sequenceNumber="17">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="http://download.eclipse.org/releases/2023-06"/>
-			<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.800.v20230523-2142"/>
+			<repository location="http://download.eclipse.org/releases/2024-06"/>
+			<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1200.v20240524-2033"/>
 			<unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="3.9.0.202210162353"/>
-			<unit id="org.eclipse.gef.common.sdk.feature.group" version="5.0.1.202209120200"/>
-			<unit id="org.eclipse.gef.fx.sdk.feature.group" version="5.0.5.202209120200"/>
-			<unit id="org.eclipse.gef.mvc.sdk.feature.group" version="5.2.3.202209120200"/>
-			<unit id="org.eclipse.m2e.feature.feature.group" version="2.3.0.20230523-2033"/>
-			<unit id="org.eclipse.sdk.feature.group" version="4.28.0.v20230605-0440"/>
+			<unit id="org.eclipse.gef.common.sdk.feature.group" version="5.0.1.202311221639"/>
+			<unit id="org.eclipse.gef.fx.sdk.feature.group" version="5.0.5.202311221639"/>
+			<unit id="org.eclipse.gef.mvc.sdk.feature.group" version="5.2.3.202311221639"/>
+			<unit id="org.eclipse.m2e.feature.feature.group" version="2.6.1.20240602-2342"/>
+			<unit id="org.eclipse.sdk.feature.group" version="4.32.0.v20240601-0610"/>
 		</location>
 	</locations>
 </target>
diff --git a/officefloor/editor/net.officefloor.gef.target/pom.xml b/officefloor/editor/net.officefloor.gef.target/pom.xml
@@ -15,7 +15,7 @@
 	<packaging>pom</packaging>
 	<profiles>
 		<profile>
-			<id>2023-06.target</id>
+			<id>2024-06.target</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
@@ -36,40 +36,9 @@
 									<artifacts>
 										<artifact>
 											<!-- note: the file name must be ${classifier}.target -->
-											<file>2023-06.target</file>
+											<file>2024-06.target</file>
 											<type>target</type>
-											<classifier>2023-06</classifier>
-										</artifact>
-									</artifacts>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>2020-12.target</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<executions>
-							<!-- make target file available for incremental builds -->
-							<execution>
-								<id>attach-artifacts</id>
-								<phase>package</phase>
-								<goals>
-									<goal>attach-artifact</goal>
-								</goals>
-								<configuration>
-									<artifacts>
-										<artifact>
-											<!-- note: the file name must be ${classifier}.target -->
-											<file>2020-12.target</file>
-											<type>target</type>
-											<classifier>2020-12</classifier>
+											<classifier>2024-06</classifier>
 										</artifact>
 									</artifacts>
 								</configuration>

diff --git a/officefloor/editor/pom.xml b/officefloor/editor/pom.xml
@@ -47,8 +47,8 @@
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
 					<execution>
- 						<?m2e ignore?>
- 						<id>Provide linked dependencies for eclipse PDE projects</id>
+						<?m2e ignore?>
+						<id>Provide linked dependencies for eclipse PDE projects</id>
 						<phase>prepare-package</phase>
 						<goals>
 							<goal>copy-dependencies</goal>
@@ -135,7 +135,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>2023-06.target</id>
+			<id>2024-06.target</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
@@ -150,7 +150,7 @@
 									<groupId>net.officefloor.editor</groupId>
 									<artifactId>net.officefloor.gef.target</artifactId>
 									<version>${project.version}</version>
-									<classifier>2023-06</classifier>
+									<classifier>2024-06</classifier>
 								</artifact>
 							</target>
 							<dependency-resolution>
@@ -162,66 +162,25 @@
 									<ws>gtk</ws>
 									<arch>x86_64</arch>
 								</environment>
-								<environment>
-									<os>win32</os>
-									<ws>win32</ws>
-									<arch>x86_64</arch>
-								</environment>
-								<environment>
-									<os>macosx</os>
-									<ws>cocoa</ws>
-									<arch>x86_64</arch>
-								</environment>
-							</environments>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>2020-12.target</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>target-platform-configuration</artifactId>
-						<configuration>
-							<target>
-								<artifact>
-									<groupId>net.officefloor.editor</groupId>
-									<artifactId>net.officefloor.gef.target</artifactId>
-									<version>${project.version}</version>
-									<classifier>2020-12</classifier>
-								</artifact>
-							</target>
-							<dependency-resolution>
-								<optionalDependencies>require</optionalDependencies>
-							</dependency-resolution>
-							<environments>
 								<environment>
 									<os>linux</os>
 									<ws>gtk</ws>
-									<arch>x86</arch>
-								</environment>
-								<environment>
-									<os>linux</os>
-									<ws>gtk</ws>
-									<arch>x86_64</arch>
+									<arch>aarch64</arch>
 								</environment>
 								<environment>
 									<os>win32</os>
 									<ws>win32</ws>
-									<arch>x86</arch>
+									<arch>x86_64</arch>
 								</environment>
 								<environment>
-									<os>win32</os>
-									<ws>win32</ws>
+									<os>macosx</os>
+									<ws>cocoa</ws>
 									<arch>x86_64</arch>
 								</environment>
 								<environment>
 									<os>macosx</os>
 									<ws>cocoa</ws>
-									<arch>x86_64</arch>
+									<arch>aarch64</arch>
 								</environment>
 							</environments>
 						</configuration>

diff --git a/officefloor/maven/officefloor-cloud-maven-plugin/.gitignore b/officefloor/maven/officefloor-cloud-maven-plugin/.gitignore
@@ -0,0 +1 @@
+/target/