You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/11/03 16:47:07 UTC
[2/4] git commit: Partially applying pull request #1 - keeping
license information as other ASF projects do
Partially applying pull request #1 - keeping license information as other ASF projects do
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/98992e14
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/98992e14
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/98992e14
Branch: refs/heads/1_2_X
Commit: 98992e141b5a5d974c1f13ddda12d12b9de47d6b
Parents: 6557a95
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Nov 3 16:46:32 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Nov 3 16:46:32 2014 +0100
----------------------------------------------------------------------
archetype/pom.xml | 8 +--
build-tools/pom.xml | 10 ++--
client/pom.xml | 8 +--
common/pom.xml | 42 +++++++--------
console/pom.xml | 34 ++++++------
core-upgrader/pom.xml | 4 +-
core/pom.xml | 88 +++++++++++++++----------------
deb/pom.xml | 6 +--
installer/pom.xml | 30 +++++------
pom.xml | 125 ++++++++++++++++++++++-----------------------
standalone/pom.xml | 26 +++++-----
11 files changed, 190 insertions(+), 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 74a1214..d0209d1 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@ under the License.
<url>${site.deploymentBaseUrl}/${project.artifactId}</url>
</site>
</distributionManagement>
-
+
<build>
<extensions>
<extension>
@@ -106,7 +106,7 @@ under the License.
</transformationSets>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -129,7 +129,7 @@ under the License.
<include>NOTICE</include>
</includes>
</resource>
-
+
<resource>
<directory>../core/src/main/resources</directory>
<targetPath>${project.build.outputDirectory}/archetype-resources/core/src/main/resources</targetPath>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 07cfbfe..98ae216 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -40,9 +40,9 @@ under the License.
<url>${site.deploymentBaseUrl}/${project.artifactId}</url>
</site>
</distributionManagement>
-
+
<dependencies>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -85,19 +85,19 @@ under the License.
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework-internal</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</dependency>
-
+
<dependency>
<groupId>net.tirasa.connid.bundles.db</groupId>
<artifactId>net.tirasa.connid.bundles.db.table</artifactId>
<version>${connid.db.table.version}</version>
<scope>runtime</scope>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index a549010..0a3c845 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -40,14 +40,14 @@ under the License.
<url>${site.deploymentBaseUrl}/${project.artifactId}</url>
</site>
</distributionManagement>
-
+
<dependencies>
<dependency>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-common</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
@@ -62,7 +62,7 @@ under the License.
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -100,7 +100,7 @@ under the License.
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
</plugins>
-
+
<resources>
<resource>
<directory>..</directory>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 53c7504..11236f6 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -40,12 +40,12 @@ under the License.
<url>${site.deploymentBaseUrl}/${project.artifactId}</url>
</site>
</distributionManagement>
-
+
<dependencies>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -63,27 +63,27 @@ under the License.
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -105,7 +105,7 @@ under the License.
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -138,7 +138,7 @@ under the License.
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
</plugins>
-
+
<resources>
<resource>
<directory>..</directory>
@@ -150,14 +150,14 @@ under the License.
</resource>
</resources>
</build>
-
+
<profiles>
<profile>
<id>offline-doc</id>
-
+
<build>
<defaultGoal>clean verify</defaultGoal>
-
+
<plugins>
<!-- 1. Generate offline WADL -->
<plugin>
@@ -268,7 +268,7 @@ under the License.
</transformationSet>
</transformationSets>
</configuration>
- </plugin>
+ </plugin>
<!-- 3. Replace CSS and JS local includes with hosted -->
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
@@ -279,38 +279,38 @@ under the License.
<phase>package</phase>
<goals>
<goal>replace</goal>
- </goals>
+ </goals>
</execution>
</executions>
<configuration>
<regex>false</regex>
<includes>
<include>${project.build.directory}/generated/wadl/*.html</include>
- </includes>
+ </includes>
<replacements>
<replacement>
<token>/restdocs/${project.version}/webjars/highlightjs/$/styles/default.min.css</token>
<value>http://yandex.st/highlightjs/${highlightjs.version}/styles/default.min.css</value>
- </replacement>
+ </replacement>
<replacement>
<token>/restdocs/${project.version}/webjars/highlightjs/$/highlight.min.js</token>
<value>http://yandex.st/highlightjs/${highlightjs.version}/highlight.min.js"</value>
- </replacement>
+ </replacement>
<replacement>
<token>/restdocs/${project.version}/webjars/jquery-ui/$/themes/base/minified/jquery-ui.min.css</token>
<value>http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/minified/jquery-ui.min.css</value>
- </replacement>
+ </replacement>
<replacement>
<token>/restdocs/${project.version}/webjars/jquery-ui/$/ui/minified/jquery-ui.min.js</token>
<value>http://ajax.googleapis.com/ajax/libs/jqueryui/${jquery-ui.version}/jquery-ui.min.js</value>
- </replacement>
+ </replacement>
<replacement>
<token>/restdocs/${project.version}/webjars/jquery/$/jquery.min.js</token>
<value>http://ajax.googleapis.com/ajax/libs/jquery/${jquery.version}/jquery.min.js</value>
- </replacement>
+ </replacement>
</replacements>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index d7c7845..9ed2e68 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -41,7 +41,7 @@ under the License.
<url>${site.deploymentBaseUrl}/${project.artifactId}</url>
</site>
</distributionManagement>
-
+
<dependencies>
<dependency>
@@ -55,7 +55,7 @@ under the License.
<artifactId>syncope-client</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -131,8 +131,8 @@ under the License.
<dependency>
<groupId>org.webjars</groupId>
<artifactId>codemirror</artifactId>
- </dependency>
-
+ </dependency>
+
<!-- TEST -->
<dependency>
<groupId>org.activiti</groupId>
@@ -280,7 +280,7 @@ under the License.
<phase>process-resources</phase>
<goals>
<goal>replace</goal>
- </goals>
+ </goals>
</execution>
</executions>
<configuration>
@@ -353,7 +353,7 @@ under the License.
</deployables>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -486,7 +486,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -502,7 +502,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -519,7 +519,7 @@ under the License.
<skipTests>${skipTests}</skipTests>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
@@ -541,11 +541,11 @@ under the License.
<profile>
<id>debug</id>
-
+
<properties>
<skipTests>true</skipTests>
</properties>
-
+
<build>
<defaultGoal>clean verify cargo:run</defaultGoal>
@@ -565,7 +565,7 @@ under the License.
<mappedresources>
<fileset dir="${project.build.directory}/test-classes" includes="web.xml" />
<globmapper from="web.xml" to="WEB-INF/web.xml" />
- </mappedresources>
+ </mappedresources>
</war>
</target>
</configuration>
@@ -640,7 +640,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.zeroturnaround</groupId>
<artifactId>jrebel-maven-plugin</artifactId>
@@ -655,7 +655,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
@@ -679,18 +679,18 @@ under the License.
<phase>none</phase>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
<profile>
<id>selenium</id>
-
+
<properties>
<javaagent />
</properties>
-
+
<build>
<defaultGoal>clean verify</defaultGoal>
<plugins>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/core-upgrader/pom.xml
----------------------------------------------------------------------
diff --git a/core-upgrader/pom.xml b/core-upgrader/pom.xml
index 70acec9..9adc999 100644
--- a/core-upgrader/pom.xml
+++ b/core-upgrader/pom.xml
@@ -51,7 +51,7 @@ under the License.
<artifactId>syncope-common</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -62,7 +62,7 @@ under the License.
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
-
+
<build>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d1821ec..159daff 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -41,7 +41,7 @@ under the License.
<url>${site.deploymentBaseUrl}/${project.artifactId}</url>
</site>
</distributionManagement>
-
+
<properties>
<jdbcdriver.groupId>com.h2database</jdbcdriver.groupId>
<jdbcdriver.artifactId>h2</jdbcdriver.artifactId>
@@ -65,7 +65,7 @@ under the License.
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
@@ -74,12 +74,12 @@ under the License.
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_provider</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-engine</artifactId>
@@ -90,9 +90,9 @@ under the License.
</dependency>
<dependency>
<groupId>org.activiti</groupId>
- <artifactId>activiti-json-converter</artifactId>
+ <artifactId>activiti-json-converter</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -117,7 +117,7 @@ under the License.
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -170,7 +170,7 @@ under the License.
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
@@ -184,22 +184,22 @@ under the License.
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.cocoon.sax</groupId>
<artifactId>cocoon-sax</artifactId>
@@ -308,7 +308,7 @@ under the License.
<groupId>net.tirasa.connid</groupId>
<artifactId>slf4j-logging</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
@@ -374,7 +374,7 @@ under the License.
<finalName>${project.parent.artifactId}</finalName>
<plugins>
-
+
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
@@ -503,7 +503,7 @@ under the License.
<groupId>${jdbcdriver.groupId}</groupId>
<artifactId>${jdbcdriver.artifactId}</artifactId>
</dependency>
- </dependencies>
+ </dependencies>
</container>
<configuration>
<type>standalone</type>
@@ -566,7 +566,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -700,7 +700,7 @@ under the License.
</build>
<profiles>
-
+
<profile>
<id>skipTests</id>
@@ -710,9 +710,9 @@ under the License.
<artifactId>h2</artifactId>
</dependency>
</dependencies>
-
+
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -729,7 +729,7 @@ under the License.
<skipTests>${skipTests}</skipTests>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
@@ -765,7 +765,7 @@ under the License.
<profile>
<id>sqlgen</id>
-
+
<dependencies>
<dependency>
<groupId>com.h2database</groupId>
@@ -779,8 +779,8 @@ under the License.
</dependencies>
<build>
- <defaultGoal>clean process-classes</defaultGoal>
-
+ <defaultGoal>clean process-classes</defaultGoal>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -788,7 +788,7 @@ under the License.
<configuration>
<includeProjectDependencies>false</includeProjectDependencies>
<includePluginDependencies>true</includePluginDependencies>
-
+
<executable>java</executable>
<arguments>
<argument>-DpersistenceXmlFile=${project.basedir}/src/main/resources/META-INF/spring-persistence.xml</argument>
@@ -796,7 +796,7 @@ under the License.
<argument>-DconnectionDriverName=org.apache.commons.dbcp.BasicDataSource</argument>
<argument>-DconnectionProperties=driverClassName;org.h2.Driver,url;jdbc:h2:mem:syncopedb,username;sa,password;</argument>
<argument>-DsqlFile=${project.build.directory}/database.sql</argument>
-
+
<argument>-classpath</argument>
<classpath>
<dependency>org.apache.syncope:syncope-common</dependency>
@@ -857,11 +857,11 @@ under the License.
<profile>
<id>debug</id>
-
+
<properties>
<skipTests>true</skipTests>
</properties>
-
+
<build>
<defaultGoal>clean verify cargo:run</defaultGoal>
@@ -898,7 +898,7 @@ under the License.
<build>
<defaultGoal>clean verify</defaultGoal>
-
+
<plugins>
<!-- Strip Activiti-related entries from content.xml and indexes.xml -->
<plugin>
@@ -935,7 +935,7 @@ under the License.
</configuration>
</plugin>
</plugins>
-
+
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -1014,10 +1014,10 @@ under the License.
</testResources>
</build>
</profile>
-
+
<profile>
<id>sqlserver-it</id>
-
+
<properties>
<jdbcdriver.groupId>com.microsoft.sqlserver</jdbcdriver.groupId>
<jdbcdriver.artifactId>sqljdbc4</jdbcdriver.artifactId>
@@ -1098,7 +1098,7 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<defaultGoal>clean verify</defaultGoal>
@@ -1212,7 +1212,7 @@ under the License.
<defaultGoal>clean verify</defaultGoal>
<plugins>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -1221,7 +1221,7 @@ under the License.
<skipTests>true</skipTests>
</configuration>
</plugin>
-
+
<!-- Disable MANIFEST.MF OSGi handling -->
<plugin>
<groupId>org.apache.felix</groupId>
@@ -1233,7 +1233,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -1255,7 +1255,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
@@ -1327,21 +1327,21 @@ under the License.
</resources>
</build>
</profile>
-
+
<profile>
<id>weblogic-it</id>
-
+
<properties>
<weblogic.home>/opt/weblogic-12.1.1</weblogic.home>
</properties>
-
+
<dependencies>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
</dependencies>
-
+
<build>
<defaultGoal>clean verify</defaultGoal>
@@ -1354,7 +1354,7 @@ under the License.
<skipTests>true</skipTests>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -1392,7 +1392,7 @@ under the License.
<home>${weblogic.home}/wlserver</home>
<log>${cargo.log}</log>
- <output>${cargo.output}</output>
+ <output>${cargo.output}</output>
</container>
<configuration>
<properties>
@@ -1435,7 +1435,7 @@ under the License.
</configuration>
</plugin>
</plugins>
-
+
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -1449,7 +1449,7 @@ under the License.
<filtering>true</filtering>
<includes>
<include>persistence.properties</include>
- </includes>
+ </includes>
</resource>
</resources>
<testResources>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/deb/pom.xml
----------------------------------------------------------------------
diff --git a/deb/pom.xml b/deb/pom.xml
index d38a624..297b6b1 100644
--- a/deb/pom.xml
+++ b/deb/pom.xml
@@ -45,16 +45,16 @@ under the License.
<profiles>
<profile>
<id>apache-release</id>
-
+
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/installer/pom.xml
----------------------------------------------------------------------
diff --git a/installer/pom.xml b/installer/pom.xml
index a78a28f..309eaaa 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -41,7 +41,7 @@ under the License.
<url>${site.deploymentBaseUrl}/${project.artifactId}</url>
</site>
</distributionManagement>
-
+
<properties>
<staging.dir>${project.build.directory}/staging</staging.dir>
</properties>
@@ -65,7 +65,7 @@ under the License.
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -74,7 +74,7 @@ under the License.
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -83,7 +83,7 @@ under the License.
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -95,9 +95,9 @@ under the License.
</dependencies>
<build>
-
+
<defaultGoal>package</defaultGoal>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -131,7 +131,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -147,7 +147,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
@@ -170,7 +170,7 @@ under the License.
</executions>
</plugin>
</plugins>
-
+
<resources>
<resource>
<directory>${basedir}</directory>
@@ -182,23 +182,23 @@ under the License.
</resource>
</resources>
</build>
-
+
<profiles>
<profile>
<id>apache-release</id>
-
+
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
</profiles>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aaf319e..122c3e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Apache Syncope</name>
<description>Apache Syncope parent POM</description>
-
+
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
<version>1.2.1-SNAPSHOT</version>
@@ -53,7 +53,7 @@ under the License.
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=syncope.git</url>
</scm>
-
+
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/SYNCOPE</url>
@@ -71,7 +71,7 @@ under the License.
<url>${site.deploymentBaseUrl}</url>
</site>
</distributionManagement>
-
+
<mailingLists>
<mailingList>
<name>Syncope User List</name>
@@ -109,7 +109,7 @@ under the License.
</otherArchives>
</mailingList>
</mailingLists>
-
+
<developers>
<developer>
<id>ilgrosso</id>
@@ -142,10 +142,10 @@ under the License.
<role>PMC member</role>
</roles>
<url>http://people.apache.org/~mdisabatino/</url>
- </developer>
+ </developer>
<developer>
<id>massi</id>
- <name>Massimiliano Perrone</name>
+ <name>Massimiliano Perrone</name>
<organization>Tirasa</organization>
<organizationUrl>http://www.tirasa.net/</organizationUrl>
<roles>
@@ -155,17 +155,17 @@ under the License.
</developer>
<developer>
<id>rene</id>
- <name>René Mulder</name>
+ <name>René Mulder</name>
<organization>Everett</organization>
<organizationUrl>http://www.everett.nl/</organizationUrl>
<roles>
<role>committer</role>
</roles>
<url>http://people.apache.org/~rene/</url>
- </developer>
+ </developer>
<developer>
<id>simonetripodi</id>
- <name>Simone Tripodi</name>
+ <name>Simone Tripodi</name>
<organization>The Apache Software Foundation</organization>
<organizationUrl>http://www.apache.org/</organizationUrl>
<roles>
@@ -176,7 +176,7 @@ under the License.
</developer>
<developer>
<id>elecharny</id>
- <name>Emmanuel Lecharny</name>
+ <name>Emmanuel Lecharny</name>
<organization>The Apache Software Foundation</organization>
<organizationUrl>http://www.apache.org/</organizationUrl>
<roles>
@@ -298,18 +298,18 @@ under the License.
<prerequisites>
<maven>[3.0.3,)</maven>
</prerequisites>
-
- <properties>
+
+ <properties>
<syncope.version>${project.version}</syncope.version>
<targetJdk>1.6</targetJdk>
-
+
<servlet-api.version>3.0.1</servlet-api.version>
<jsp-api.version>2.2</jsp-api.version>
<jstl.version>1.2</jstl.version>
<!-- Upgrade to 3.0.0 for Java 7+ -->
<javax.el.version>3.0-b02</javax.el.version>
<jax-rs.version>2.0</jax-rs.version>
-
+
<connid.version>1.4.0.0</connid.version>
<connid.soap.version>1.3.0</connid.soap.version>
<connid.db.table.version>2.2.0</connid.db.table.version>
@@ -322,7 +322,7 @@ under the License.
<commons-codec.version>1.9</commons-codec.version>
<activiti.version>5.16.4</activiti.version>
-
+
<aspectj.version>1.8.3</aspectj.version>
<cxf.version>3.0.2</cxf.version>
@@ -391,14 +391,14 @@ under the License.
<testdb.url>jdbc:h2:tcp://localhost:9092/mem:testdb;DB_CLOSE_DELAY=-1</testdb.url>
<testdb.username>sa</testdb.username>
<testdb.password>sa</testdb.password>
-
+
<testconnectorserver.port>4554</testconnectorserver.port>
<testconnectorserver.key>testconnectorserver</testconnectorserver.key>
-
+
<test.csvdir.path>${project.build.directory}/test-csvdir</test.csvdir.path>
-
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+
<anonymousUser>anonymous</anonymousUser>
<!-- static keys, only used for build: generated overlays will override during archetype:generate -->
<anonymousKey>anonymousKey</anonymousKey>
@@ -408,7 +408,7 @@ under the License.
<dependencyManagement>
<dependencies>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -455,7 +455,7 @@ under the License.
<artifactId>commons-lang3</artifactId>
<version>${commons-lang.version}</version>
</dependency>
-
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -477,7 +477,7 @@ under the License.
<artifactId>slf4j-logging</artifactId>
<version>${connid.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
@@ -502,30 +502,30 @@ under the License.
</dependency>
<dependency>
<groupId>org.activiti</groupId>
- <artifactId>activiti-spring</artifactId>
+ <artifactId>activiti-spring</artifactId>
<version>${activiti.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
- <artifactId>activiti-json-converter</artifactId>
+ <artifactId>activiti-json-converter</artifactId>
<version>${activiti.version}</version>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
- <artifactId>activiti-webapp-explorer2</artifactId>
+ <artifactId>activiti-webapp-explorer2</artifactId>
<version>${activiti.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>1.1</version>
</dependency>
@@ -551,7 +551,7 @@ under the License.
<artifactId>commons-dbcp</artifactId>
<version>${commons-dbcp.version}</version>
</dependency>
-
+
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
@@ -562,13 +562,13 @@ under the License.
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
@@ -652,12 +652,12 @@ under the License.
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>${spring-security.version}</version>
+ <version>${spring-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>${spring-security.version}</version>
+ <version>${spring-security.version}</version>
</dependency>
<!-- /Spring -->
@@ -672,7 +672,7 @@ under the License.
<artifactId>javax.ws.rs-api</artifactId>
<version>${jax-rs.version}</version>
</dependency>
-
+
<!-- CXF -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -697,12 +697,12 @@ under the License.
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>${cxf.version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf.version}</version>
+ <version>${cxf.version}</version>
</dependency>
<!-- /CXF -->
@@ -731,7 +731,7 @@ under the License.
<artifactId>jackson-module-afterburner</artifactId>
<version>${jackson.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
@@ -743,7 +743,7 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.cocoon.sax</groupId>
<artifactId>cocoon-sax</artifactId>
@@ -754,7 +754,7 @@ under the License.
<artifactId>cocoon-optional</artifactId>
<version>${cocoon.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
@@ -770,7 +770,7 @@ under the License.
</exclusion>
<exclusion>
<groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
+ <artifactId>xalan</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -784,7 +784,7 @@ under the License.
<artifactId>avalon-framework-impl</artifactId>
<version>4.3.1</version>
</dependency>
-
+
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
@@ -795,7 +795,7 @@ under the License.
<artifactId>xercesImpl</artifactId>
<version>2.11.0</version>
</dependency>
-
+
<!-- Wicket -->
<dependency>
<groupId>org.apache.wicket</groupId>
@@ -836,7 +836,7 @@ under the License.
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-all</artifactId>
@@ -849,7 +849,7 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -875,7 +875,7 @@ under the License.
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
@@ -897,7 +897,7 @@ under the License.
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
@@ -934,7 +934,7 @@ under the License.
<artifactId>maven-invoker</artifactId>
<version>${maven-invoker.version}</version>
</dependency>
-
+
<!-- TEST -->
<dependency>
<groupId>junit</groupId>
@@ -991,7 +991,7 @@ under the License.
<snapshots>
<enabled>true</enabled>
</snapshots>
- </repository>
+ </repository>
</repositories>
<pluginRepositories>
@@ -1062,7 +1062,7 @@ under the License.
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
+ <version>2.7.1</version>
</dependency>
</dependencies>
</plugin>
@@ -1191,8 +1191,8 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.12.1</version>
- <dependencies>
+ <version>2.12.1</version>
+ <dependencies>
<dependency>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-build-tools</artifactId>
@@ -1209,7 +1209,7 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.2</version>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-build-tools</artifactId>
@@ -1320,14 +1320,14 @@ under the License.
<artifactId>izpack-maven-plugin</artifactId>
<version>${izpack.version}</version>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
<version>${jdeb.version}</version>
</plugin>
</plugins>
</pluginManagement>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1377,7 +1377,6 @@ under the License.
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
<configuration>
<excludes>
<exclude>nbactions.xml</exclude>
@@ -1480,11 +1479,11 @@ under the License.
</build>
<profiles>
-
+
<profile>
<id>apache-release</id>
- <build>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1509,13 +1508,13 @@ under the License.
</plugins>
</build>
</profile>
-
+
<profile>
<id>site</id>
<build>
<defaultGoal>clean site-deploy</defaultGoal>
-
- <plugins>
+
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -1568,7 +1567,7 @@ under the License.
</plugins>
</build>
</profile>
-
+
<profile>
<id>skipTests</id>
<properties>
@@ -1578,7 +1577,7 @@ under the License.
<defaultGoal>clean install</defaultGoal>
</build>
</profile>
-
+
</profiles>
<modules>
http://git-wip-us.apache.org/repos/asf/syncope/blob/98992e14/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index f58b965..53cd9f9 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -40,11 +40,11 @@ under the License.
<url>${site.deploymentBaseUrl}/${project.artifactId}</url>
</site>
</distributionManagement>
-
+
<properties>
<connid.location>connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}</connid.location>
<log.directory>./logs</log.directory>
-
+
<work.dir>${project.build.directory}/standalone</work.dir>
</properties>
@@ -75,7 +75,7 @@ under the License.
</dependencies>
<build>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -90,7 +90,7 @@ under the License.
<configuration>
<target>
<mkdir dir="${work.dir}" />
-
+
<!-- legal stuff -->
<copy file="${project.build.outputDirectory}/README" todir="${work.dir}" />
<copy file="LICENSE" todir="${work.dir}" />
@@ -108,7 +108,7 @@ under the License.
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes" overwrite="true">
<fileset dir="${project.build.outputDirectory}/core" />
</copy>
-
+
<!-- Syncope console (exploded) -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console">
<fileset dir="../console/target/syncope-console" includes="**/*" />
@@ -116,7 +116,7 @@ under the License.
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console/WEB-INF/classes" overwrite="true">
<fileset dir="${project.build.outputDirectory}/console" />
</copy>
-
+
<!-- ConnId's SOAP wssample (provides endpoint for SOAP resources) -->
<copy file="${settings.localRepository}/net/tirasa/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war" tofile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/wssample.war" />
@@ -126,12 +126,12 @@ under the License.
<fileset dir="../core/target/bundles" includes="**/*" />
</copy>
<zip destfile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools.war" basedir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
<!-- Tomcat shared libraries: H2 and groovy -->
<copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
<copy file="${settings.localRepository}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
-
+
<!-- Other custom Tomcat resources -->
<copy file="../core/target/test-classes/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf" overwrite="true" />
<copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin" />
@@ -142,7 +142,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -206,11 +206,11 @@ under the License.
</resource>
</resources>
</build>
-
+
<profiles>
<profile>
<id>apache-release</id>
-
+
<build>
<plugins>
<plugin>
@@ -224,5 +224,5 @@ under the License.
</build>
</profile>
</profiles>
-
+
</project>