Mercurial Mercurial > renkan / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with de0d488a0a1bbf8407b66d34c7ee1a214926e63d
authorrougeronj
Mon, 05 Oct 2015 11:09:00 +0200
changeset 577 105ddd569ff7
parent 576 1e1791dfc9e4 (current diff)
parent 574 de0d488a0a1b (diff)
child 578 75a63b2af823
Merge with de0d488a0a1bbf8407b66d34c7ee1a214926e63d
--- a/client/gruntfile.js	Mon Oct 05 11:08:26 2015 +0200
+++ b/client/gruntfile.js	Mon Oct 05 11:09:00 2015 +0200
@@ -284,7 +284,7 @@
                 }]
             },
             'version-maven': {
-                src: ['../server/java/pom.xml'],
+                src: ['../server/java/pom.xml', '../server/java/renkan-core/pom.xml', '../server/java/renkan-web/pom.xml', '../server/java/renkan-management/pom.xml'],
                 overwrite: true,
                 replacements: [{
                     from: /^(\s+)<version>\s*([\d\.]+)\s*<\/version>[ \t]*$/m,
--- a/server/java/README.md	Mon Oct 05 11:08:26 2015 +0200
+++ b/server/java/README.md	Mon Oct 05 11:09:00 2015 +0200
@@ -2,12 +2,13 @@
 
 - Icon user from echo-icon-theme (echo) (Open Icon Library - http://openiconlibrary.sourceforge.net/)  
 licence CC BY-SA - Creative Commons
-- eye icon by : Danilo De Marco : http://www.danilodemarco.com/ 
+- eye icon by : Danilo De Marco : http://www.danilodemarco.com/
 
 - cf pom.xml for dependencies
 
 Commandes maven:
 mvn -DskipTests -Djava.awt.headless=true -Duser.timezone="UTC" clean jetty:run-war
+mvn -Djava.awt.headless=true -Duser.timezone="UTC" clean package
 
 Commandes graddle:
   - `./gradlew clean build`
@@ -17,6 +18,3 @@
 Run a specific test : `./gradlew :renkan-web:test --tests org.iri_research.renkan.test.controller.RenkanControllerTest.testViewIdProject`
 
 The war file can then be fount in renkan-web/build/libs.
-
-
-
--- a/server/java/renkan-core/pom.xml	Mon Oct 05 11:08:26 2015 +0200
+++ b/server/java/renkan-core/pom.xml	Mon Oct 05 11:09:00 2015 +0200
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.iri_research.renkan</groupId>
         <artifactId>renkan</artifactId>
-        <version>0.7.11</version>
+        <version>0.12.11</version>
     </parent>
     <artifactId>renkan-core</artifactId>
     <name>renkan-core</name>
@@ -28,6 +28,7 @@
         <commons-collections-version>4.0</commons-collections-version>
         <junit-version>4.11</junit-version>
         <slf4j-log4j12-version>1.7.5</slf4j-log4j12-version>
+        <maven-compiler-plugin-version>3.3</maven-compiler-plugin-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <repositories>
@@ -60,7 +61,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>${maven-compiler-plugin-version}</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
--- a/server/java/renkan-management/pom.xml	Mon Oct 05 11:08:26 2015 +0200
+++ b/server/java/renkan-management/pom.xml	Mon Oct 05 11:09:00 2015 +0200
@@ -5,7 +5,7 @@
   <parent>
       <groupId>org.iri_research.renkan</groupId>
       <artifactId>renkan</artifactId>
-      <version>0.7.11</version>
+      <version>0.12.11</version>
   </parent>
 
   <artifactId>renkan-management</artifactId>
@@ -18,6 +18,7 @@
     <slf4j-log4j12-version>1.7.5</slf4j-log4j12-version>
     <javax-servlet-api-version>3.0.1</javax-servlet-api-version>
     <spring-version>3.2.6.RELEASE</spring-version>
+    <maven-compiler-plugin-version>3.3</maven-compiler-plugin-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -63,7 +64,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>${maven-compiler-plugin-version}</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
--- a/server/java/renkan-web/build.gradle	Mon Oct 05 11:08:26 2015 +0200
+++ b/server/java/renkan-web/build.gradle	Mon Oct 05 11:09:00 2015 +0200
@@ -115,6 +115,11 @@
     testCompile group: 'commons-io', name: 'commons-io', version:commons_io_version
 }
 
+// call grunt
+task buildClient(type:Exec) {
+    workingDir "../../../client"
+    commandLine "node_modules/.bin/grunt"
+}
 //apply overlay
 
 war {
@@ -162,3 +167,5 @@
         into "static/data"
     }
 }
+
+war.dependsOn buildClient
--- a/server/java/renkan-web/pom.xml	Mon Oct 05 11:08:26 2015 +0200
+++ b/server/java/renkan-web/pom.xml	Mon Oct 05 11:09:00 2015 +0200
@@ -5,17 +5,17 @@
     <parent>
         <groupId>org.iri_research.renkan</groupId>
         <artifactId>renkan</artifactId>
-        <version>0.7.11</version>
+        <version>0.12.11</version>
     </parent>
     <artifactId>renkan-web</artifactId>
     <packaging>war</packaging>
 
     <properties>
-        <surefire-version>2.16</surefire-version>
+        <surefire-version>2.18</surefire-version>
         <coweb-version>1.0.1-SNAPSHOT</coweb-version>
         <cowebx-version>1.0</cowebx-version>
         <jersey-version>2.5.1</jersey-version>
-        <spring-version>3.2.6.RELEASE</spring-version>
+        <spring-version>3.2.9.RELEASE</spring-version>
         <spring-data-mongodb-version>1.3.3.RELEASE</spring-data-mongodb-version>
         <spring-security-version>3.2.0.RELEASE</spring-security-version>
         <spring-data-commons-version>1.6.3.RELEASE</spring-data-commons-version>
@@ -46,6 +46,8 @@
         <json-path-version>0.9.1</json-path-version>
         <commons-io-version>2.4</commons-io-version>
         <mongeez-version>0.9.4</mongeez-version>
+        <maven-compiler-plugin-version>3.3</maven-compiler-plugin-version>
+        <exec-maven-plugin-version>1.4.0</exec-maven-plugin-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -53,9 +55,27 @@
         <defaultGoal>package</defaultGoal>
         <plugins>
             <plugin>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <version>${exec-maven-plugin-version}</version>
+                <executions>
+                    <execution><!-- Run client build -->
+                        <id>Clident Build</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>node_modules/.bin/grunt</executable>
+                            <workingDirectory>${basedir}/../../../client</workingDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>${maven-compiler-plugin-version}</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
@@ -601,15 +621,15 @@
             <artifactId>spring-security-acl</artifactId>
             <version>${spring-security-version}</version>
         </dependency>
-	    <dependency>
+  	    <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-taglibs</artifactId>
             <version>${spring-security-version}</version>
-	    </dependency>
+  	    </dependency>
         <dependency>
-	       <groupId>de.undercouch</groupId>
-	       <artifactId>bson4jackson</artifactId>
-	       <version>${bson4jackson-version}</version>
+            <groupId>de.undercouch</groupId>
+            <artifactId>bson4jackson</artifactId>
+            <version>${bson4jackson-version}</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
renkan