Thanks to visit codestin.com
Credit goes to github.com

Skip to content

DRYing the webjars versions in leaf projects #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

DRYing the webjars versions in leaf projects #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions basic/README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down Expand Up @@ -170,27 +170,27 @@ To create static resources at build time we add some magic to the Maven `pom.xml
</executions>
<configuration>
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
<cssDestinationFolder>${project.build.directory}/classes/static/css</cssDestinationFolder>
<jsDestinationFolder>${project.build.directory}/classes/static/js</jsDestinationFolder>
<wroFile>${basedir}/src/main/wro/wro.xml</wroFile>
<extraConfigFile>${basedir}/src/main/wro/wro.properties</extraConfigFile>
<contextFolder>${basedir}/src/main/wro</contextFolder>
<cssDestinationFolder>${project.build.directory}/generated-resources/static/css</cssDestinationFolder>
<jsDestinationFolder>${project.build.directory}/generated-resources/static/js</jsDestinationFolder>
<wroFile>${project.build.directory}/wro/wro.xml</wroFile>
<extraConfigFile>${project.build.directory}/wro/wro.properties</extraConfigFile>
<contextFolder>${project.build.directory}/wro</contextFolder>
</configuration>
<dependencies>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>2.2.4</version>
<version>${jquery.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>angularjs</artifactId>
<version>1.4.9</version>
<version>${angularjs.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>3.3.7</version>
<version>${bootstrap.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -232,9 +232,9 @@ postProcessors=less4j,jsMin
----
<groups xmlns="http://www.isdc.ro/wro">
<group name="angular-bootstrap">
<css>webjar:bootstrap/3.3.7/less/bootstrap.less</css>
<css>webjar:bootstrap/3.3.7/less/bootstrap.less</css>
<css>file:./src/main/wro/main.less</css>
<js>webjar:jquery/2.2.4/jquery.min.js</js>
<js>webjar:jquery/${jquery.version}/jquery.min.js</js>
<js>webjar:angularjs/1.4.9/angular.min.js</js>
</group>
</groups>
Expand Down
61 changes: 48 additions & 13 deletions basic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,60 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>angularjs</artifactId>
<version>1.4.9</version>
<version>${angularjs.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jasmine</artifactId>
<version>2.0.0</version>
<version>${jasmine.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<wro4j.version>1.8.0</wro4j.version>
<java.version>1.8</java.version>
<wro4j.version>1.8.0</wro4j.version>
<angularjs.version>1.4.9</angularjs.version>
<bootstrap.version>3.3.7-1</bootstrap.version>
<jquery.version>2.2.4</jquery.version>
<jasmine.version>2.0.0</jasmine.version>
</properties>

<build>
<resources>
<resource>
<directory>${project.basedir}/src/main/resources</directory>
</resource>
<resource>
<directory>${project.build.directory}/generated-resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<!-- Serves *only* to filter the wro.xml so it can get an absolute
path for the project -->
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/wro</outputDirectory>
<resources>
<resource>
<directory>src/main/wro</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand All @@ -72,27 +107,27 @@
</executions>
<configuration>
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
<cssDestinationFolder>${project.build.directory}/classes/static/css</cssDestinationFolder>
<jsDestinationFolder>${project.build.directory}/classes/static/js</jsDestinationFolder>
<wroFile>${basedir}/src/main/wro/wro.xml</wroFile>
<extraConfigFile>${basedir}/src/main/wro/wro.properties</extraConfigFile>
<contextFolder>${basedir}/src/main/wro</contextFolder>
<cssDestinationFolder>${project.build.directory}/generated-resources/static/css</cssDestinationFolder>
<jsDestinationFolder>${project.build.directory}/generated-resources/static/js</jsDestinationFolder>
<wroFile>${project.build.directory}/wro/wro.xml</wroFile>
<extraConfigFile>${project.build.directory}/wro/wro.properties</extraConfigFile>
<contextFolder>${project.build.directory}/wro</contextFolder>
</configuration>
<dependencies>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>2.2.4</version>
<version>${jquery.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>angularjs</artifactId>
<version>1.4.9</version>
<version>${angularjs.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>3.3.7-1</version>
<version>${bootstrap.version}</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -111,12 +146,12 @@
<additionalContexts>
<context>
<contextRoot>/lib</contextRoot>
<directory>${project.build.directory}/classes/static/js</directory>
<directory>${project.build.directory}/generated-resources/static/js</directory>
</context>
</additionalContexts>
<preloadSources>
<source>/lib/angular-bootstrap.js</source>
<source>/webjars/angularjs/1.4.9/angular-mocks.js</source>
<source>/webjars/angularjs/${angularjs.version}/angular-mocks.js</source>
</preloadSources>
<jsSrcDir>${project.basedir}/src/main/resources/static/js</jsSrcDir>
<jsTestSrcDir>${project.basedir}/src/test/resources/static/js</jsTestSrcDir>
Expand Down
10 changes: 5 additions & 5 deletions basic/src/main/wro/wro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<groups xmlns="http://www.isdc.ro/wro">
<group name="angular-bootstrap">
<css>webjar:bootstrap/3.3.7-1/less/bootstrap.less</css>
<css>webjar:bootstrap/@bootstrap.version@/less/bootstrap.less</css>
<css>file:@project.basedir@/src/main/wro/main.less</css>
<js>webjar:jquery/2.2.4/jquery.min.js</js>
<js>webjar:angularjs/1.4.9/angular.min.js</js>
<js>webjar:angularjs/1.4.9/angular-route.min.js</js>
<js>webjar:angularjs/1.4.9/angular-cookies.min.js</js>
<js>webjar:jquery/@jquery.version@/jquery.min.js</js>
<js>webjar:angularjs/@angularjs.version@/angular.min.js</js>
<js>webjar:angularjs/@angularjs.version@/angular-route.min.js</js>
<js>webjar:angularjs/@angularjs.version@/angular-cookies.min.js</js>
</group>
</groups>
39 changes: 33 additions & 6 deletions double/admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<wro4j.version>1.8.0</wro4j.version>
<java.version>1.8</java.version>
<angularjs.version>1.4.9</angularjs.version>
<bootstrap.version>3.3.7-1</bootstrap.version>
<jquery.version>2.2.4</jquery.version>
<jasmine.version>2.0.0</jasmine.version>
</properties>

<build>
Expand All @@ -63,6 +67,29 @@
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<!-- Serves *only* to filter the wro.xml so it can get an absolute
path for the project -->
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/wro</outputDirectory>
<resources>
<resource>
<directory>src/main/wro</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand All @@ -83,25 +110,25 @@
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
<cssDestinationFolder>${project.build.directory}/generated-resources/static/css</cssDestinationFolder>
<jsDestinationFolder>${project.build.directory}/generated-resources/static/js</jsDestinationFolder>
<wroFile>${basedir}/src/main/wro/wro.xml</wroFile>
<extraConfigFile>${basedir}/src/main/wro/wro.properties</extraConfigFile>
<contextFolder>${basedir}/src/main/wro</contextFolder>
<wroFile>${project.build.directory}/wro/wro.xml</wroFile>
<extraConfigFile>${project.build.directory}/wro/wro.properties</extraConfigFile>
<contextFolder>${project.build.directory}/wro</contextFolder>
</configuration>
<dependencies>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>2.2.4</version>
<version>${jquery.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>angularjs</artifactId>
<version>1.4.9</version>
<version>${angularjs.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>3.3.7-1</version>
<version>${bootstrap.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down
10 changes: 5 additions & 5 deletions double/admin/src/main/wro/wro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<groups xmlns="http://www.isdc.ro/wro">
<group name="admin-assets">
<css>webjar:bootstrap/3.3.7-1/less/bootstrap.less</css>
<css>webjar:bootstrap/@bootstrap.version@/less/bootstrap.less</css>
<css>file:@project.basedir@/src/main/wro/main.less</css>
<js>webjar:jquery/2.2.4/jquery.min.js</js>
<js>webjar:angularjs/1.4.9/angular.min.js</js>
<js>webjar:angularjs/1.4.9/angular-route.min.js</js>
<js>webjar:angularjs/1.4.9/angular-cookies.min.js</js>
<js>webjar:jquery/@jquery.version@/jquery.min.js</js>
<js>webjar:angularjs/@angularjs.version@/angular.min.js</js>
<js>webjar:angularjs/@angularjs.version@/angular-route.min.js</js>
<js>webjar:angularjs/@angularjs.version@/angular-cookies.min.js</js>
</group>
</groups>
39 changes: 33 additions & 6 deletions double/gateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<wro4j.version>1.8.0</wro4j.version>
<java.version>1.8</java.version>
<angularjs.version>1.4.9</angularjs.version>
<bootstrap.version>3.3.7-1</bootstrap.version>
<jquery.version>2.2.4</jquery.version>
<jasmine.version>2.0.0</jasmine.version>
</properties>

<build>
Expand All @@ -90,6 +94,29 @@
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<!-- Serves *only* to filter the wro.xml so it can get an absolute
path for the project -->
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/wro</outputDirectory>
<resources>
<resource>
<directory>src/main/wro</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand All @@ -110,25 +137,25 @@
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
<cssDestinationFolder>${project.build.directory}/generated-resources/static/css</cssDestinationFolder>
<jsDestinationFolder>${project.build.directory}/generated-resources/static/js</jsDestinationFolder>
<wroFile>${basedir}/src/main/wro/wro.xml</wroFile>
<extraConfigFile>${basedir}/src/main/wro/wro.properties</extraConfigFile>
<contextFolder>${basedir}/src/main/wro</contextFolder>
<wroFile>${project.build.directory}/wro/wro.xml</wroFile>
<extraConfigFile>${project.build.directory}/wro/wro.properties</extraConfigFile>
<contextFolder>${project.build.directory}/wro</contextFolder>
</configuration>
<dependencies>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>2.2.4</version>
<version>${jquery.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>angularjs</artifactId>
<version>1.4.9</version>
<version>${angularjs.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>3.3.7-1</version>
<version>${bootstrap.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down
10 changes: 5 additions & 5 deletions double/gateway/src/main/wro/wro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<groups xmlns="http://www.isdc.ro/wro">
<group name="gateway-assets">
<css>webjar:bootstrap/3.3.7-1/less/bootstrap.less</css>
<css>webjar:bootstrap/@bootstrap.version@/less/bootstrap.less</css>
<css>file:@project.basedir@/src/main/wro/main.less</css>
<js>webjar:jquery/2.2.4/jquery.min.js</js>
<js>webjar:angularjs/1.4.9/angular.min.js</js>
<js>webjar:angularjs/1.4.9/angular-route.min.js</js>
<js>webjar:angularjs/1.4.9/angular-cookies.min.js</js>
<js>webjar:jquery/@jquery.version@/jquery.min.js</js>
<js>webjar:angularjs/@angularjs.version@/angular.min.js</js>
<js>webjar:angularjs/@angularjs.version@/angular-route.min.js</js>
<js>webjar:angularjs/@angularjs.version@/angular-cookies.min.js</js>
</group>
</groups>
Loading