Merge pull request #4137 from jruby/test_enforcer

Unconditionally enable maven enforcer in release profile.
jruby · Sep 6, 2016 · 4f4a8ed · 4f4a8ed
2 parents 1ed8422 + 3692f9f
commit 4f4a8ed
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 24 deletions.
diff --git a/pom.rb b/pom.rb
@@ -122,12 +122,6 @@
     plugin :jar, '2.6'
 
     rules = { :requireMavenVersion => { :version => '[3.3.0,)' } }
-    unless model.version =~ /-SNAPSHOT/
-       #rules[:requireReleaseDeps] = { :message => 'No Snapshots Allowed!' }
-    end
-    plugin :enforcer, '1.4' do
-      execute_goal :enforce, :rules => rules
-    end
 
     plugin :compiler, '3.3'
     plugin :shade, '2.4.3'
@@ -276,6 +270,12 @@
   end
 
   profile 'release' do
+    plugin :enforcer, '1.4' do
+      execute_goal :enforce, :rules => {
+          requireMavenVersion: { :version => '[3.3.0,)' },
+          requireReleaseDeps: { :message => 'No Snapshots Allowed!' }
+      }
+    end
     modules [ 'truffle', 'test', 'maven' ]
     properties 'invoker.skip' => true
   end

diff --git a/pom.xml b/pom.xml
@@ -260,24 +260,6 @@ DO NOT MODIFIY - GENERATED CODE
           <artifactId>maven-jar-plugin</artifactId>
           <version>2.6</version>
         </plugin>
-        <plugin>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>enforce</goal>
-              </goals>
-              <configuration>
-                <rules>
-                  <requireMavenVersion>
-                    <version>[3.3.0,)</version>
-                  </requireMavenVersion>
-                </rules>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.3</version>
@@ -742,6 +724,31 @@ DO NOT MODIFIY - GENERATED CODE
     </profile>
     <profile>
       <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>1.4</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireMavenVersion>
+                      <version>[3.3.0,)</version>
+                    </requireMavenVersion>
+                    <requireReleaseDeps>
+                      <message>No Snapshots Allowed!</message>
+                    </requireReleaseDeps>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
       <modules>
         <module>truffle</module>
         <module>test</module>