Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/6.0.0-alpha108-dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Serg-Maximchuk
Serg-Maximchuk committed Jun 9, 2017
2 parents 0a43a37 + ba2c5e0 commit cb761d8
Show file tree
Hide file tree
Showing 1,734 changed files with 26,721 additions and 26,639 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.TXT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ lib/noinstall/*.*
server/**
sql/**
tools/**
web/**
webapp/**
MANIFEST.TXT
build.properties.template
build.xml
Expand Down
12 changes: 6 additions & 6 deletions pom-ant.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,17 @@
</copy>

<copy todir="${build.webapp.dir}" filtering="true" encoding="utf-8">
<fileset dir="src/main/web"
<fileset dir="src/main/webapp"
excludes="imcms/lang/**,WEB-INF/templates/lang/**,${imagespattern},${swfpattern}"/>
</copy>

<copy todir="${build.webapp.dir}">
<fileset dir="src/main/web" excludes="imcms/lang/**,WEB-INF/templates/lang/**"
<fileset dir="src/main/webapp" excludes="imcms/lang/**,WEB-INF/templates/lang/**"
includes="${imagespattern},${swfpattern}"/>
</copy>

<copy todir="${webinf.solr.dir}">
<fileset dir="src/main/web/WEB-INF/solr"/>
<fileset dir="src/main/webapp/WEB-INF/solr"/>
</copy>

<antcall target="web-lang">
Expand Down Expand Up @@ -122,17 +122,17 @@
<imtranslate bundle="${main.resources-conf.dir}/imcms" bundlelanguage="${buildlanguage}"
starttoken="&lt;? " endtoken=" ?&gt;"
todir="${webinf.templates.dir}/${buildlanguage}" filtering="true" encoding="utf-8">
<fileset dir="src/main/web/WEB-INF/templates/lang"/>
<fileset dir="src/main/webapp/WEB-INF/templates/lang"/>
</imtranslate>

<imtranslate bundle="${main.resources-conf.dir}/imcms" bundlelanguage="${buildlanguage}"
starttoken="&lt;? " endtoken=" ?&gt;"
todir="${build.webapp.imcms.dir}/${buildlanguage}" filtering="true" encoding="utf-8">
<fileset dir="src/main/web/imcms/lang" excludes="${imagespattern}"/>
<fileset dir="src/main/webapp/imcms/lang" excludes="${imagespattern}"/>
</imtranslate>

<copy todir="${build.webapp.imcms.dir}/${buildlanguage}" filtering="false">
<fileset dir="src/main/web/imcms/lang" includes="${imagespattern}"/>
<fileset dir="src/main/webapp/imcms/lang" includes="${imagespattern}"/>
</copy>
</target>

Expand Down
39 changes: 15 additions & 24 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>com.imcode.imcms</groupId>
<artifactId>imcms</artifactId>
<version>6.0.0-alpha107</version>
<version>6.0.0-alpha108</version>
<packaging>war</packaging>

<name>imCMS</name>
Expand Down Expand Up @@ -471,6 +471,12 @@
<version>5.2.2.Final</version>
</dependency>

<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>classmate</artifactId>
<version>1.3.3</version>
</dependency>

<dependency>
<groupId>com.imcode.db</groupId>
<artifactId>imcode-db</artifactId>
Expand Down Expand Up @@ -826,7 +832,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.8.3</version>
<version>1.10.2</version>
</dependency>

<!--W3C validators api-->
Expand Down Expand Up @@ -1097,11 +1103,12 @@
<version>1.5.1</version>
<configuration>
<force>true</force>
<sourceDirectory>${project.basedir}/src/main/web</sourceDirectory>
<sourceDirectory>${project.basedir}/src/main/webapp</sourceDirectory>
<outputDirectory>${build.webapp.dir}/</outputDirectory>

<excludes>
<!--excluding already minified files-->
<!--<exclude>**/**</exclude>-->
<exclude>**/*.min.js</exclude>
<exclude>**/*.min.css</exclude>
</excludes>
Expand All @@ -1123,8 +1130,11 @@
<include>**/JSFormBuilder.js</include>
<include>**/imcms_addons.js</include>
<include>**/imcms_linker.js</include>
<include>**/imcms_simple_api.js</include>
<include>**/imcms_base.js</include>
<include>**/imcms_rest_api.js</include>
<include>**/imcms_simple_api_factory.js</include>
<include>**/imcms_editors.js</include>
<include>**/imcms_bootstrap.js</include>
<include>**/imcms_frame_builder.js</include>
<include>**/imcms_connector.js</include>
<include>**/imcms_adminpanel.js</include>
<include>**/imcms_logger.js</include>
Expand All @@ -1135,13 +1145,7 @@
<include>**/imcms_loop.js</include>
<include>**/imcms_menu.js</include>
<include>**/imcms_text.js</include>
<include>**/imcms_language.js</include>
<include>**/imcms_template.js</include>
<include>**/imcms_category.js</include>
<include>**/imcms_user.js</include>
<include>**/imcms_document.js</include>
<include>**/imcms_role.js</include>
<include>**/imcms_permission.js</include>
<include>**/imcms_file.js</include>
<include>**/imcms_folder.js</include>
<include>**/imcms_content.js</include>
Expand Down Expand Up @@ -1281,24 +1285,11 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5</version>
<configuration>
<excludes>
<exclude>**/Test*.java</exclude>
<exclude>**/*TestCase.java</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<argLine>-Xms512m -Xmx1024m</argLine>
<includes>
<include>**/*Spec.java</include>
<include>**/*Suite.java</include>
</includes>
</configuration>
</plugin>

<plugin>
Expand Down

0 comments on commit cb761d8

Please sign in to comment.