-
Notifications
You must be signed in to change notification settings - Fork 186
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #158 from hazendaz/master
[release] pom changes for 1.8-SNAPSHOT
- Loading branch information
Showing
22 changed files
with
131 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,14 +4,18 @@ | |
| <parent> | ||
| <groupId>com.github.dblock.waffle.demo</groupId> | ||
| <artifactId>waffle-demo-parent</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <relativePath>../waffle-demo-parent</relativePath> | ||
| </parent> | ||
| <artifactId>waffle-filter</artifactId> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <packaging>war</packaging> | ||
| <name>waffle-filter</name> | ||
| <description>Filter Demo for WAFFLE</description> | ||
| <url>http://dblock.github.com/waffle/</url> | ||
| <properties> | ||
| <servlet.version>2.5</servlet.version> | ||
| </properties> | ||
| <scm> | ||
| <connection>scm:git:ssh://[email protected]/dblock/waffle.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/dblock/waffle.git</developerConnection> | ||
|
|
@@ -27,7 +31,7 @@ | |
| <dependency> | ||
| <groupId>javax.servlet</groupId> | ||
| <artifactId>servlet-api</artifactId> | ||
| <version>2.5</version> | ||
| <version>${servlet.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,14 +4,18 @@ | |
| <parent> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-parent</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <relativePath>../waffle-parent</relativePath> | ||
| </parent> | ||
| <artifactId>waffle-distro</artifactId> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <packaging>pom</packaging> | ||
| <name>waffle-distro</name> | ||
| <description>Distribution for WAFFLE</description> | ||
| <url>http://dblock.github.com/waffle/</url> | ||
| <properties> | ||
| <logback.version>1.1.2</logback.version> | ||
| </properties> | ||
| <scm> | ||
| <connection>scm:git:ssh://[email protected]/dblock/waffle.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/dblock/waffle.git</developerConnection> | ||
|
|
@@ -22,135 +26,135 @@ | |
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-jetty</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-jna</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-shiro</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-spring-security2</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-spring-security3</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-spring-security4</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-tests</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-tomcat5</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-tomcat6</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-tomcat7</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle</groupId> | ||
| <artifactId>waffle-tomcat8</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle.demo</groupId> | ||
| <artifactId>waffle-filter</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle.demo</groupId> | ||
| <artifactId>waffle-form</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle.demo</groupId> | ||
| <artifactId>waffle-jaas</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle.demo</groupId> | ||
| <artifactId>waffle-mixed</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle.demo</groupId> | ||
| <artifactId>waffle-mixed-post</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle.demo</groupId> | ||
| <artifactId>waffle-negotiate</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle.demo</groupId> | ||
| <artifactId>waffle-spring-filter</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.dblock.waffle.demo</groupId> | ||
| <artifactId>waffle-spring-form</artifactId> | ||
| <version>1.7</version> | ||
| <version>1.8-SNAPSHOT</version> | ||
| <scope>runtime</scope> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ch.qos.logback</groupId> | ||
| <artifactId>logback-classic</artifactId> | ||
| <version>1.1.2</version> | ||
| <version>${logback.version}</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ch.qos.logback</groupId> | ||
| <artifactId>logback-core</artifactId> | ||
| <version>1.1.2</version> | ||
| <version>${logback.version}</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
Oops, something went wrong.