Skip to content
This repository has been archived by the owner on Feb 1, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://tapljs482.tapestry.local/jaffa/jaffa…
Browse files Browse the repository at this point in the history 
…-framework
  • Loading branch information
@casselltap
casselltap committed Jul 30, 2019
2 parents e8b2601 + 183ba1c commit 2d25f47
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 31 deletions.
2 changes: 1 addition & 1 deletion jaffa-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-assemblies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa.assemblies</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-components-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-components-messaging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-components-printing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-components-scheduler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-components-user/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-components/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-console/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-dwr/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-patterngenerator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-ria/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-rules/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<groupId>org.jaffa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaffa-soa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
</parent>

<artifactId>jaffa-soa</artifactId>
Expand Down
30 changes: 14 additions & 16 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.jaffa</groupId>
<artifactId>jaffa-framework</artifactId>
<version>8.1.7-SNAPSHOT</version>
<version>8.1.8-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Java Application Framework For All</name>
Expand Down Expand Up @@ -1002,21 +1002,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- Additional surefire args go after ${surefireArgLine} below -->
<argLine>${surefireArgLine}</argLine>
</configuration>
<executions>
<execution>
<id>package</id>
<phase>package</phase>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -2076,6 +2061,19 @@
<profile>
<id>jacoco</id>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<!-- Additional surefire args go after ${surefireArgLine} below -->
<argLine>${surefireArgLine}</argLine>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down

0 comments on commit 2d25f47

Please sign in to comment.