Author: kwright
Date: Sat Aug 15 09:14:00 2015
New Revision: 1696031

URL: http://svn.apache.org/r1696031
Log:
Pull up reformatting of poms and builds

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/connectors/confluence/build.xml
    manifoldcf/branches/dev_1x/connectors/confluence/pom.xml

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 15 09:14:00 2015
@@ -125,4 +125,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
 
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
 
1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329,1678471,1678551,1679730,1679826,1681390,1681735,1682232,1682252,1682410,1682602,1682622,1682719,1683208,1683506,1683529,1683768,1684015,1684017,1684153,1684156,1684712,1684866,1685547,1687097,1687303,1687768,1688070,1688348,1688432,1689608,1690665,1692679,1693653,1695675,1695696,1695808,1695839,1695857,1695876,1695922
+/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
 
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
 
1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329,1678471,1678551,1679730,1679826,1681390,1681735,1682232,1682252,1682410,1682602,1682622,1682719,1683208,1683506,1683529,1683768,1684015,1684017,1684153,1684156,1684712,1684866,1685547,1687097,1687303,1687768,1688070,1688348,1688432,1689608,1690665,1692679,1693653,1695675,1695696,1695808,1695839,1695857,1695876,1695922,1696029

Modified: manifoldcf/branches/dev_1x/connectors/confluence/build.xml
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/confluence/build.xml?rev=1696031&r1=1696030&r2=1696031&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/confluence/build.xml (original)
+++ manifoldcf/branches/dev_1x/connectors/confluence/build.xml Sat Aug 15 
09:14:00 2015
@@ -17,46 +17,46 @@
 
 <project name="confluence" default="all">
 
-       <property environment="env" />
-       <condition property="mcf-dist" value="${env.MCFDISTPATH}">
-               <isset property="env.MCFDISTPATH" />
-       </condition>
-       <property name="abs-dist" location="../../dist" />
-       <condition property="mcf-dist" value="${abs-dist}">
-               <not>
-                       <isset property="env.MCFDISTPATH" />
-               </not>
-       </condition>
-
-       <import file="${mcf-dist}/connector-build.xml" />
-
-       <path id="connector-classpath">
-               <path refid="mcf-connector-build.connector-classpath" />
-               <fileset dir="../../lib">
-                       <include name="guava-*.jar" />
-                       <include name="httpcore*.jar" />
-                       <include name="httpclient*.jar" />
-               </fileset>
-       </path>
-
-       <target name="lib" depends="mcf-connector-build.lib,precompile-check" 
if="canBuild">
-               <mkdir dir="dist/lib" />
-               <copy todir="dist/lib">
-                       <fileset dir="../../lib">
-                               <include name="guava-*.jar" />
-                       </fileset>
-               </copy>
-       </target>
-
-       <target name="deliver-connector" 
depends="mcf-connector-build.deliver-connector">
-               <antcall target="general-add-repository-connector">
-                       <param name="connector-label" value="Confluence" />
-                       <param name="connector-class" 
value="org.apache.manifoldcf.crawler.connectors.confluence.ConfluenceRepositoryConnector"
 />
-               </antcall>
-               <antcall target="general-add-authority-connector">
-                       <param name="connector-label" value="Confluence" />
-                       <param name="connector-class" 
value="org.apache.manifoldcf.authorities.authorities.confluence.ConfluenceAuthorityConnector"
 />
-               </antcall>
-       </target>
+  <property environment="env" />
+  <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+    <isset property="env.MCFDISTPATH" />
+  </condition>
+  <property name="abs-dist" location="../../dist" />
+  <condition property="mcf-dist" value="${abs-dist}">
+    <not>
+      <isset property="env.MCFDISTPATH" />
+    </not>
+  </condition>
+
+  <import file="${mcf-dist}/connector-build.xml" />
+
+  <path id="connector-classpath">
+    <path refid="mcf-connector-build.connector-classpath" />
+    <fileset dir="../../lib">
+      <include name="guava-*.jar" />
+      <include name="httpcore*.jar" />
+      <include name="httpclient*.jar" />
+    </fileset>
+  </path>
+
+  <target name="lib" depends="mcf-connector-build.lib,precompile-check" 
if="canBuild">
+    <mkdir dir="dist/lib" />
+    <copy todir="dist/lib">
+      <fileset dir="../../lib">
+        <include name="guava-*.jar" />
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="deliver-connector" 
depends="mcf-connector-build.deliver-connector">
+    <antcall target="general-add-repository-connector">
+      <param name="connector-label" value="Confluence" />
+      <param name="connector-class" 
value="org.apache.manifoldcf.crawler.connectors.confluence.ConfluenceRepositoryConnector"
 />
