Permalink
Browse files

Removed sd-dss submodule. Ant build does not build sd-dss separately.

  • Loading branch information...
rvillido committed Aug 25, 2015
1 parent 7d2df4b commit 2b5183eb0768a783c1cf44d79f2b98aaf4f2ca32
Showing with 21 additions and 43 deletions.
  1. +19 −17 .classpath
  2. +0 −4 .gitmodules
  3. +2 −13 build.xml
  4. +0 −1 digidoc4j.iml
  5. +0 −7 jenkins_build.xml
  6. +0 −1 sd-dss
View
@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=digidoc4j_development_codeborne&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry kind="lib" path="lib/dss-common-4.4.RC2.jar"/>
<classpathentry kind="lib" path="lib/dss-document-4.4.RC2.jar" sourcepath="/dss-document"/>
<classpathentry kind="lib" path="lib/dss-service-4.4.RC2.jar"/>
<classpathentry kind="lib" path="lib/dss-spi-4.4.RC2.jar"/>
<classpathentry kind="lib" path="lib/jacocoagent.jar"/>
<classpathentry kind="lib" path="lib/jacocoant.jar"/>
<classpathentry kind="lib" path="lib/jdigidoc-3.10.0-777.jar"/>
<classpathentry kind="lib" path="lib/testcerts.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=digidoc4j_development_codeborne&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry kind="lib" path="lib/dss-common-4.4.RC2.jar"/>
<classpathentry kind="lib" path="lib/dss-document-4.4.RC2.jar" sourcepath="/dss-document"/>
<classpathentry kind="lib" path="lib/dss-service-4.4.RC2.jar"/>
<classpathentry kind="lib" path="lib/dss-spi-4.4.RC2.jar"/>
<classpathentry kind="lib" path="lib/jacocoagent.jar"/>
<classpathentry kind="lib" path="lib/jacocoant.jar"/>
<classpathentry kind="lib" path="lib/jdigidoc-3.10.0-777.jar"/>
<classpathentry kind="lib" path="lib/testcerts.jar"/>
<classpathentry kind="lib" path="lib/dss-diagnostic-jaxb-4.4.RC2.jar"/>
<classpathentry kind="lib" path="lib/dss-tsl-jaxb-4.4.RC2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -1,4 +0,0 @@
[submodule "sd-dss"]
path = sd-dss
url = ../sd-dss.git
branch = publish
View
@@ -137,22 +137,11 @@
<jar destfile="${dist.dir}/digidoc4j-sources-${lib.version}${version.suffix}.jar" basedir="src"/>
</target>
<target name="copy.dss.library">
<copy todir="lib">
<fileset dir="sd-dss/dss-common/target" includes="dss-common*.jar" excludes="*-sources.jar "/>
<fileset dir="sd-dss/dss-diagnostic-jaxb/target" includes="dss-diagnostic-jaxb*.jar" excludes="*-sources.jar "/>
<fileset dir="sd-dss/dss-document/target" includes="dss-document*.jar" excludes="*-sources.jar "/>
<fileset dir="sd-dss/dss-service/target" includes="dss-service*.jar" excludes="*-sources.jar "/>
<fileset dir="sd-dss/dss-spi/target" includes="dss-spi*.jar" excludes="*-sources.jar "/>
<fileset dir="sd-dss/dss-tsl-jaxb/target" includes="dss-tsl-jaxb*.jar" excludes="*-sources.jar "/>
</copy>
</target>
<target name="base" depends="version, clean, source, compile, utility, library"/>
<target name="make.utility" depends="version, clean, copy.dss.library, compile, utility"/>
<target name="make.utility" depends="version, clean, compile, utility"/>
<target name="all" depends="copy.dss.library, test, javadoc, coverage.report"/>
<target name="all" depends="test, javadoc, coverage.report"/>
<target name="test" depends="base">
<mkdir dir="${junit.dir}"/>
View
@@ -15,7 +15,6 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/sd-dss" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
View
@@ -17,13 +17,6 @@
<isset property="env.BUILD_NUMBER"/>
</condition>
<target name="sd-dss">
<exec executable="mvn" dir="sd-dss">
<arg line="clean"/>
<arg line="install"/>
</exec>
</target>
<target name="sign" depends="version">
<echo message="${dist.dir}/digidoc4j-${lib.version}${version.suffix}.jar"/>
<signjar jar="${dist.dir}/digidoc4j-${lib.version}${version.suffix}.jar" storetype="pkcs12"
1 sd-dss
Submodule sd-dss deleted from 1a2e61

0 comments on commit 2b5183e

Please sign in to comment.