Skip to content

Commit

Permalink
#97: xmlplugin version highered to release
Browse files Browse the repository at this point in the history
  • Loading branch information
@maybeec
maybeec committed Feb 24, 2015
1 parent a1253cd commit b8a391c
Showing 1 changed file with 111 additions and 114 deletions.
225 changes: 111 additions & 114 deletions cobigen/cobigen-xmlplugin/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © Capgemini 2013. All rights reserved.
-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.capgemini</groupId>
<artifactId>cobigen-xmlplugin</artifactId>
<name>CobiGen - XML Plug-In</name>
<version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.capgemini</groupId>
<artifactId>cobigen-xmlplugin</artifactId>
<name>CobiGen - XML Plug-In</name>
<version>2.1.0</version>
<packaging>jar</packaging>

<parent>
<groupId>com.capgemini</groupId>
<artifactId>cobigen-parent</artifactId>
<version>1.1.1</version>
</parent>
<parent>
<groupId>com.capgemini</groupId>
<artifactId>cobigen-parent</artifactId>
<version>1.1.1</version>
</parent>

<dependencies>
<dependency>
<groupId>com.capgemini</groupId>
<artifactId>cobigen-core</artifactId>
<version>1.2.0</version>
</dependency>
<dependencies>
<dependency>
<groupId>com.capgemini</groupId>
<artifactId>cobigen-core</artifactId>
<version>1.2.0</version>
</dependency>

<!-- XML Merge for structural merge-->
<dependency>
<groupId>ch.elca.el4j.modules</groupId>
<artifactId>module-core</artifactId>
<version>3.1</version>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>inject</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
</exclusion>
<!-- XML Merge for structural merge -->
<dependency>
<groupId>ch.elca.el4j.modules</groupId>
<artifactId>module-core</artifactId>
<version>3.1</version>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>inject</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
</exclusion>
<exclusion>
<groupId>net.java.dev.which4j</groupId>
<artifactId>which4j</artifactId>
Expand All @@ -66,76 +63,76 @@
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</exclusion>
</exclusions>
</dependency>
</exclusions>
</dependency>

<!-- Adopt legacy logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.7</version>
</dependency>
<!-- Adopt legacy logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.7</version>
</dependency>

<!-- <dependency>
<groupId>ch.elca.el4j.modules</groupId>
<artifactId>module-jmx</artifactId>
<version>3.1</version>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>inject</artifactId>
</exclusion>
</exclusions>
</dependency>-->
<dependency>
<groupId>ch.elca.el4j.modules</groupId>
<artifactId>module-xml_merge-common</artifactId>
<version>3.1</version>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>inject</artifactId>
</exclusion>
<exclusion>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>
<groupId>ch.elca.el4j.modules</groupId>
<artifactId>module-jmx</artifactId>
<version>3.1</version>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>inject</artifactId>
</exclusion>
</exclusions>
</dependency> -->
<dependency>
<groupId>ch.elca.el4j.modules</groupId>
<artifactId>module-xml_merge-common</artifactId>
<version>3.1</version>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>inject</artifactId>
</exclusion>
<exclusion>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Explicit definition of dependency due to access restrictions of the original XML Merge library dependencies -->
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<!-- Explicit definition of dependency due to access restrictions of the original XML Merge library dependencies -->
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>

<!-- Explicit JDom version as result of dependency conflicts -->
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1.3</version>
</dependency>
</dependencies>
<!-- Explicit JDom version as result of dependency conflicts -->
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1.3</version>
</dependency>
</dependencies>

<repositories>
<!-- For XML Merge -->
<!-- Build with Maven2 or 3.1.x due to strange dependencies which should be authorized !!! -->
<repository>
<id>el4jReleaseRepositoryExternal</id>
<name>External release repository of the EL4J project</name>
<url>http://public-el4.elca-services.ch/el4j/maven2repository</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<repositories>
<!-- For XML Merge -->
<!-- Build with Maven2 or 3.1.x due to strange dependencies which should be authorized !!! -->
<repository>
<id>el4jReleaseRepositoryExternal</id>
<name>External release repository of the EL4J project</name>
<url>http://public-el4.elca-services.ch/el4j/maven2repository</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
</project>

0 comments on commit b8a391c

Please sign in to comment.