Author: kwright
Date: Thu Jan 31 10:35:35 2013
New Revision: 1440900
URL: http://svn.apache.org/viewvc?rev=1440900&view=rev
Log:
Get mvn-bootstrap scripts working again as intended. Part of CONNECTORS-632.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/jcifs/build.xml
manifoldcf/trunk/connectors/jcifs/pom.xml
manifoldcf/trunk/mvn-bootstrap.bat
manifoldcf/trunk/mvn-bootstrap.sh
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1440900&r1=1440899&r2=1440900&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Jan 31 10:35:35 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.2-dev =====================
+CONNECTORS-632: Get mvn-bootstrap scripts working again as
+intended.
+(Maciej Li¿ewski, Karl Wright)
+
CONNECTORS-629: Revamp error handling in ElasticSearch connector.
(Andrew Clegg, Karl Wright)
Modified: manifoldcf/trunk/connectors/jcifs/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/build.xml?rev=1440900&r1=1440899&r2=1440900&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/build.xml (original)
+++ manifoldcf/trunk/connectors/jcifs/build.xml Thu Jan 31 10:35:35 2013
@@ -44,7 +44,13 @@
<target name="download-jcifs">
<property name="jcifs-version" value="1.3.17"/>
- <get src="http://jcifs.samba.org/src/jcifs-${jcifs-version}.jar";
dest="lib-proprietary/jcifs.jar"/>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="jcifs"/>
+ <param name="artifact-version" value="${jcifs-version}"/>
+ <param name="target" value="lib-proprietary"/>
+ <param name="artifact-name" value="jcifs"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-dependencies" depends="download-jcifs"/>
Modified: manifoldcf/trunk/connectors/jcifs/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/pom.xml?rev=1440900&r1=1440899&r2=1440900&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/pom.xml (original)
+++ manifoldcf/trunk/connectors/jcifs/pom.xml Thu Jan 31 10:35:35 2013
@@ -79,7 +79,7 @@
<!-- try installing manually from http://jcifs.samba.org if not available
in your repository -->
<dependency>
- <groupId>org.samba.jcifs</groupId>
+ <groupId>jcifs</groupId>
<artifactId>jcifs</artifactId>
<version>1.3.17</version>
</dependency>
Modified: manifoldcf/trunk/mvn-bootstrap.bat
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/mvn-bootstrap.bat?rev=1440900&r1=1440899&r2=1440900&view=diff
==============================================================================
--- manifoldcf/trunk/mvn-bootstrap.bat (original)
+++ manifoldcf/trunk/mvn-bootstrap.bat Thu Jan 31 10:35:35 2013
@@ -14,16 +14,9 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-cmd /c ant make-deps
-
-cmd /c mvn install:install-file -Dfile=lib/jdbcpool.jar
-DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
-
cmd /c mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces
-DartifactId=xercesImpl -Dversion=2.9.1-mcf-1 -Dpackaging=jar
-cmd /c mvn install:install-file
-Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs
-DartifactId=jcifs -Dversion=1.3.17 -Dpackaging=jar
cmd /c mvn install:install-file -Dfile=lib/opensaml.jar -DgroupId=org.opensaml
-DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
cmd /c mvn install:install-file -Dfile=lib/xmlsec.jar -DgroupId=xml-security
-DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
-cmd /c mvn install:install-file -Dfile=lib/hsqldb.jar -DgroupId=org.hsqldb
-DartifactId=hsqldb -Dversion=2.2.9 -Dpackaging=jar
-
echo Dependencies installed
Modified: manifoldcf/trunk/mvn-bootstrap.sh
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/mvn-bootstrap.sh?rev=1440900&r1=1440899&r2=1440900&view=diff
==============================================================================
--- manifoldcf/trunk/mvn-bootstrap.sh (original)
+++ manifoldcf/trunk/mvn-bootstrap.sh Thu Jan 31 10:35:35 2013
@@ -21,16 +21,9 @@
# Created: Wednesday, September 21 2011 by Alex Ott
#
-ant make-deps
-
-mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic
-DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
-
mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces
-DartifactId=xercesImpl -Dversion=2.9.1-mcf-1 -Dpackaging=jar
-mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar
-DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17 -Dpackaging=jar
mvn install:install-file -Dfile=lib/opensaml.jar -DgroupId=org.opensaml
-DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
mvn install:install-file -Dfile=lib/xmlsec.jar -DgroupId=xml-security
-DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
-mvn install:install-file -Dfile=lib/hsqldb.jar -DgroupId=org.hsqldb
-DartifactId=hsqldb -Dversion=2.2.9 -Dpackaging=jar
-
echo "Dependencies installed"