+    </antcall>
+    <antcall target="general-add-authority-connector">
+      <param name="connector-label" value="Confluence" />
+      <param name="connector-class" 
value="org.apache.manifoldcf.authorities.authorities.confluence.ConfluenceAuthorityConnector"
 />
+    </antcall>
+  </target>
 
 </project>

Modified: manifoldcf/branches/dev_1x/connectors/confluence/pom.xml
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/confluence/pom.xml?rev=1696031&r1=1696030&r2=1696031&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/confluence/pom.xml (original)
+++ manifoldcf/branches/dev_1x/connectors/confluence/pom.xml Sat Aug 15 
09:14:00 2015
@@ -1,352 +1,370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY 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";>
-       <parent>
-               <groupId>org.apache.manifoldcf</groupId>
-               <artifactId>mcf-connectors</artifactId>
-               <version>2.2-SNAPSHOT</version>
-       </parent>
-
-       <name>ManifoldCF - Connectors - Confluence Connector</name>
-       <modelVersion>4.0.0</modelVersion>
-       <artifactId>mcf-confluence-connector</artifactId>
-       <packaging>jar</packaging>
-
-       <url>http://maven.apache.org</url>
-
-       <developers>
-               <developer>
-                       <name>Antonio David Perez Morales</name>
-                       <email>[email protected]</email>
-               </developer>
-       </developers>
-
-       <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-       </properties>
-
-       <build>
-               <defaultGoal>integration-test</defaultGoal>
-               
<sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
-               
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
-               <resources>
-                       <resource>
-                               
<directory>${basedir}/connector/src/main/native2ascii</directory>
-                               <includes>
-                                       <include>**/*.properties</include>
-                               </includes>
-                       </resource>
-                       <resource>
-                               
<directory>${basedir}/connector/src/main/resources</directory>
-                               <includes>
-                                       <include>**/*.html</include>
-                                       <include>**/*.js</include>
-                               </includes>
-                       </resource>
-               </resources>
-               <testResources>
-                       <testResource>
-                               
<directory>${basedir}/connector/src/test/resources</directory>
-                       </testResource>
-               </testResources>
-
-
-               <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               
<artifactId>native2ascii-maven-plugin</artifactId>
-                               <version>1.0-beta-1</version>
-                               <configuration>
-                                       <workDir>target/classes</workDir>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>native2ascii-utf8</id>
-                                               <goals>
-                                                       
<goal>native2ascii</goal>
-                                               </goals>
-                                               <configuration>
-                                                       
<encoding>UTF8</encoding>
-                                                       <includes>
-                                                               
<include>**/*.properties</include>
-                                                       </includes>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-                       <!-- Test plugin configuration -->
-                       <plugin>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-war</id>
-                                               
<phase>generate-resources</phase>
-                                               <goals>
-                                                       <goal>copy</goal>
-                                               </goals>
-                                               <configuration>
-                                                       
<outputDirectory>target/dependency</outputDirectory>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       
<groupId>${project.groupId}</groupId>
-                                                                       
<artifactId>mcf-api-service</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>war</type>
-                                                                       
<overWrite>false</overWrite>
-                                                                       
<destFileName>mcf-api-service.war</destFileName>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       
<groupId>${project.groupId}</groupId>
-                                                                       
<artifactId>mcf-authority-service</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>war</type>
-                                                                       
<overWrite>false</overWrite>
-                                                                       
<destFileName>mcf-authority-service.war</destFileName>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       
<groupId>${project.groupId}</groupId>
-                                                                       
<artifactId>mcf-crawler-ui</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>war</type>
-                                                                       
<overWrite>false</overWrite>
-                                                                       
<destFileName>mcf-crawler-ui.war</destFileName>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               
<exclude>**/*Postgresql*.java</exclude>
-                                               
<exclude>**/*MySQL*.java</exclude>
-                                       </excludes>
-                                       <forkMode>always</forkMode>
-                                       
<workingDirectory>target/test-output</workingDirectory>
-                               </configuration>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-failsafe-plugin</artifactId>
-                               <version>2.12.3</version>
-                               <configuration>
-                                       <skipTests>${skipITs}</skipTests>
-                                       <systemPropertyVariables>
-                                               
<crawlerWarPath>../dependency/mcf-crawler-ui.war</crawlerWarPath>
-                                               
<authorityserviceWarPath>../dependency/mcf-authority-service.war</authorityserviceWarPath>
-                                               
<apiWarPath>../dependency/mcf-api-service.war</apiWarPath>
-                                       </systemPropertyVariables>
-                                       <excludes>
-                                               
<exclude>**/*Postgresql*.java</exclude>
-                                               
<exclude>**/*MySQL*.java</exclude>
-                                       </excludes>
-                                       <forkMode>always</forkMode>
-                                       
<workingDirectory>target/test-output</workingDirectory>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>integration-test</id>
-                                               <goals>
-                                                       
<goal>integration-test</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>verify</id>
-                                               <goals>
-                                                       <goal>verify</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-               </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <!--This plugin's configuration is used to 
store Eclipse m2e settings 
-                                       only. It has no influence on the Maven 
build itself. -->
-                               <plugin>
-                                       <groupId>org.eclipse.m2e</groupId>
-                                       
<artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               
<pluginExecution>
-                                                                       
<pluginExecutionFilter>
-                                                                               
<groupId>
-                                                                               
        org.apache.maven.plugins
