[build] omit the Properties Maven Plugin if there is no build.propert…

…ies [skip ci]
jruby · Dec 16, 2014 · 20b95a5 · 20b95a5
1 parent 23690ec
commit 20b95a5
Showing 2 changed files with 46 additions and 30 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -126,15 +126,6 @@
             } )
   end
 
-  plugin 'org.codehaus.mojo:properties-maven-plugin:1.0-alpha-2' do
-    execute_goals( 'read-project-properties',
-                   :id => 'properties',
-                   :phase => 'initialize',
-                   'files' => [ '${jruby.basedir}/default.build.properties',
-                                '${jruby.basedir}/build.properties' ],
-                   'quiet' =>  'true' )
-  end
-
   plugin 'org.codehaus.mojo:buildnumber-maven-plugin:1.2' do
     execute_goals( 'create',
                    :id => 'jruby-revision',
@@ -350,6 +341,22 @@
 
   end
 
+  profile 'build.properties' do
+
+    activation do
+      file( :exits => '../build.properties' )
+    end
+
+    plugin 'org.codehaus.mojo:properties-maven-plugin:1.0-alpha-2' do
+      execute_goals( 'read-project-properties',
+                     :id => 'properties',
+                     :phase => 'initialize',
+                     'files' => [ '${jruby.basedir}/build.properties' ],
+                     'quiet' =>  'true' )
+    end
+
+  end
+
   profile 'tzdata' do
 
     activation do

diff --git a/core/pom.xml b/core/pom.xml
@@ -343,27 +343,6 @@
       </plugins>
     </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>properties-maven-plugin</artifactId>
-        <version>1.0-alpha-2</version>
-        <executions>
-          <execution>
-            <id>properties</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>read-project-properties</goal>
-            </goals>
-            <configuration>
-              <files>
-                <file>${jruby.basedir}/default.build.properties</file>
-                <file>${jruby.basedir}/build.properties</file>
-              </files>
-              <quiet>true</quiet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>buildnumber-maven-plugin</artifactId>
@@ -1122,6 +1101,36 @@
         <maven.test.skip>false</maven.test.skip>
       </properties>
     </profile>
+    <profile>
+      <id>build.properties</id>
+      <activation>
+        <file />
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>properties-maven-plugin</artifactId>
+            <version>1.0-alpha-2</version>
+            <executions>
+              <execution>
+                <id>properties</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>read-project-properties</goal>
+                </goals>
+                <configuration>
+                  <files>
+                    <file>${jruby.basedir}/build.properties</file>
+                  </files>
+                  <quiet>true</quiet>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>tzdata</id>
       <activation>