johnzon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Romain Manni-Bucau <rmannibu...@gmail.com>
Subject Fwd: incubator-johnzon git commit: JOHNZON-45 - Build fails on java 1.6
Date Sat, 11 Apr 2015 14:50:53 GMT
Should we force j7 for release profile?
---------- Message transféré ----------
De : <salyh@apache.org>
Date : 11 avr. 2015 12:36
Objet : incubator-johnzon git commit: JOHNZON-45 - Build fails on java 1.6
À : <commits@johnzon.incubator.apache.org>
Cc :

Repository: incubator-johnzon
Updated Branches:
  refs/heads/master a6a07a3c4 -> 9ad17dc81


JOHNZON-45 - Build fails on java 1.6


Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/9ad17dc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/9ad17dc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/9ad17dc8

Branch: refs/heads/master
Commit: 9ad17dc8157406e0b16a5a47521270428e83f963
Parents: a6a07a3
Author: Hendrik Saly <hendrikdev22@gmail.com>
Authored: Sat Apr 11 12:34:13 2015 +0200
Committer: Hendrik Saly <hendrikdev22@gmail.com>
Committed: Sat Apr 11 12:34:13 2015 +0200

----------------------------------------------------------------------
 johnzon-websocket/pom.xml | 22 ++++++++++++++++++++++
 pom.xml                   | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/9ad17dc8/johnzon-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index ea9f3c2..31efa85 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -92,6 +92,28 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-versions</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>[3.1,)</version>
+                </requireMavenVersion>
+                <requireJavaVersion>
+                  <version>[1.7,)</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <packaging>bundle</packaging>

http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/9ad17dc8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 36089da..4ba70f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,6 @@
     <module>johnzon-core</module>
     <module>johnzon-mapper</module>
     <module>johnzon-jaxrs</module>
-    <module>johnzon-websocket</module>
     <module>johnzon-distribution</module>
   </modules>

@@ -335,6 +334,29 @@
              </instructions>
          </configuration>
         </plugin>
+        <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <id>enforce-versions</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>[3.1,)</version>
+                </requireMavenVersion>
+                <requireJavaVersion>
+                  <version>[1.6,)</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>

@@ -609,4 +631,17 @@
                <name>Thiago Veronezi</name>
        </contributor>
   </contributors>
+
+    <profiles>
+        <profile>
+            <!-- Websocket module needs java 1.7 or higher -->
+            <id>jdk1.7+</id>
+            <activation>
+                <jdk>[1.7,)</jdk>
+            </activation>
+            <modules>
+                <module>johnzon-websocket</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message