-                                                                               
</groupId>
-                                                                               
<artifactId>
-                                                                               
        maven-dependency-plugin
-                                                                               
</artifactId>
-                                                                               
<versionRange>
-                                                                               
        [2.8,)
-                                                                               
</versionRange>
-                                                                               
<goals>
-                                                                               
        <goal>copy</goal>
-                                                                               
</goals>
-                                                                       
</pluginExecutionFilter>
-                                                                       <action>
-                                                                               
<ignore></ignore>
-                                                                       
</action>
-                                                               
</pluginExecution>
-                                                               
<pluginExecution>
-                                                                       
<pluginExecutionFilter>
-                                                                               
<groupId>
-                                                                               
        org.codehaus.mojo
-                                                                               
</groupId>
-                                                                               
<artifactId>
-                                                                               
        native2ascii-maven-plugin
-                                                                               
</artifactId>
-                                                                               
<versionRange>
-                                                                               
        [1.0-beta-1,)
-                                                                               
</versionRange>
-                                                                               
<goals>
-                                                                               
        <goal>native2ascii</goal>
-                                                                               
</goals>
-                                                                       
</pluginExecutionFilter>
-                                                                       <action>
-                                                                               
<ignore></ignore>
-                                                                       
</action>
-                                                               
</pluginExecution>
-                                                               
<pluginExecution>
-                                                                       
<pluginExecutionFilter>
-                                                                               
<groupId>
-                                                                               
        org.apache.maven.plugins
-                                                                               
</groupId>
-                                                                               
<artifactId>
-                                                                               
        maven-remote-resources-plugin
-                                                                               
</artifactId>
-                                                                               
<versionRange>
-                                                                               
        [1.5,)
-                                                                               
</versionRange>
-                                                                               
<goals>
-                                                                               
        <goal>process</goal>
