Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
honghua chin authored and honghua chin committed May 4, 2016
1 parent 84414e4 commit 63f86e2
Showing 1 changed file with 19 additions and 66 deletions.
85 changes: 19 additions & 66 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
<properties>
<jboss.fuse.bom.version>6.2.1.redhat-084</jboss.fuse.bom.version>

<activemq.version>5.11.0.redhat-621084</activemq.version>
<camel.version>2.15.1.redhat-621084</camel.version>
<cxf.version>3.0.4.redhat-621084</cxf.version>
<cxf.version>3.1.5.redhat-630055</cxf.version>
<jetty.version>9.2.9.v20150224</jetty.version>

<activemq.version>5.11.0.redhat-621084</activemq.version>
<h2.version>1.4.182</h2.version>
<postgresql.version>9.1-901-1.jdbc4</postgresql.version>
<mysql.version>5.1.34</mysql.version>
Expand All @@ -25,7 +27,6 @@
<pax-exam.version>3.5.0</pax-exam.version>
<karaf.version>2.3.0.redhat-610379</karaf.version>
<junit-bundle.version>4.11_2</junit-bundle.version>
<jetty.version>9.2.9.v20150224</jetty.version>

<maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
<maven-fabric-plugin.version>1.1.0.CR5</maven-fabric-plugin.version>
Expand All @@ -34,7 +35,7 @@
</properties>

<modules>
<module>2_Core_Engine</module>
<module>2_Core_Engine</module>
<module>3_Core_Features</module>
<module>4_Camel_Project_Development</module>
<module>5_Components</module>
Expand All @@ -52,14 +53,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>${camel.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Dependency not defined in the BOM -->
<dependency>
<groupId>org.springframework</groupId>
Expand Down Expand Up @@ -157,47 +150,17 @@
<version>${geronimo-servlet-spec.version}</version>
</dependency>

<!-- Jetty 9 -->
<!-- Jetty -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

This comment has been minimized.

Copy link
@cmoulliard

cmoulliard May 4, 2016

Contributor

The declaration of these deps are required otherwise jetty8 deps will be used

<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -264,38 +227,28 @@

<repositories>
<repository>
<id>rh-mvn-repo-earlyaccess</id>
<name>Red Hat Maven Repo Early Access</name>
<url>https://maven.repository.redhat.com/earlyaccess/all/</url>
</repository>
<repository>
<id>rh-mvn-repo</id>
<name>Red Hat Maven Repo</name>
<url>https://maven.repository.redhat.com/ga/</url>
</repository>
<repository>
<id>mvn-apache-repo</id>
<name>Maven Apache Repo</name>
<url>https://repo.maven.apache.org/maven2/org/apache/maven/plugins/</url>
<id>JBoss Fuse Public</id>
<url>http://repository.jboss.org/nexus/content/groups/fs-public</url>
</repository>
<repository>
<id>JBoss Public</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>rh-mvn-repo-earlyaccess</id>
<name>Red Hat Maven Repo Early Access</name>
<url>https://maven.repository.redhat.com/earlyaccess/all/</url>
<id>JBoss Fuse Public</id>
<url>http://repository.jboss.org/nexus/content/groups/fs-public</url>
</pluginRepository>
<pluginRepository>
<id>rh-mvn-repo</id>
<name>Red Hat Maven Repo</name>
<url>https://maven.repository.redhat.com/ga/</url>
<id>JBoss Public</id>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
</pluginRepository>
<pluginRepository>
<id>mvn-apache-repo</id>
<name>Maven Apache Repo</name>
<url>https://repo.maven.apache.org/maven2/org/apache/maven/plugins/</url>
<id>repo-jboss-org</id>
<url>https://repository.jboss.org/nexus/content/groups/ea</url>
</pluginRepository>
</pluginRepositories>
</pluginRepositories>

</project>

0 comments on commit 63f86e2

Please sign in to comment.