diff --git a/basic/README.adoc b/basic/README.adoc index d3b6ed35f..4136d2758 100644 --- a/basic/README.adoc +++ b/basic/README.adoc @@ -29,7 +29,7 @@ The easiest way to create a new project to get started is via the https://start. ---- $ mkdir ui && cd ui $ curl https://start.spring.io/starter.tgz -d style=web \ --d style=security -d name=ui | tar -xzvf - +-d style=security -d name=ui | tar -xzvf - ---- You can then import that project (it's a normal Maven Java project by default) into your favourite IDE, or just work with the files and "mvn" on the command line. Then jump to the link:#add-a-home-page[next section]. @@ -170,27 +170,27 @@ To create static resources at build time we add some magic to the Maven `pom.xml ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/css - ${project.build.directory}/classes/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/generated-resources/static/css + ${project.build.directory}/generated-resources/static/js + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7 + ${bootstrap.version} @@ -232,9 +232,9 @@ postProcessors=less4j,jsMin ---- - webjar:bootstrap/3.3.7/less/bootstrap.less + webjar:bootstrap/3.3.7/less/bootstrap.less file:./src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js + webjar:jquery/${jquery.version}/jquery.min.js webjar:angularjs/1.4.9/angular.min.js diff --git a/basic/pom.xml b/basic/pom.xml index 7dd9d53cf..08ea9fb7f 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -35,25 +35,60 @@ org.webjars angularjs - 1.4.9 + ${angularjs.version} test org.webjars jasmine - 2.0.0 + ${jasmine.version} test UTF-8 - 1.8.0 1.8 + 1.8.0 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 + + + ${project.basedir}/src/main/resources + + + ${project.build.directory}/generated-resources + + + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -72,27 +107,27 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/css - ${project.build.directory}/classes/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/generated-resources/static/css + ${project.build.directory}/generated-resources/static/js + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} @@ -111,12 +146,12 @@ /lib - ${project.build.directory}/classes/static/js + ${project.build.directory}/generated-resources/static/js /lib/angular-bootstrap.js - /webjars/angularjs/1.4.9/angular-mocks.js + /webjars/angularjs/${angularjs.version}/angular-mocks.js ${project.basedir}/src/main/resources/static/js ${project.basedir}/src/test/resources/static/js diff --git a/basic/src/main/wro/wro.xml b/basic/src/main/wro/wro.xml index 10e602ea4..41c063844 100644 --- a/basic/src/main/wro/wro.xml +++ b/basic/src/main/wro/wro.xml @@ -1,10 +1,10 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js - webjar:angularjs/1.4.9/angular-cookies.min.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js + webjar:angularjs/@angularjs.version@/angular-cookies.min.js \ No newline at end of file diff --git a/double/admin/pom.xml b/double/admin/pom.xml index 3eff98f88..dcea8ff16 100644 --- a/double/admin/pom.xml +++ b/double/admin/pom.xml @@ -51,6 +51,10 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 @@ -63,6 +67,29 @@ + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -83,25 +110,25 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory ${project.build.directory}/generated-resources/static/css ${project.build.directory}/generated-resources/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/double/admin/src/main/wro/wro.xml b/double/admin/src/main/wro/wro.xml index 170fcd215..097fc3524 100644 --- a/double/admin/src/main/wro/wro.xml +++ b/double/admin/src/main/wro/wro.xml @@ -1,10 +1,10 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js - webjar:angularjs/1.4.9/angular-cookies.min.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js + webjar:angularjs/@angularjs.version@/angular-cookies.min.js \ No newline at end of file diff --git a/double/gateway/pom.xml b/double/gateway/pom.xml index 92ac67ff2..9fd87a80d 100644 --- a/double/gateway/pom.xml +++ b/double/gateway/pom.xml @@ -78,6 +78,10 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 @@ -90,6 +94,29 @@ + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -110,25 +137,25 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory ${project.build.directory}/generated-resources/static/css ${project.build.directory}/generated-resources/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/double/gateway/src/main/wro/wro.xml b/double/gateway/src/main/wro/wro.xml index e09a3fd4f..79dabaefb 100644 --- a/double/gateway/src/main/wro/wro.xml +++ b/double/gateway/src/main/wro/wro.xml @@ -1,10 +1,10 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js - webjar:angularjs/1.4.9/angular-cookies.min.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js + webjar:angularjs/@angularjs.version@/angular-cookies.min.js \ No newline at end of file diff --git a/double/ui/pom.xml b/double/ui/pom.xml index 058f26dfc..03b34e25d 100644 --- a/double/ui/pom.xml +++ b/double/ui/pom.xml @@ -51,10 +51,45 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 + + + ${project.basedir}/src/main/resources + + + ${project.build.directory}/generated-resources + + + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -73,27 +108,27 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/css - ${project.build.directory}/classes/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/generated-resources/static/css + ${project.build.directory}/generated-resources/static/js + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/double/ui/src/main/wro/wro.xml b/double/ui/src/main/wro/wro.xml index 10e602ea4..482ab6ba7 100644 --- a/double/ui/src/main/wro/wro.xml +++ b/double/ui/src/main/wro/wro.xml @@ -1,10 +1,10 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js - webjar:angularjs/1.4.9/angular-cookies.min.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js + webjar:angularjs/@angularjs.version@/angular-cookies.min.js \ No newline at end of file diff --git a/modular/pom.xml b/modular/pom.xml index 74aa07e77..0d490f826 100644 --- a/modular/pom.xml +++ b/modular/pom.xml @@ -52,6 +52,10 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 @@ -64,6 +68,29 @@ + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -84,25 +111,25 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory ${project.build.directory}/generated-resources/static/css ${project.build.directory}/generated-resources/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/modular/src/main/wro/wro.xml b/modular/src/main/wro/wro.xml index 1997c4222..0840100c6 100644 --- a/modular/src/main/wro/wro.xml +++ b/modular/src/main/wro/wro.xml @@ -1,10 +1,10 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js - webjar:angularjs/1.4.9/angular-cookies.min.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js + webjar:angularjs/@angularjs.version@/angular-cookies.min.js diff --git a/oauth2-vanilla/ui/pom.xml b/oauth2-vanilla/ui/pom.xml index d602e2144..30cd8decc 100644 --- a/oauth2-vanilla/ui/pom.xml +++ b/oauth2-vanilla/ui/pom.xml @@ -74,10 +74,45 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 + + + ${project.basedir}/src/main/resources + + + ${project.build.directory}/generated-resources + + + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -96,27 +131,27 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/css - ${project.build.directory}/classes/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/generated-resources/static/css + ${project.build.directory}/generated-resources/static/js + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/oauth2-vanilla/ui/src/main/wro/wro.xml b/oauth2-vanilla/ui/src/main/wro/wro.xml index 213a53714..8a5ff0733 100644 --- a/oauth2-vanilla/ui/src/main/wro/wro.xml +++ b/oauth2-vanilla/ui/src/main/wro/wro.xml @@ -1,9 +1,9 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.js - webjar:angularjs/1.4.9/angular.js - webjar:angularjs/1.4.9/angular-route.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js \ No newline at end of file diff --git a/oauth2/authserver/pom.xml b/oauth2/authserver/pom.xml index 791455885..9d14788f8 100644 --- a/oauth2/authserver/pom.xml +++ b/oauth2/authserver/pom.xml @@ -60,6 +60,10 @@ demo.AuthserverApplication 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 @@ -72,6 +76,29 @@ + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -92,20 +119,20 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory ${project.build.directory}/generated-resources/static/css ${project.build.directory}/generated-resources/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/oauth2/authserver/src/main/wro/wro.xml b/oauth2/authserver/src/main/wro/wro.xml index 21014aaf5..837274666 100644 --- a/oauth2/authserver/src/main/wro/wro.xml +++ b/oauth2/authserver/src/main/wro/wro.xml @@ -1,7 +1,7 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less - file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less + file:@project.basedir@/src/main/wro/main.less + webjar:jquery/@jquery.version@/jquery.min.js \ No newline at end of file diff --git a/oauth2/ui/pom.xml b/oauth2/ui/pom.xml index 7dc82ce74..64d29a6f8 100644 --- a/oauth2/ui/pom.xml +++ b/oauth2/ui/pom.xml @@ -78,10 +78,45 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 + + + ${project.basedir}/src/main/resources + + + ${project.build.directory}/generated-resources + + + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -100,27 +135,27 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/css - ${project.build.directory}/classes/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/generated-resources/static/css + ${project.build.directory}/generated-resources/static/js + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/oauth2/ui/src/main/wro/wro.xml b/oauth2/ui/src/main/wro/wro.xml index f78c557ff..8a5ff0733 100644 --- a/oauth2/ui/src/main/wro/wro.xml +++ b/oauth2/ui/src/main/wro/wro.xml @@ -1,9 +1,9 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2c2f35bb7..7d34fa1ec 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,8 @@ double modular - - + + diff --git a/proxy/ui/pom.xml b/proxy/ui/pom.xml index dab669a99..ecf58581a 100644 --- a/proxy/ui/pom.xml +++ b/proxy/ui/pom.xml @@ -78,10 +78,45 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 + + + ${project.basedir}/src/main/resources + + + ${project.build.directory}/generated-resources + + + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -100,27 +135,27 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/css - ${project.build.directory}/classes/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/generated-resources/static/css + ${project.build.directory}/generated-resources/static/js + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/proxy/ui/src/main/wro/wro.xml b/proxy/ui/src/main/wro/wro.xml index 10e602ea4..482ab6ba7 100644 --- a/proxy/ui/src/main/wro/wro.xml +++ b/proxy/ui/src/main/wro/wro.xml @@ -1,10 +1,10 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js - webjar:angularjs/1.4.9/angular-cookies.min.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js + webjar:angularjs/@angularjs.version@/angular-cookies.min.js \ No newline at end of file diff --git a/single/pom.xml b/single/pom.xml index 6dffdcd5e..0a3eec9f0 100644 --- a/single/pom.xml +++ b/single/pom.xml @@ -40,13 +40,13 @@ org.webjars angularjs - 1.4.9 + ${angularjs.version} test org.webjars jasmine - 2.4.1 + ${jasmine.version} test @@ -55,10 +55,45 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 + + + ${project.basedir}/src/main/resources + + + ${project.build.directory}/generated-resources + + + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -77,27 +112,27 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/css - ${project.build.directory}/classes/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/generated-resources/static/css + ${project.build.directory}/generated-resources/static/js + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/single/src/main/wro/wro.xml b/single/src/main/wro/wro.xml index 4852d368f..0840100c6 100644 --- a/single/src/main/wro/wro.xml +++ b/single/src/main/wro/wro.xml @@ -1,10 +1,10 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less - file:./src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js - webjar:angularjs/1.4.9/angular-cookies.min.js + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less + file:@project.basedir@/src/main/wro/main.less + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js + webjar:angularjs/@angularjs.version@/angular-cookies.min.js diff --git a/spring-session/ui/pom.xml b/spring-session/ui/pom.xml index b2a35f304..f19068d8c 100644 --- a/spring-session/ui/pom.xml +++ b/spring-session/ui/pom.xml @@ -51,10 +51,45 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 + + + ${project.basedir}/src/main/resources + + + ${project.build.directory}/generated-resources + + + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -73,27 +108,27 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/css - ${project.build.directory}/classes/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/generated-resources/static/css + ${project.build.directory}/generated-resources/static/js + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/spring-session/ui/src/main/wro/wro.xml b/spring-session/ui/src/main/wro/wro.xml index 10e602ea4..482ab6ba7 100644 --- a/spring-session/ui/src/main/wro/wro.xml +++ b/spring-session/ui/src/main/wro/wro.xml @@ -1,10 +1,10 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js - webjar:angularjs/1.4.9/angular-cookies.min.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js + webjar:angularjs/@angularjs.version@/angular-cookies.min.js \ No newline at end of file diff --git a/vanilla/ui/pom.xml b/vanilla/ui/pom.xml index 14e10edfb..911443cd3 100644 --- a/vanilla/ui/pom.xml +++ b/vanilla/ui/pom.xml @@ -43,10 +43,45 @@ UTF-8 1.8.0 1.8 + 1.4.9 + 3.3.7-1 + 2.2.4 + 2.0.0 + + + ${project.basedir}/src/main/resources + + + ${project.build.directory}/generated-resources + + + + maven-resources-plugin + + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/wro + + + src/main/wro + true + + + + + + org.springframework.boot spring-boot-maven-plugin @@ -65,27 +100,27 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/css - ${project.build.directory}/classes/static/js - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/wro + ${project.build.directory}/generated-resources/static/css + ${project.build.directory}/generated-resources/static/js + ${project.build.directory}/wro/wro.xml + ${project.build.directory}/wro/wro.properties + ${project.build.directory}/wro org.webjars jquery - 2.2.4 + ${jquery.version} org.webjars angularjs - 1.4.9 + ${angularjs.version} org.webjars bootstrap - 3.3.7-1 + ${bootstrap.version} diff --git a/vanilla/ui/src/main/wro/wro.xml b/vanilla/ui/src/main/wro/wro.xml index 10e602ea4..482ab6ba7 100644 --- a/vanilla/ui/src/main/wro/wro.xml +++ b/vanilla/ui/src/main/wro/wro.xml @@ -1,10 +1,10 @@ - webjar:bootstrap/3.3.7-1/less/bootstrap.less + webjar:bootstrap/@bootstrap.version@/less/bootstrap.less file:@project.basedir@/src/main/wro/main.less - webjar:jquery/2.2.4/jquery.min.js - webjar:angularjs/1.4.9/angular.min.js - webjar:angularjs/1.4.9/angular-route.min.js - webjar:angularjs/1.4.9/angular-cookies.min.js + webjar:jquery/@jquery.version@/jquery.min.js + webjar:angularjs/@angularjs.version@/angular.min.js + webjar:angularjs/@angularjs.version@/angular-route.min.js + webjar:angularjs/@angularjs.version@/angular-cookies.min.js \ No newline at end of file