-                                                                               
</goals>
-                                                                       
</pluginExecutionFilter>
-                                                                       <action>
-                                                                               
<ignore></ignore>
-                                                                       
</action>
-                                                               
</pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </configuration>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-       </build>
-
-
-
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mcf-core</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mcf-connector-common</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mcf-pull-agent</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mcf-agents</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mcf-ui-core</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
-                       <version>${commons-lang.version}</version>
-                       <type>jar</type>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>15.0</version>
-               </dependency>
-               
-               <!-- Testing dependencies -->
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <version>${mockito.version}</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.github.tomakehurst</groupId>
-                       <artifactId>wiremock</artifactId>
-                       <version>${wiremock.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mcf-core</artifactId>
-                       <version>${project.version}</version>
-                       <type>test-jar</type>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-simple</artifactId>
-                       <version>${slf4j.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>commons-logging</groupId>
-                       <artifactId>commons-logging</artifactId>
-                       <version>1.1.1</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-                       <version>1.2.16</version>
-                       <scope>provided</scope>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>com.googlecode.json-simple</groupId>
-                       <artifactId>json-simple</artifactId>
-                       <version>1.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <version>1.8</version>
-               </dependency>
-       </dependencies>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  <parent>
+    <groupId>org.apache.manifoldcf</groupId>
+    <artifactId>mcf-connectors</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+
+  <name>ManifoldCF - Connectors - Confluence Connector</name>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>mcf-confluence-connector</artifactId>
+  <packaging>jar</packaging>
+
+  <url>http://maven.apache.org</url>
+
+  <developers>
+    <developer>
+      <name>Antonio David Perez Morales</name>
+      <email>[email protected]</email>
+    </developer>
+  </developers>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+  </properties>
+
+  <build>
+    <defaultGoal>integration-test</defaultGoal>
+    <sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
+    
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>${basedir}/connector/src/main/native2ascii</directory>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}/connector/src/main/resources</directory>
+        <includes>
+          <include>**/*.html</include>
+          <include>**/*.js</include>
+        </includes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>${basedir}/connector/src/test/resources</directory>
+      </testResource>
+    </testResources>
+
+
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>native2ascii-maven-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <configuration>
+          <workDir>target/classes</workDir>
+        </configuration>
+        <executions>
+          <execution>
+            <id>native2ascii-utf8</id>
+            <goals>
+              <goal>native2ascii</goal>
+            </goals>
+            <configuration>
+              <encoding>UTF8</encoding>
+              <includes>
+                <include>**/*.properties</include>
+              </includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Test plugin configuration -->
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-war</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/dependency</outputDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>mcf-api-service</artifactId>
+                  <version>${project.version}</version>
+                  <type>war</type>
+                  <overWrite>false</overWrite>
+                  <destFileName>mcf-api-service.war</destFileName>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>mcf-authority-service</artifactId>
+                  <version>${project.version}</version>
+                  <type>war</type>
+                  <overWrite>false</overWrite>
+                  <destFileName>mcf-authority-service.war</destFileName>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>mcf-crawler-ui</artifactId>
+                  <version>${project.version}</version>
+                  <type>war</type>
+                  <overWrite>false</overWrite>
+                  <destFileName>mcf-crawler-ui.war</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/*Postgresql*.java</exclude>
+            <exclude>**/*MySQL*.java</exclude>
+          </excludes>
+          <forkMode>always</forkMode>
+          <workingDirectory>target/test-output</workingDirectory>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.12.3</version>
+        <configuration>
+          <skipTests>${skipITs}</skipTests>
+          <systemPropertyVariables>
+            <crawlerWarPath>../dependency/mcf-crawler-ui.war</crawlerWarPath>
+            
<authorityserviceWarPath>../dependency/mcf-authority-service.war</authorityserviceWarPath>
+            <apiWarPath>../dependency/mcf-api-service.war</apiWarPath>
+          </systemPropertyVariables>
+          <excludes>
+            <exclude>**/*Postgresql*.java</exclude>
+            <exclude>**/*MySQL*.java</exclude>
+          </excludes>
+          <forkMode>always</forkMode>
+          <workingDirectory>target/test-output</workingDirectory>
+        </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings 
+          only. It has no influence on the Maven build itself. -->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>
+                      org.apache.maven.plugins
+                    </groupId>
+                    <artifactId>
+                      maven-dependency-plugin
+                    </artifactId>
+                    <versionRange>
+                      [2.8,)
+                    </versionRange>
+                    <goals>
+                      <goal>copy</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>
+                      org.codehaus.mojo
+                    </groupId>
+                    <artifactId>
+                      native2ascii-maven-plugin
+                    </artifactId>
+                    <versionRange>
+                      [1.0-beta-1,)
+                    </versionRange>
+                    <goals>
+                      <goal>native2ascii</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>
+                      org.apache.maven.plugins
+                    </groupId>
+                    <artifactId>
+                      maven-remote-resources-plugin
+                    </artifactId>
+                    <versionRange>
+                      [1.5,)
+                    </versionRange>
+                    <goals>
+                      <goal>process</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-pull-agent</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-agents</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-ui-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>${commons-lang.version}</version>
+      <type>jar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>15.0</version>
+    </dependency>
+    
+    <!-- Testing dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.tomakehurst</groupId>
+      <artifactId>wiremock</artifactId>
+      <version>${wiremock.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.16</version>
+      <scope>provided</scope>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.json-simple</groupId>
+      <artifactId>json-simple</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.8</version>
+    </dependency>
+  </dependencies>
 
 </project>


Reply via email to