Skip to content

Commit

Permalink
Prepare 1.0.0.0 release
Browse files Browse the repository at this point in the history 
- update version numbers
- consolidate JSHint plugin configuration
- add missing Eclipse lifecycle mappings for JSHint and build-helper
- exclude Aikau resources from minification (done at runtime)
  • Loading branch information
@AFaust
AFaust committed Nov 26, 2017
1 parent 8285775 commit ce626a4
Show file tree
Hide file tree
Showing 3 changed files with 109 additions and 23 deletions.
84 changes: 83 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>org.orderofthebee.support-tools</groupId>
<artifactId>support-tools-parent</artifactId>
<version>1.0.0.0-SNAPSHOT</version>
<version>1.0.0.0</version>
<packaging>pom</packaging>

<name>OOTBee Support Tools - Parent</name>
Expand Down Expand Up @@ -207,6 +207,26 @@
</executions>
</plugin>

<plugin>
<groupId>de.acosix.maven</groupId>
<artifactId>jshint-maven-plugin</artifactId>
<version>1.0.0</version>
<configuration>
<sourceDirectory>${project.basedir}/src/main</sourceDirectory>
<includes>
<include>amp/**/*.js</include>
</includes>
<checkstyleReportFile>js-checkstyle.xml</checkstyleReportFile>
</configuration>
<executions>
<execution>
<goals>
<goal>jshint</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
Expand All @@ -218,6 +238,68 @@
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>

<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId>
<versionRange>[0.0,)</versionRange>
<goals>
<goal>set-version</goal>
<goal>refresh-share</goal>
<goal>refresh-repo</goal>
<goal>refresh</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute>
<runOnIncremental>true</runOnIncremental>
<runOnConfiguration>true</runOnConfiguration>
</execute>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<versionRange>[1.10,)</versionRange>
<goals>
<goal>add-test-resource</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute>
<runOnIncremental>true</runOnIncremental>
<runOnConfiguration>true</runOnConfiguration>
</execute>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>de.acosix.maven</groupId>
<artifactId>jshint-maven-plugin</artifactId>
<versionRange>[1.0.0,)</versionRange>
<goals>
<goal>jshint</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute>
<runOnIncremental>true</runOnIncremental>
<runOnConfiguration>true</runOnConfiguration>
</execute>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
8 changes: 1 addition & 7 deletions repository/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.orderofthebee.support-tools</groupId>
<artifactId>support-tools-parent</artifactId>
<version>1.0.0.0-SNAPSHOT</version>
<version>1.0.0.0</version>
</parent>

<artifactId>support-tools-repo</artifactId>
Expand Down Expand Up @@ -94,12 +94,7 @@
<plugin>
<groupId>de.acosix.maven</groupId>
<artifactId>jshint-maven-plugin</artifactId>
<version>1.0.0</version>
<configuration>
<sourceDirectory>${project.basedir}/src/main</sourceDirectory>
<includes>
<include>amp/**/*.js</include>
</includes>
<excludes>
<exclude>amp/config/alfresco/templates/webscripts/**/*.get.js</exclude>
<exclude>amp/config/alfresco/templates/webscripts/**/*.delete.js</exclude>
Expand All @@ -113,7 +108,6 @@
<exclude>amp/web/ootbee-support-tools/js/dataTables.buttons.min.js</exclude>
<exclude>amp/web/ootbee-support-tools/js/dataTables.bootstrap4.min.js</exclude>
</excludes>
<checkstyleReportFile>js-checkstyle.xml</checkstyleReportFile>
</configuration>
<executions>
<execution>
Expand Down
40 changes: 25 additions & 15 deletions share/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.orderofthebee.support-tools</groupId>
<artifactId>support-tools-parent</artifactId>
<version>1.0.0.0-SNAPSHOT</version>
<version>1.0.0.0</version>
</parent>

<artifactId>support-tools-share</artifactId>
Expand Down Expand Up @@ -127,27 +127,37 @@
<plugin>
<groupId>de.acosix.maven</groupId>
<artifactId>jshint-maven-plugin</artifactId>
<version>1.0.0</version>
<configuration>
<sourceDirectory>${project.basedir}/src/main</sourceDirectory>
<includes>
<include>amp/**/*.js</include>
</includes>
<checkstyleReportFile>js-checkstyle.xml</checkstyleReportFile>
</configuration>
</plugin>

<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<executions>
<execution>
<id>compress-js</id>
<phase>process-resources</phase>
<goals>
<goal>jshint</goal>
<goal>compress</goal>
</goals>
<configuration>
<excludes>
<exclude>**/webscripts/**</exclude>
<exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude>
<exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude>
<!-- exclude Aikau resources (minified at runtime) -->
<exclude>web/ootbee-support-tools/**/*.js</exclude>
<exclude>web/ootbee-support-tools/**/*.css</exclude>
</excludes>
<sourceDirectory>src/main/amp</sourceDirectory>
<outputDirectory>${project.build.directory}/amp</outputDirectory>
<excludeResources>true</excludeResources>
<jswarn>false</jswarn>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
</plugin>
</plugins>

<!-- TODO Handle "standard" JAR, sources + JavaDoc creation which SDK sucks at -->
Expand Down

0 comments on commit ce626a4

Please sign in to comment.