Changeset 5297


Ignore:
Timestamp:
Aug 30, 2016, 12:20:08 AM (6 years ago)
Author:
Christian Schulte
Message:

o Merged changes up to 5296 from 'trunk' into branch 'jomc-tools-1.x'.

See #92

Location:
jomc-tools/branches/jomc-tools-1.x
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • jomc-tools/branches/jomc-tools-1.x

  • jomc-tools/branches/jomc-tools-1.x/jomc-ant-tasks

  • jomc-tools/branches/jomc-tools-1.x/jomc-ant-tasks/pom.xml

    r5266 r5297  
    3333<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/maven-v4_0_0.xsd">
    3434  <parent>
    35     <groupId>org.jomc.tools</groupId>
    36     <artifactId>pom</artifactId>
     35    <groupId>org.jomc</groupId>
     36    <artifactId>jomc-tools-pom</artifactId>
    3737    <version>1.10-SNAPSHOT</version>
    3838  </parent>
    3939  <modelVersion>4.0.0</modelVersion>
    40   <groupId>org.jomc</groupId>
    4140  <artifactId>jomc-ant-tasks</artifactId>
    4241  <packaging>jar</packaging>
  • jomc-tools/branches/jomc-tools-1.x/jomc-cli

  • jomc-tools/branches/jomc-tools-1.x/jomc-cli/pom.xml

    r5266 r5297  
    3333<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/maven-v4_0_0.xsd">
    3434  <parent>
    35     <groupId>org.jomc.tools</groupId>
    36     <artifactId>pom</artifactId>
     35    <groupId>org.jomc</groupId>
     36    <artifactId>jomc-tools-pom</artifactId>
    3737    <version>1.10-SNAPSHOT</version>
    3838  </parent>
    3939  <modelVersion>4.0.0</modelVersion>
    40   <groupId>org.jomc</groupId>
    4140  <artifactId>jomc-cli</artifactId>
    4241  <version>1.10-SNAPSHOT</version>
  • jomc-tools/branches/jomc-tools-1.x/jomc-tools

  • jomc-tools/branches/jomc-tools-1.x/jomc-tools/pom.xml

    r5266 r5297  
    3333<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/maven-v4_0_0.xsd">
    3434  <parent>
    35     <groupId>org.jomc.tools</groupId>
    36     <artifactId>pom</artifactId>
     35    <groupId>org.jomc</groupId>
     36    <artifactId>jomc-tools-pom</artifactId>
    3737    <version>1.10-SNAPSHOT</version>
    3838  </parent>
    3939  <modelVersion>4.0.0</modelVersion>
    40   <groupId>org.jomc</groupId>
    4140  <artifactId>jomc-tools</artifactId>
    4241  <name>JOMC ⁑ Tools</name>
  • jomc-tools/branches/jomc-tools-1.x/pom.xml

    r5228 r5297  
    3535    <groupId>org.jomc</groupId>
    3636    <artifactId>jomc-pom</artifactId>
    37     <version>1.3</version>
     37    <version>1.4</version>
    3838  </parent>
    3939  <modelVersion>4.0.0</modelVersion>
    40   <groupId>org.jomc.tools</groupId>
    41   <artifactId>pom</artifactId>
     40  <artifactId>jomc-tools-pom</artifactId>
    4241  <packaging>pom</packaging>
    4342  <name>JOMC Tools</name>
     
    232231  </distributionManagement>
    233232  <properties>
    234     <jomc-util.artifact.version>1.9</jomc-util.artifact.version>
     233    <jomc-util.artifact.version>1.10-SNAPSHOT</jomc-util.artifact.version>
    235234    <jomc-modlet.artifact.version>1.9</jomc-modlet.artifact.version>
    236235    <jomc-model.artifact.version>1.9</jomc-model.artifact.version>
     
    239238    <jomc-ant-tasks.artifact.version>1.10-SNAPSHOT</jomc-ant-tasks.artifact.version>
    240239    <!-- Parent. -->
     240    <maven.surefire.memory>128m</maven.surefire.memory>
    241241    <jomc.scm.location>jomc-tools</jomc.scm.location>
    242242    <jomc.site.location>jomc-tools/1.10-SNAPSHOT</jomc.site.location>
Note: See TracChangeset for help on using the changeset viewer.