Add filtering to plugin manifest files.

winder · Aug 18, 2017 · 9472bfa · 9472bfa
1 parent c68a62f
commit 9472bfa
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 1 deletion.
diff --git a/ugs-platform/branding/src/main/nbm/manifest.mf b/ugs-platform/branding/src/main/nbm/manifest.mf
@@ -1,3 +1,4 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Localizing-Bundle: com/willwinder/branding/Bundle.properties
+OpenIDE-Module-Implementation-Version: ${ugs.modules.implementation.version}
 AutoUpdate-Essential-Module: true
diff --git a/ugs-platform/pom.xml b/ugs-platform/pom.xml
@@ -16,11 +16,18 @@
     <name>ugs-platform-parent</name>
 
     <properties>
+      <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
       <netbeans.version>RELEASE81</netbeans.version>
       <ugs.app.title>Universal Gcode Platform ${project.version}</ugs.app.title>
 
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
+       <!-- Modules specification version, overrides project version -->
+       <!-- Adding timestamp for nightly autoupdates -->
+       <!--
+            -->
+      <ugs.modules.implementation.version>${maven.build.timestamp}</ugs.modules.implementation.version>
+
       <!--==== Mac OS X bundle settings ====-->
       <ugs.appbundle.name>Universal Gcode Platform</ugs.appbundle.name>
       <ugs.bundle.jre.url>http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163</ugs.bundle.jre.url>
@@ -67,6 +74,7 @@
                     <version>${ugs.nbm-maven-plugin.version}</version>
                     <extensions>true</extensions>
                     <configuration>
+                        <sourceManifestFile>${project.build.directory}/manifest.mf</sourceManifestFile>
                         <brandingToken>${brandingToken}</brandingToken>
                         <cluster>${brandingToken}</cluster>
                         <etcConfFile>launcher.conf</etcConfFile>
@@ -100,6 +108,34 @@
               </plugin>
             </plugins>
         </pluginManagement>
+
+        <plugins>
+          <!-- Copy and apply filtering on manifest.mf file -->                                                                                   
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>                                                                                               
+            <executions>
+              <execution>                                                                                                              
+                <id>generate-modules-xml</id>
+                <phase>generate-resources</phase>    
+                <goals>
+                  <goal>copy-resources</goal>   
+                </goals>
+                <configuration>  
+                  <outputDirectory>${basedir}/target/</outputDirectory>
+                  <resources>      
+                    <resource>
+                      <directory>src/main/nbm</directory>   
+                      <includes>
+                          <include>manifest.mf</include>
+                      </includes>
+                      <filtering>true</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
     </build>
 
     <modules>

diff --git a/ugs-platform/ugs-platform-gcode-editor/src/main/nbm/manifest.mf b/ugs-platform/ugs-platform-gcode-editor/src/main/nbm/manifest.mf
@@ -1,3 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Localizing-Bundle: com/willwinder/ugs/platform/gcode/editor/Bundle.properties
 OpenIDE-Module-Layer: com/willwinder/ugs/nbp/editor/layer.xml
+OpenIDE-Module-Implementation-Version: ${ugs.modules.implementation.version}
+AutoUpdate-Essential-Module: true
diff --git a/ugs-platform/ugs-platform-plugin-workflow/src/main/nbm/manifest.mf b/ugs-platform/ugs-platform-plugin-workflow/src/main/nbm/manifest.mf
@@ -1,3 +1,4 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Localizing-Bundle: com/willwinder/ugs/platform/plugin/workflow/Bundle.properties
 OpenIDE-Module-Java-Dependencies: Java > 1.8
+OpenIDE-Module-Implementation-Version: ${ugs.modules.implementation.version}
diff --git a/ugs-platform/ugs-platform-surfacescanner/src/main/nbm/manifest.mf b/ugs-platform/ugs-platform-surfacescanner/src/main/nbm/manifest.mf
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Localizing-Bundle: com/willwinder/ugs/platform/surfacescanner/Bundle.properties
-
+OpenIDE-Module-Implementation-Version: ${ugs.modules.implementation.version}
diff --git a/ugs-platform/ugs-platform-ugscore/src/main/nbm/manifest.mf b/ugs-platform/ugs-platform-ugscore/src/main/nbm/manifest.mf
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Layer: com/willwinder/ugs/nbp/core/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/willwinder/ugs/nbp/core/Bundle.properties
+OpenIDE-Module-Implementation-Version: ${ugs.modules.implementation.version}
 AutoUpdate-Essential-Module: true
 OpenIDE-Module-Java-Dependencies: Java > 1.8
diff --git a/ugs-platform/ugs-platform-ugslib/src/main/nbm/manifest.mf b/ugs-platform/ugs-platform-ugslib/src/main/nbm/manifest.mf
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Layer: com/willwinder/ugs/nbp/lib/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/willwinder/ugs/nbp/lib/Bundle.properties
+OpenIDE-Module-Implementation-Version: ${ugs.modules.implementation.version}
 AutoUpdate-Essential-Module: true
 OpenIDE-Module-Java-Dependencies: Java > 1.8
diff --git a/ugs-platform/ugs-platform-visualizer/src/main/nbm/manifest.mf b/ugs-platform/ugs-platform-visualizer/src/main/nbm/manifest.mf
@@ -1,3 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Localizing-Bundle: com/willwinder/ugs/platform/visualizer/Bundle.properties
 OpenIDE-Module-Java-Dependencies: Java > 1.8
+OpenIDE-Module-Implementation-Version: ${ugs.modules.implementation.version}
+AutoUpdate-Essential-Module: true