Author: ilgrosso
Date: Wed Jul 2 06:00:00 2014
New Revision: 1607247
URL: http://svn.apache.org/r1607247
Log:
[SYNCOPE-143] Now the build should succeed
Modified:
syncope/trunk/installer/ (props changed)
syncope/trunk/installer/pom.xml
syncope/trunk/pom.xml
Propchange: syncope/trunk/installer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 2 06:00:00 2014
@@ -0,0 +1 @@
+target
Modified: syncope/trunk/installer/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/pom.xml?rev=1607247&r1=1607246&r2=1607247&view=diff
==============================================================================
--- syncope/trunk/installer/pom.xml (original)
+++ syncope/trunk/installer/pom.xml Wed Jul 2 06:00:00 2014
@@ -29,6 +29,7 @@ under the License.
<name>Apache Syncope Installer</name>
<description>Apache Syncope Installer</description>
+
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-installer</artifactId>
<packaging>jar</packaging>
@@ -43,19 +44,16 @@ under the License.
<properties>
<staging.dir>${project.build.directory}/staging</staging.dir>
- <izpack.version>5.0.0-rc2</izpack.version>
</properties>
<dependencies>
<dependency>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-compiler</artifactId>
- <version>${izpack.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-panel</artifactId>
- <version>${izpack.version}</version>
</dependency>
<!--DB DRIVERS-->
@@ -99,53 +97,10 @@ under the License.
<defaultGoal>package</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.izpack</groupId>
- <artifactId>izpack-maven-plugin</artifactId>
- <version>${izpack.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
- <inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- <optimize>true</optimize>
- <debug>true</debug>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<id>copy-resources</id>
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1607247&r1=1607246&r2=1607247&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Jul 2 06:00:00 2014
@@ -363,6 +363,8 @@ under the License.
<jquery-ui.version>1.10.4</jquery-ui.version>
<highlightjs.version>8.0</highlightjs.version>
<codemirror.version>3.23</codemirror.version>
+
+ <izpack.version>5.0.0-rc2</izpack.version>
<bundles.directory>${project.build.directory}/bundles</bundles.directory>
<connid.location>file:${bundles.directory}/</connid.location>
@@ -879,6 +881,17 @@ under the License.
<artifactId>codemirror</artifactId>
<version>${codemirror.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-compiler</artifactId>
+ <version>${izpack.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-panel</artifactId>
+ <version>${izpack.version}</version>
+ </dependency>
<!-- TEST -->
<dependency>
@@ -1303,6 +1316,11 @@ under the License.
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-maven-plugin</artifactId>
+ <version>${izpack.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
