Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix some poms to make 1.12 -> 1.13 merges easier
- Loading branch information
Benjamin Reed
committed
Aug 4, 2014
1 parent
b14bb73
commit 9d3e28c
Showing
15 changed files
with
793 additions
and
793 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,58 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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"> | ||
|
|
||
| <!-- POM file generated with GWT webAppCreator --> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>org.opennms.features</artifactId> | ||
| <groupId>org.opennms</groupId> | ||
| <version>1.12.10-SNAPSHOT</version> | ||
| </parent> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.gwt-ksc-add</artifactId> | ||
| <packaging>jar</packaging> | ||
| <name>OpenNMS KSC GWT Graph Add</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.opennms.dependencies</groupId> | ||
| <artifactId>gwt-dependencies</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>pom</type> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.google.gwt</groupId> | ||
| <artifactId>gwt-user</artifactId> | ||
| <version>${gwtVersion}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.opennms-gwt-theme</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
|
|
||
| <resources> | ||
| <resource> | ||
| <directory>src/main/java</directory> | ||
| <includes> | ||
| <include>**/*.gwt.xml</include> | ||
| <include>**/*.java</include> | ||
| <include>**/*.css</include> | ||
| <include>**/*.ui.xml</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| </build> | ||
|
|
||
| </project> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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"> | ||
|
|
||
| <!-- POM file generated with GWT webAppCreator --> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>org.opennms.features</artifactId> | ||
| <groupId>org.opennms</groupId> | ||
| <version>1.12.10-SNAPSHOT</version> | ||
| </parent> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.gwt-ksc-add</artifactId> | ||
| <packaging>jar</packaging> | ||
| <name>OpenNMS KSC GWT Graph Add</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.opennms.dependencies</groupId> | ||
| <artifactId>gwt-dependencies</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>pom</type> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.google.gwt</groupId> | ||
| <artifactId>gwt-user</artifactId> | ||
| <version>${gwtVersion}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.opennms-gwt-theme</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
|
|
||
| <resources> | ||
| <resource> | ||
| <directory>src/main/java</directory> | ||
| <includes> | ||
| <include>**/*.gwt.xml</include> | ||
| <include>**/*.java</include> | ||
| <include>**/*.css</include> | ||
| <include>**/*.ui.xml</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| </build> | ||
|
|
||
| </project> |
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 |
|---|---|---|
| @@ -1,58 +1,58 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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"> | ||
|
|
||
| <!-- POM file generated with GWT webAppCreator --> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>org.opennms.features</artifactId> | ||
| <groupId>org.opennms</groupId> | ||
| <version>1.12.10-SNAPSHOT</version> | ||
| </parent> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.gwt-ksc-combobox</artifactId> | ||
| <packaging>jar</packaging> | ||
| <name>OpenNMS KSC GWT combobox</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.opennms.dependencies</groupId> | ||
| <artifactId>gwt-dependencies</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>pom</type> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.google.gwt</groupId> | ||
| <artifactId>gwt-user</artifactId> | ||
| <version>${gwtVersion}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.opennms-gwt-theme</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
|
|
||
| <resources> | ||
| <resource> | ||
| <directory>src/main/java</directory> | ||
| <includes> | ||
| <include>**/*.gwt.xml</include> | ||
| <include>**/*.java</include> | ||
| <include>**/*.css</include> | ||
| <include>**/*.ui.xml</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| </build> | ||
|
|
||
| </project> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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"> | ||
|
|
||
| <!-- POM file generated with GWT webAppCreator --> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>org.opennms.features</artifactId> | ||
| <groupId>org.opennms</groupId> | ||
| <version>1.12.10-SNAPSHOT</version> | ||
| </parent> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.gwt-ksc-combobox</artifactId> | ||
| <packaging>jar</packaging> | ||
| <name>OpenNMS KSC GWT combobox</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.opennms.dependencies</groupId> | ||
| <artifactId>gwt-dependencies</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>pom</type> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.google.gwt</groupId> | ||
| <artifactId>gwt-user</artifactId> | ||
| <version>${gwtVersion}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.opennms-gwt-theme</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
|
|
||
| <resources> | ||
| <resource> | ||
| <directory>src/main/java</directory> | ||
| <includes> | ||
| <include>**/*.gwt.xml</include> | ||
| <include>**/*.java</include> | ||
| <include>**/*.css</include> | ||
| <include>**/*.ui.xml</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| </build> | ||
|
|
||
| </project> |
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 |
|---|---|---|
| @@ -1,65 +1,65 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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"> | ||
|
|
||
| <!-- POM file generated with GWT webAppCreator --> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>org.opennms.features</artifactId> | ||
| <groupId>org.opennms</groupId> | ||
| <version>1.12.10-SNAPSHOT</version> | ||
| </parent> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.gwt-snmpselect-list</artifactId> | ||
| <packaging>jar</packaging> | ||
| <name>OpenNMS GWT Snmp Select List</name> | ||
|
|
||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.opennms.dependencies</groupId> | ||
| <artifactId>gwt-dependencies</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>pom</type> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.google.gwt</groupId> | ||
| <artifactId>gwt-user</artifactId> | ||
| <version>${gwtVersion}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.opennms-gwt-theme</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.gwt.tableresources</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <resources> | ||
| <resource> | ||
| <directory>src/main/java</directory> | ||
| <includes> | ||
| <include>**/*.gwt.xml</include> | ||
| <include>**/*.java</include> | ||
| <include>**/*.css</include> | ||
| <include>**/*.ui.xml</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| </build> | ||
|
|
||
| </project> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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"> | ||
|
|
||
| <!-- POM file generated with GWT webAppCreator --> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>org.opennms.features</artifactId> | ||
| <groupId>org.opennms</groupId> | ||
| <version>1.12.10-SNAPSHOT</version> | ||
| </parent> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.gwt-snmpselect-list</artifactId> | ||
| <packaging>jar</packaging> | ||
| <name>OpenNMS GWT Snmp Select List</name> | ||
|
|
||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.opennms.dependencies</groupId> | ||
| <artifactId>gwt-dependencies</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>pom</type> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.google.gwt</groupId> | ||
| <artifactId>gwt-user</artifactId> | ||
| <version>${gwtVersion}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.opennms-gwt-theme</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.opennms.features</groupId> | ||
| <artifactId>org.opennms.features.gwt.tableresources</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <resources> | ||
| <resource> | ||
| <directory>src/main/java</directory> | ||
| <includes> | ||
| <include>**/*.gwt.xml</include> | ||
| <include>**/*.java</include> | ||
| <include>**/*.css</include> | ||
| <include>**/*.ui.xml</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| </build> | ||
|
|
||
| </project> |
Oops, something went wrong.