MyFaces Html5 : pom refactoring for repositories and dependencies
git-svn-id: https://svn.apache.org/repos/asf/myfaces/html5/trunk@1081115 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/myfaces-html5-core/pom.xml b/myfaces-html5-core/pom.xml
index 1d49f65..12f7199 100644
--- a/myfaces-html5-core/pom.xml
+++ b/myfaces-html5-core/pom.xml
@@ -33,17 +33,23 @@
<dependencies>
<dependency>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-html5</artifactId>
+ <version>${myfaces-shared-html5-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-annotations</artifactId>
+ <version>${myfaces-builder-annotations-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-html5</artifactId>
- <version>${shared-core-version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
@@ -65,11 +71,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-annotations</artifactId>
- <version>1.0.5</version>
- </dependency>
- <dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.3.1</version>
@@ -92,7 +93,7 @@
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.8-SNAPSHOT</version>
+ <version>${myfaces-builder-plugin-version}</version>
<executions>
<!-- first, build metadata. components and stuff will
be generated from this. -->
@@ -269,7 +270,7 @@
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.6</version>
+ <version>${myfaces-builder-plugin-version}</version>
<executions>
<!-- first, build metadata. facelets tag documentation will be generated from this. -->
<execution>
@@ -358,4 +359,9 @@
</profile>
</profiles>
+ <properties>
+ <myfaces-builder-plugin-version>1.0.8</myfaces-builder-plugin-version>
+ <myfaces-builder-annotations-version>1.0.5</myfaces-builder-annotations-version>
+ </properties>
+
</project>
\ No newline at end of file
diff --git a/myfaces-html5-examples/pom.xml b/myfaces-html5-examples/pom.xml
index c5f28dc..6c78bed 100644
--- a/myfaces-html5-examples/pom.xml
+++ b/myfaces-html5-examples/pom.xml
@@ -37,11 +37,10 @@
<artifactId>myfaces-html5-core</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-html5</artifactId>
- <version>${shared-core-version}</version>
+ <version>${myfaces-shared-html5-version}</version>
<scope>runtime</scope>
</dependency>
@@ -78,20 +77,12 @@
<version>1.2.13</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-annotations</artifactId>
- <version>1.0.5</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index d8a0e81..1c3685d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,73 +42,6 @@
<module>myfaces-html5-examples</module>
</modules>
- <repositories>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>Maven2 Repo1</id>
- <name>Maven2 Repo1</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>java.net.2</id>
- <name>java.net Maven 2 Repository</name>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>codehaus</id>
- <name>codehaus</name>
- <url>http://repository.codehaus.org</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>jboss</id>
- <name>jboss</name>
- <url>http://repository.jboss.com/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <!-- necessary! -->
- <repository>
- <id>myfaces-snapshots</id>
- <name>myfaces-snapshots</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- </repositories>
-
- <pluginRepositories>
- <!-- for myfaces builder plugin -->
- <pluginRepository>
- <id>myfaces-snapshots</id>
- <name>myfaces-snapshots</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </pluginRepository>
- </pluginRepositories>
-
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -203,7 +136,7 @@
<properties>
<myfaces-core-version>2.0.1</myfaces-core-version>
- <shared-core-version>4.0.6-SNAPSHOT</shared-core-version>
+ <myfaces-shared-html5-version>4.0.6-SNAPSHOT</myfaces-shared-html5-version>
</properties>
</project>
\ No newline at end of file
