This is an automated email from the ASF dual-hosted git repository. pottlinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/creadur-whisker.git
commit 42029c5f57f79c5c79a02b1891129a560f963cee Author: P. Ottlinger <[email protected]> AuthorDate: Sat Nov 16 23:43:02 2024 +0100 WHISKER-27: Reformat poms --- apache-whisker-app/pom.xml | 23 +++-------- .../src/it/example-copyright-notices/pom.xml | 48 +++++++++------------- apache-whisker-maven-plugin/src/it/in-5/pom.xml | 48 +++++++++------------- .../src/it/license-family/pom.xml | 48 +++++++++------------- apache-whisker-maven-plugin/src/it/minimal/pom.xml | 48 +++++++++------------- .../primary-license-with-copyright-notice/pom.xml | 48 +++++++++------------- .../src/it/smoke4generate/pom.xml | 48 +++++++++------------- .../src/it/third-party-corp/pom.xml | 48 +++++++++------------- .../src/it/third-party-group/pom.xml | 48 +++++++++------------- .../src/it/third-party/pom.xml | 48 +++++++++------------- .../src/it/whisker-10/pom.xml | 48 +++++++++------------- apache-whisker-model/pom.xml | 10 +---- apache-whisker-scan/pom.xml | 5 --- apache-whisker-velocity/pom.xml | 31 ++++---------- apache-whisker-xml/pom.xml | 19 +++------ 15 files changed, 211 insertions(+), 357 deletions(-) diff --git a/apache-whisker-app/pom.xml b/apache-whisker-app/pom.xml index fa2369c..7bb583e 100644 --- a/apache-whisker-app/pom.xml +++ b/apache-whisker-app/pom.xml @@ -19,56 +19,44 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.creadur.whisker</groupId> <artifactId>apache-whisker</artifactId> <version>0.2-SNAPSHOT</version> </parent> - <artifactId>apache-whisker-app</artifactId> <packaging>jar</packaging> - <dependencies> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-whisker-scan</artifactId> <version>${project.version}</version> </dependency> - - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-whisker-xml</artifactId> <version>${project.version}</version> </dependency> - - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-whisker-model</artifactId> <version>${project.version}</version> </dependency> - </dependencies> - - <!-- + <!-- ================================ @@ -77,5 +65,4 @@ <name>Apache Whisker::App</name> <description>Whisker core application.</description> <url>http://creadur.apache.org/whisker/apache-whisker-app</url> - </project> diff --git a/apache-whisker-maven-plugin/src/it/example-copyright-notices/pom.xml b/apache-whisker-maven-plugin/src/it/example-copyright-notices/pom.xml index 13a1aaa..9b4214b 100644 --- a/apache-whisker-maven-plugin/src/it/example-copyright-notices/pom.xml +++ b/apache-whisker-maven-plugin/src/it/example-copyright-notices/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>CopyrightNoticesExample</artifactId> <version>@project.version@</version> - <name>WHISKER-7 example of copyright notices</name> <description> WHISKER-7 improvements to documentation </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-maven-plugin/src/it/in-5/pom.xml b/apache-whisker-maven-plugin/src/it/in-5/pom.xml index 1c41b6d..491a571 100644 --- a/apache-whisker-maven-plugin/src/it/in-5/pom.xml +++ b/apache-whisker-maven-plugin/src/it/in-5/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>In5Minutes</artifactId> <version>@project.version@</version> - <name>5 Minute Example Generation</name> <description> Similar to 5 Minute example. </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-maven-plugin/src/it/license-family/pom.xml b/apache-whisker-maven-plugin/src/it/license-family/pom.xml index 9205aaa..c9e14ea 100644 --- a/apache-whisker-maven-plugin/src/it/license-family/pom.xml +++ b/apache-whisker-maven-plugin/src/it/license-family/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>LicenseFamily</artifactId> <version>@project.version@</version> - <name>License Family Generation</name> <description> Generate from license template with parameterisation </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-maven-plugin/src/it/minimal/pom.xml b/apache-whisker-maven-plugin/src/it/minimal/pom.xml index 27770e7..ca8cb44 100644 --- a/apache-whisker-maven-plugin/src/it/minimal/pom.xml +++ b/apache-whisker-maven-plugin/src/it/minimal/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>SimpleGeneration</artifactId> <version>@project.version@</version> - <name>Minimal Generation</name> <description> The very simple example used in 5 min example. </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-maven-plugin/src/it/primary-license-with-copyright-notice/pom.xml b/apache-whisker-maven-plugin/src/it/primary-license-with-copyright-notice/pom.xml index a809ff7..bf6f2db 100644 --- a/apache-whisker-maven-plugin/src/it/primary-license-with-copyright-notice/pom.xml +++ b/apache-whisker-maven-plugin/src/it/primary-license-with-copyright-notice/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>PrimaryLicenseWithCopyrightNotice</artifactId> <version>@project.version@</version> - <name>Verify that copyright notices are output for primary license</name> <description> WHISKER-3 - ensure that copyright notices are output for primary licenses. </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-maven-plugin/src/it/smoke4generate/pom.xml b/apache-whisker-maven-plugin/src/it/smoke4generate/pom.xml index 62454a4..9183d49 100644 --- a/apache-whisker-maven-plugin/src/it/smoke4generate/pom.xml +++ b/apache-whisker-maven-plugin/src/it/smoke4generate/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>HelloWorld</artifactId> <version>@project.version@</version> - <name>Smoke Test</name> <description> Basic integration test for LICENSE and NOTICE generation. </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-maven-plugin/src/it/third-party-corp/pom.xml b/apache-whisker-maven-plugin/src/it/third-party-corp/pom.xml index 2367612..2a2d52c 100644 --- a/apache-whisker-maven-plugin/src/it/third-party-corp/pom.xml +++ b/apache-whisker-maven-plugin/src/it/third-party-corp/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>ThirdPartyCorp</artifactId> <version>@project.version@</version> - <name>Third Party Corp Generation</name> <description> Similar to 3 party corp example. </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-maven-plugin/src/it/third-party-group/pom.xml b/apache-whisker-maven-plugin/src/it/third-party-group/pom.xml index 2367612..2a2d52c 100644 --- a/apache-whisker-maven-plugin/src/it/third-party-group/pom.xml +++ b/apache-whisker-maven-plugin/src/it/third-party-group/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>ThirdPartyCorp</artifactId> <version>@project.version@</version> - <name>Third Party Corp Generation</name> <description> Similar to 3 party corp example. </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-maven-plugin/src/it/third-party/pom.xml b/apache-whisker-maven-plugin/src/it/third-party/pom.xml index 9cb5ce0..eeadd75 100644 --- a/apache-whisker-maven-plugin/src/it/third-party/pom.xml +++ b/apache-whisker-maven-plugin/src/it/third-party/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>ThirdParty</artifactId> <version>@project.version@</version> - <name>Third Party Generation</name> <description> Similar to 3 party example. </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-maven-plugin/src/it/whisker-10/pom.xml b/apache-whisker-maven-plugin/src/it/whisker-10/pom.xml index 96b8eb7..272c94a 100644 --- a/apache-whisker-maven-plugin/src/it/whisker-10/pom.xml +++ b/apache-whisker-maven-plugin/src/it/whisker-10/pom.xml @@ -17,48 +17,38 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; -> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.creadur.whisker.it</groupId> <artifactId>PrimaryLicenseWithCopyrightNotice</artifactId> <version>@project.version@</version> - <name>WHISKER-10 mixture copyright notices</name> <description> WHISKER-10 a mixture of licenses only some with copyright notices. </description> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <target.jdk>1.5</target.jdk> </properties> - <build> <plugins> - <plugin> - <groupId>org.apache.creadur.whisker</groupId> - <artifactId>apache-whisker-maven-plugin</artifactId> - <version>@project.version@</version> - <executions> - <execution> - <id>generate-stuff</id> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>descriptor.xml</descriptor> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.creadur.whisker</groupId> + <artifactId>apache-whisker-maven-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>generate-stuff</id> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>descriptor.xml</descriptor> + </configuration> + </plugin> </plugins> </build> - -</project> \ No newline at end of file +</project> diff --git a/apache-whisker-model/pom.xml b/apache-whisker-model/pom.xml index 443a642..ce96e35 100644 --- a/apache-whisker-model/pom.xml +++ b/apache-whisker-model/pom.xml @@ -19,29 +19,24 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.creadur.whisker</groupId> <artifactId>apache-whisker</artifactId> <version>0.2-SNAPSHOT</version> </parent> - <artifactId>apache-whisker-model</artifactId> <packaging>jar</packaging> - <dependencies> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> </dependencies> - <!-- @@ -51,5 +46,4 @@ <name>Apache Whisker::Model</name> <description>Models licensing meta-data.</description> <url>http://creadur.apache.org/whisker/apache-whisker-model</url> - </project> diff --git a/apache-whisker-scan/pom.xml b/apache-whisker-scan/pom.xml index c5b87e8..8f3684d 100644 --- a/apache-whisker-scan/pom.xml +++ b/apache-whisker-scan/pom.xml @@ -19,16 +19,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.creadur.whisker</groupId> <artifactId>apache-whisker</artifactId> <version>0.2-SNAPSHOT</version> </parent> - <artifactId>apache-whisker-scan</artifactId> <packaging>jar</packaging> - <dependencies> <dependency> <groupId>junit</groupId> @@ -36,7 +33,6 @@ <scope>test</scope> </dependency> </dependencies> - <!-- @@ -46,5 +42,4 @@ <name>Apache Whisker::Scan</name> <description>Scans directories for resources</description> <url>http://creadur.apache.org/whisker/apache-whisker-scan</url> - </project> diff --git a/apache-whisker-velocity/pom.xml b/apache-whisker-velocity/pom.xml index fb324c4..87e8e8b 100644 --- a/apache-whisker-velocity/pom.xml +++ b/apache-whisker-velocity/pom.xml @@ -19,69 +19,57 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.creadur.whisker</groupId> <artifactId>apache-whisker</artifactId> <version>0.2-SNAPSHOT</version> </parent> - <artifactId>apache-whisker-velocity</artifactId> <packaging>jar</packaging> - <dependencies> <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity-engine-core</artifactId> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity-engine-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.jmock</groupId> <artifactId>jmock-junit3</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-whisker-scan</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-whisker-model</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-whisker-app</artifactId> <version>${project.version}</version> </dependency> </dependencies> - - <!-- + <!-- ================================ @@ -90,5 +78,4 @@ <name>Apache Whisker::Output(velocity)</name> <description>Outputs results using velocity.</description> <url>http://creadur.apache.org/whisker/apache-whisker-velocity</url> - </project> diff --git a/apache-whisker-xml/pom.xml b/apache-whisker-xml/pom.xml index 16d9bc8..ce09e61 100644 --- a/apache-whisker-xml/pom.xml +++ b/apache-whisker-xml/pom.xml @@ -19,42 +19,34 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.creadur.whisker</groupId> <artifactId>apache-whisker</artifactId> <version>0.2-SNAPSHOT</version> </parent> - <artifactId>apache-whisker-xml</artifactId> <packaging>jar</packaging> - <dependencies> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom2</artifactId> + <groupId>org.jdom</groupId> + <artifactId>jdom2</artifactId> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-whisker-model</artifactId> <version>${project.version}</version> </dependency> </dependencies> - - <!-- + <!-- ================================ @@ -63,5 +55,4 @@ <name>Apache Whisker::XML</name> <description>Reads model from xml.</description> <url>http://creadur.apache.org/whisker/apache-whisker-xml</url> - </project>
