ISIS-1333: removing jetty-console and antrun plugins from simpleapp webapp.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bd4ad92e Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bd4ad92e Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bd4ad92e Branch: refs/heads/master Commit: bd4ad92e0418dfcdbd477982ada1b822dacf249e Parents: aa51093 Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Sun Mar 20 11:35:52 2016 +0000 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Sun Mar 20 11:35:52 2016 +0000 ---------------------------------------------------------------------- example/application/simpleapp/pom.xml | 19 -- example/application/simpleapp/webapp/pom.xml | 280 ++++++++++--------- .../main/resources/archetype-resources/pom.xml | 6 - .../archetype-resources/webapp/pom.xml | 40 --- 4 files changed, 153 insertions(+), 192 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/bd4ad92e/example/application/simpleapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml index dd38483..124b8f9 100644 --- a/example/application/simpleapp/pom.xml +++ b/example/application/simpleapp/pom.xml @@ -197,25 +197,6 @@ <version>2.2</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- http://simplericity.com/2009/11/10/1257880778509.html --> - <plugin> - <groupId>org.simplericity.jettyconsole</groupId> - <artifactId>jetty-console-maven-plugin</artifactId> - <version>1.56</version> - </plugin> - <!-- Apache Release Audit Tool --> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/isis/blob/bd4ad92e/example/application/simpleapp/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml index 0c9ce66..fcab91d 100644 --- a/example/application/simpleapp/webapp/pom.xml +++ b/example/application/simpleapp/webapp/pom.xml @@ -40,24 +40,6 @@ <artifactId>jetty-maven-plugin</artifactId> </plugin> - <!-- mvn package --> - <plugin> - <groupId>org.simplericity.jettyconsole</groupId> - <artifactId>jetty-console-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>createconsole</goal> - </goals> - <configuration> - <backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage> - <destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile> - </configuration> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -72,79 +54,14 @@ </executions> </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <warName>simpleapp</warName> - <archive> - <manifest> - <addClasspath>false</addClasspath> - </manifest> - <manifestEntries> - <Build-Time>${maven.build.timestamp}</Build-Time> - <Build-Host>${agent.name}</Build-Host> - <Build-User>${user.name}</Build-User> - <Build-Maven>Maven ${maven.version}</Build-Maven> - <Build-Java>${java.version}</Build-Java> - <Build-OS>${os.name}</Build-OS> - <Build-Label>${project.version}</Build-Label> - </manifestEntries> - </archive> - <packagingExcludes> - WEB-INF/lib/isis-core-webserver*.jar, - WEB-INF/lib/javax.servlet-api-*.jar, - WEB-INF/lib/javax.websocket-api-*.jar, - WEB-INF/lib/jetty-all-*.jar - </packagingExcludes> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - build-helper-maven-plugin - </artifactId> - <versionRange> - [1.5,) - </versionRange> - <goals> - <goal>maven-version</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> <dependencies> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>simpleapp-app</artifactId> </dependency> - - <!-- other isis components --> <dependency> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-viewer-wicket-impl</artifactId> @@ -157,8 +74,6 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-security-shiro</artifactId> </dependency> - - <!-- isis core --> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-security</artifactId> @@ -169,52 +84,118 @@ <artifactId>geronimo-servlet_3.0_spec</artifactId> </dependency> - <!-- - JDBC drivers - (for jdo objectstore) - --> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </dependency> + </dependencies> - <!-- - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>9.1-901.jdbc4</version> - </dependency> - --> - - <!-- - mvn install:install-file -Dfile=sqljdbc4.jar \ - -DgroupId=com.microsoft.sqlserver \ - -DartifactId=jdbc \ - -Dversion=4.0 \ - -Dpackaging=jar - --> - <!-- - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>sqljdbc4</artifactId> - <version>4.0</version> - </dependency> - --> + <profiles> + <profile> + <id>package-war</id> + <activation> + <property> + <name>!skip.package-war</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <warName>simpleapp</warName> + <archive> + <manifest> + <addClasspath>false</addClasspath> + </manifest> + <manifestEntries> + <Build-Time>${maven.build.timestamp}</Build-Time> + <Build-Host>${agent.name}</Build-Host> + <Build-User>${user.name}</Build-User> + <Build-Maven>Maven ${maven.version}</Build-Maven> + <Build-Java>${java.version}</Build-Java> + <Build-OS>${os.name}</Build-OS> + <Build-Label>${project.version}</Build-Label> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </build> + </profile> - <dependency> - <groupId>org.lazyluke</groupId> - <artifactId>log4jdbc-remix</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> + <profile> + <id>jdbc-hsqldb</id> + <activation> + <property> + <name>!skip.jdbc-hsqldb</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </dependency> + </dependencies> + </profile> + <profile> + <id>jdbc-logging</id> + <activation> + <property> + <name>!skip.jdbc-logging</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.lazyluke</groupId> + <artifactId>log4jdbc-remix</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </profile> + <!-- + <profile> + <id>jdbc-postgres</id> + <activation> + <property> + <name>!skip.jdbc-postgres</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>9.1-901.jdbc4</version> + </dependency> + </dependencies> + </profile> + --> + <!-- + <profile> + <id>jdbc-mssql</id> + <activation> + <property> + <name>!skip.jdbc-mssql</name> + </property> + </activation> - </dependencies> + mvn install:install-file -Dfile=sqljdbc4.jar \ + -DgroupId=com.microsoft.sqlserver \ + -DartifactId=jdbc \ + -Dversion=4.0 \ + -Dpackaging=jar + + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>sqljdbc4</artifactId> + <version>4.0</version> + </dependency> + </dependencies> + </profile> + --> - <profiles> <profile> <id>intellij</id> <activation> @@ -229,6 +210,51 @@ </dependency> </dependencies> </profile> + <profile> + <id>eclipse-m2e</id> + <activation> + <property> + <name>m2e.version</name> + </property> + </activation> + <build> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.codehaus.mojo + </groupId> + <artifactId> + build-helper-maven-plugin + </artifactId> + <versionRange> + [1.5,) + </versionRange> + <goals> + <goal>maven-version</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/isis/blob/bd4ad92e/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml index 79a123e..69fba1b 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml @@ -205,12 +205,6 @@ </execution> </executions> </plugin> - <!-- http://simplericity.com/2009/11/10/1257880778509.html --> - <plugin> - <groupId>org.simplericity.jettyconsole</groupId> - <artifactId>jetty-console-maven-plugin</artifactId> - <version>1.56</version> - </plugin> <!-- Apache Release Audit Tool --> <plugin> http://git-wip-us.apache.org/repos/asf/isis/blob/bd4ad92e/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml index 8945c0e..5b8c52f 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml @@ -39,24 +39,6 @@ <artifactId>jetty-maven-plugin</artifactId> </plugin> - <!-- mvn package --> - <plugin> - <groupId>org.simplericity.jettyconsole</groupId> - <artifactId>jetty-console-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>createconsole</goal> - </goals> - <configuration> - <backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage> - <destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile> - </configuration> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -215,28 +197,6 @@ <profiles> <profile> - <id>self-host</id> - <build> - <plugins> - <!-- - mvn -P self-host antrun:run - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <configuration> - <tasks> - <exec executable="java" failonerror="true"> - <arg value="-jar" /> - <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" /> - </exec> - </tasks> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>intellij</id> <activation> <property>
