syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmarte...@apache.org
Subject [4/8] syncope git commit: Upgrading Cargo, AspectJ, Project Info Reports plugin
Date Tue, 15 Sep 2015 13:44:21 GMT
Upgrading Cargo, AspectJ, Project Info Reports plugin


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5879d443
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5879d443
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5879d443

Branch: refs/heads/SYNCOPE-156
Commit: 5879d4437aa0c807dd9380a9dcc1a834f0ddc1e6
Parents: 0245654 0e260fa
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Mon Sep 14 08:05:46 2015 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Mon Sep 14 08:05:46 2015 +0200

----------------------------------------------------------------------
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/5879d443/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index a1e03ed,94b0d84..40c8c09
--- a/pom.xml
+++ b/pom.xml
@@@ -636,75 -682,74 +636,75 @@@ under the License
        <dependency>
          <groupId>org.aspectj</groupId>
          <artifactId>aspectjweaver</artifactId>
-         <version>1.8.6</version>
 -        <version>${aspectj.version}</version>
++        <version>1.8.7</version>
        </dependency>
 -
 +      
        <dependency>
 -        <groupId>javax.ws.rs</groupId>
 -        <artifactId>javax.ws.rs-api</artifactId>
 -        <version>${jax-rs.version}</version>
 +        <groupId>commons-io</groupId>
 +        <artifactId>commons-io</artifactId>
 +        <version>${commons-io.version}</version>
        </dependency>
 -
 -      <!-- CXF -->
        <dependency>
 -        <groupId>org.apache.cxf</groupId>
 -        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
 -        <version>${cxf.version}</version>
 +        <groupId>commons-codec</groupId>
 +        <artifactId>commons-codec</artifactId>
 +        <version>${commons-codec.version}</version>
        </dependency>
        <dependency>
 -        <groupId>org.apache.cxf</groupId>
 -        <artifactId>cxf-rt-rs-extension-providers</artifactId>
 -        <version>${cxf.version}</version>
 +        <groupId>org.apache.commons</groupId>
 +        <artifactId>commons-jexl</artifactId>
 +        <version>${commons-jexl.version}</version>
        </dependency>
        <dependency>
 -        <groupId>org.apache.cxf</groupId>
 -        <artifactId>cxf-rt-rs-extension-search</artifactId>
 -        <version>${cxf.version}</version>
 +        <groupId>org.apache.commons</groupId>
 +        <artifactId>commons-lang3</artifactId>
 +        <version>${commons-lang.version}</version>
        </dependency>
        <dependency>
 -        <groupId>org.apache.cxf</groupId>
 -        <artifactId>cxf-rt-frontend-jaxws</artifactId>
 -        <version>${cxf.version}</version>
 +        <groupId>org.apache.commons</groupId>
 +        <artifactId>commons-collections4</artifactId>
 +        <version>${commons-collection.version}</version>
        </dependency>
 +            
        <dependency>
 -        <groupId>org.apache.cxf</groupId>
 -        <artifactId>cxf-rt-rs-service-description</artifactId>
 -        <version>${cxf.version}</version>
 +        <groupId>net.tirasa.connid</groupId>
 +        <artifactId>connector-framework</artifactId>
 +        <version>${connid.version}</version>
        </dependency>
        <dependency>
 -        <groupId>org.apache.cxf</groupId>
 -        <artifactId>cxf-rt-rs-client</artifactId>
 -        <version>${cxf.version}</version>
 -      </dependency>      
 -      <!-- /CXF -->
 -
 +        <groupId>net.tirasa.connid</groupId>
 +        <artifactId>connector-framework-internal</artifactId>
 +        <version>${connid.version}</version>
 +      </dependency>
        <dependency>
 -        <groupId>com.fasterxml.jackson.core</groupId>
 -        <artifactId>jackson-core</artifactId>
 -        <version>${jackson.version}</version>
 +        <groupId>net.tirasa.connid</groupId>
 +        <artifactId>slf4j-logging</artifactId>
 +        <version>${connid.version}</version>
        </dependency>
 +      
        <dependency>
 -        <groupId>com.fasterxml.jackson.core</groupId>
 -        <artifactId>jackson-databind</artifactId>
 -        <version>${jackson.version}</version>
 +        <groupId>org.codehaus.groovy</groupId>
 +        <artifactId>groovy-all</artifactId>
 +        <version>${groovy.version}</version>
        </dependency>
 +
        <dependency>
 -        <groupId>com.fasterxml.jackson.core</groupId>
 -        <artifactId>jackson-annotations</artifactId>
 -        <version>${jackson.version}</version>
 +        <groupId>com.h2database</groupId>
 +        <artifactId>h2</artifactId>
 +        <version>${h2.version}</version>
        </dependency>
 +
        <dependency>
 -        <groupId>com.fasterxml.jackson.jaxrs</groupId>
 -        <artifactId>jackson-jaxrs-json-provider</artifactId>
 -        <version>${jackson.version}</version>
 +        <groupId>org.apache.directory.server</groupId>
 +        <artifactId>apacheds-all</artifactId>
 +        <version>2.0.0-M20</version>
        </dependency>
 +      
        <dependency>
 -        <groupId>com.fasterxml.jackson.module</groupId>
 -        <artifactId>jackson-module-afterburner</artifactId>
 -        <version>${jackson.version}</version>
 +        <groupId>org.jasypt</groupId>
 +        <artifactId>jasypt</artifactId>
 +        <version>${jasypt.version}</version>
        </dependency>
 -
 +      
        <dependency>
          <groupId>org.quartz-scheduler</groupId>
          <artifactId>quartz</artifactId>
@@@ -1193,12 -1169,12 +1193,12 @@@
          <plugin>
            <groupId>org.codehaus.cargo</groupId>
            <artifactId>cargo-maven2-plugin</artifactId>
-           <version>1.4.15</version>
+           <version>1.4.16</version>
            <configuration>
              <container>
 -              <containerId>tomcat7x</containerId>
 +              <containerId>tomcat8x</containerId>
                <zipUrlInstaller>
 -                <url>http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
 +                <url>http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
                  <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
                  <extractDir>${project.build.directory}/cargo/extract</extractDir>
                </zipUrlInstaller>


Mime
View raw message