1105 remove unnecessary defaultmavensettingsxml (#1110)

Xyna-Factory · Sep 4, 2024 · a9154d6 · a9154d6
1 parent d2a1502
commit a9154d6
Show file tree

Hide file tree

Showing 35 changed files with 2 additions and 124 deletions.
diff --git a/clusterproviders/OracleRACClusterProvider/build.xml b/clusterproviders/OracleRACClusterProvider/build.xml
@@ -57,7 +57,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/clusterproviders/XSORClusterProvider/build.xml b/clusterproviders/XSORClusterProvider/build.xml
@@ -97,7 +97,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/components/xact/NetworkAvailability/build.xml b/components/xact/NetworkAvailability/build.xml
@@ -50,7 +50,6 @@
   <target name="resolve">
     <resolver:resolve>
       <resolver:dependencies pomRef="pom"/>
-      <resolver:remoterepos refid="xyna.repository"/>
       <resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
     </resolver:resolve>
     <loadLicenses targetDir="${target.dir}/lib" />

diff --git a/components/xdnc/dhcpv6/scripts/DHCPv6Database/build.xml b/components/xdnc/dhcpv6/scripts/DHCPv6Database/build.xml
@@ -80,7 +80,6 @@
   <target name="resolve">
     <resolver:resolve>
       <resolver:dependencies pomRef="pom"/>
-      <resolver:remoterepos refid="xyna.repository"/>
       <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
     </resolver:resolve>
     <loadLicenses targetDir="${basedir}/lib" />

diff --git a/components/xnwh/pools/DefaultConnectionPoolTypes/build.xml b/components/xnwh/pools/DefaultConnectionPoolTypes/build.xml
@@ -47,7 +47,6 @@
 	<target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
 	  <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
 	  <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/components/xnwh/pools/MockConnectionPoolTypes/build.xml b/components/xnwh/pools/MockConnectionPoolTypes/build.xml
@@ -47,7 +47,6 @@
     <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
       <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
         </resolver:resolve>
         <loadLicenses targetDir="${basedir}/lib" />

diff --git a/components/xnwh/xcs/XynaClusterPersistenceLayer/build.xml b/components/xnwh/xcs/XynaClusterPersistenceLayer/build.xml
@@ -105,7 +105,6 @@
     <target name="resolve">
         <resolver:resolve>
             <resolver:dependencies pomRef="pom"/>
-            <resolver:remoterepos refid="xyna.repository"/>
             <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
             <resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
         </resolver:resolve>

diff --git a/components/xnwh/xcs/coherence/build.xml b/components/xnwh/xcs/coherence/build.xml
@@ -41,7 +41,6 @@
     <target name="resolve">
         <resolver:resolve>
             <resolver:dependencies pomRef="pom"/>
-            <resolver:remoterepos refid="xyna.repository"/>
             <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
         </resolver:resolve>
         <loadLicenses targetDir="${basedir}/lib/xyna" />

diff --git a/components/xnwh/xcs/xsor/build.xml b/components/xnwh/xcs/xsor/build.xml
@@ -45,7 +45,6 @@
     <target name="resolve">
         <resolver:resolve>
             <resolver:dependencies pomRef="pom"/>
-            <resolver:remoterepos refid="xyna.repository"/>
             <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
             <resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
         </resolver:resolve>

diff --git a/datamodeltypes/MIB/build.xml b/datamodeltypes/MIB/build.xml
@@ -49,7 +49,6 @@
     <target name="resolve">
         <resolver:resolve>
             <resolver:dependencies pomRef="pom"/>
-            <resolver:remoterepos refid="xyna.repository"/>
             <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
             <resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
         </resolver:resolve>

diff --git a/datamodeltypes/TR069/build.xml b/datamodeltypes/TR069/build.xml
@@ -49,7 +49,6 @@
     <target name="resolve">
         <resolver:resolve>
             <resolver:dependencies pomRef="pom"/>
-            <resolver:remoterepos refid="xyna.repository"/>
             <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
         </resolver:resolve>
         <loadLicenses targetDir="${basedir}/lib" />

diff --git a/datamodeltypes/XSD/build.xml b/datamodeltypes/XSD/build.xml
@@ -55,7 +55,6 @@
     <target name="resolve">
         <resolver:resolve>
             <resolver:dependencies pomRef="pom"/>
-            <resolver:remoterepos refid="xyna.repository"/>
             <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
             <resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
         </resolver:resolve>

diff --git a/installation/build.sh b/installation/build.sh
@@ -591,8 +591,6 @@ compose_modeller() {
 prepare_build() {
   mkdir -p /opt/common
   cd $SCRIPT_DIR/build
-  sed -i "s#<url>file:\/\/.*<\/url>#<url>file://$HOME/.m2/repository<\/url>#" $SCRIPT_DIR/build/defaultMavenSettings.xml #TODO: allow config
-  sed -i "s#<localRepository>.*</localRepository>#<localRepository>//$HOME/.m2/repository</localRepository>#" $SCRIPT_DIR/build/defaultMavenSettings.xml
   mvn install
 }
 

diff --git a/installation/build/ant-xyna.xml b/installation/build/ant-xyna.xml
@@ -233,19 +233,6 @@
     </classpath>
   </taskdef>
 
-  <condition property="mavenSettingFile" value="${user.home}/mavenSettings.xml" else="${ant.file.ant-xyna.dir}/defaultMavenSettings.xml">
-    <available file="${user.home}/mavenSettings.xml" />
-  </condition>
-
-  <resolver:settings file="${mavenSettingFile}"/>
-
-  <!-- TODO switch on current os-family and only contain one? -->
-  <resolver:remoterepos id="xyna.repository">
-    <remoterepo refid="xyna.repository.win"/>
-    <remoterepo refid="xyna.repository.unix"/>
-    <remoterepo refid="central.maven.repository"/>
-  </resolver:remoterepos>
-
   <!-- macro for downloading license files -->
   <macrodef name="loadLicenses">
     <attribute name="targetDir"/>
@@ -256,8 +243,6 @@
         <arg value="mvn"/>
         <arg value="-f" />
         <arg value="@{pom}" />
-        <arg value="-s" />
-        <arg value="@{mavenSettingFile}" />
         <arg value="license:download-licenses" />
         <arg value="-DlicensesOutputDirectory=@{targetDir}" />
         <arg value="-DlicensesOutputFile=@{targetDir}\licenses.xml" />
@@ -267,8 +252,6 @@
       <exec osfamily="unix" executable="mvn" outputproperty="exec.output">
         <arg value="-f" />
         <arg value="@{pom}" />
-        <arg value="-s" />
-        <arg value="${mavenSettingFile}" />
         <arg value="license:download-licenses" />
         <arg value="-DlicensesOutputDirectory=@{targetDir}" />
         <arg value="-DlicensesOutputFile=@{targetDir}/licenses.xml" />
@@ -286,15 +269,11 @@
         <arg value="mvn"/>
         <arg value="-f" />
         <arg value="@{pom}" />
-        <arg value="-s" />
-        <arg value="${mavenSettingFile}" />
         <arg value="install" />
       </exec>
       <exec osfamily="unix" executable="mvn" outputproperty="exec.output">
         <arg value="-f" />
         <arg value="@{pom}" />
-        <arg value="-s" />
-        <arg value="${mavenSettingFile}" />
         <arg value="install" />
       </exec>
       <echo message="${exec.output}" />

diff --git a/installation/build/buildCommonLib.xml b/installation/build/buildCommonLib.xml
@@ -152,7 +152,6 @@
         </if>
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${base.lib.dir}/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <resolver:files refid="files" dir="${base.lib.dir}" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
         </resolver:resolve>

diff --git a/installation/build/buildFilter.xml b/installation/build/buildFilter.xml
@@ -87,7 +87,6 @@
         </if>
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${base.lib.dir}/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <resolver:files refid="files" dir="${base.lib.dir}" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
         </resolver:resolve>

diff --git a/installation/build/buildService.xml b/installation/build/buildService.xml
@@ -92,7 +92,6 @@
 
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${base.lib.dir}/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <resolver:files refid="files" dir="${base.lib.dir}" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
         </resolver:resolve>

diff --git a/installation/build/buildSharedLib.xml b/installation/build/buildSharedLib.xml
@@ -149,7 +149,6 @@
         </if>
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${base.lib.dir}/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <resolver:files refid="files" dir="${base.lib.dir}" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
         </resolver:resolve>

diff --git a/installation/build/buildTrigger.xml b/installation/build/buildTrigger.xml
@@ -104,7 +104,6 @@
         </if>
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${base.lib.dir}/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <resolver:files refid="files" dir="${base.lib.dir}" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
         </resolver:resolve>

diff --git a/installation/build/defaultMavenSettings.xml b/installation/build/defaultMavenSettings.xml
diff --git a/installation/build/lib/build.xml b/installation/build/lib/build.xml
@@ -28,7 +28,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/factory" layout="{artifactId}-{classifier}-{version}.{extension}"/>
         </resolver:resolve>
       </target>

diff --git a/misc/build.xml b/misc/build.xml
@@ -44,7 +44,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/modules/xact/http/common/build.xml b/modules/xact/http/common/build.xml
@@ -70,7 +70,6 @@
     <target name="resolve">
         <resolver:resolve>
             <resolver:dependencies pomRef="pom"/>
-            <resolver:remoterepos refid="xyna.repository"/>
             <resolver:files refid="files" dir="${lib.dir}/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
         </resolver:resolve>
         <loadLicenses targetDir="${lib.dir}" />

diff --git a/orderinputsources/ConstantInputSource/build.xml b/orderinputsources/ConstantInputSource/build.xml
@@ -54,7 +54,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/orderinputsources/WorkflowInputSource/build.xml b/orderinputsources/WorkflowInputSource/build.xml
@@ -54,7 +54,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/orderinputsources/XTFInputSource/build.xml b/orderinputsources/XTFInputSource/build.xml
@@ -54,7 +54,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/persistencelayers/MySQLPersistenceLayer/build.xml b/persistencelayers/MySQLPersistenceLayer/build.xml
@@ -45,7 +45,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/persistencelayers/OraclePersistenceLayer/build.xml b/persistencelayers/OraclePersistenceLayer/build.xml
@@ -44,7 +44,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/persistencelayers/XynaDevNullPersistenceLayer/build.xml b/persistencelayers/XynaDevNullPersistenceLayer/build.xml
@@ -42,7 +42,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/persistencelayers/XynaJavaSerializationPersistenceLayer/build.xml b/persistencelayers/XynaJavaSerializationPersistenceLayer/build.xml
@@ -43,7 +43,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/persistencelayers/XynaLocalMemoryPersistenceLayer/build.xml b/persistencelayers/XynaLocalMemoryPersistenceLayer/build.xml
@@ -54,7 +54,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/persistencelayers/XynaMemoryPersistenceLayer/build.xml b/persistencelayers/XynaMemoryPersistenceLayer/build.xml
@@ -86,7 +86,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <resolver:files refid="files" dir="${basedir}/lib.test" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="test"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->

diff --git a/persistencelayers/XynaXMLShellPersistenceLayer/build.xml b/persistencelayers/XynaXMLShellPersistenceLayer/build.xml
@@ -43,7 +43,6 @@
       <target name="resolve">
         <resolver:resolve>
           <resolver:dependencies pomRef="pom"/>
-          <resolver:remoterepos refid="xyna.repository"/>
           <resolver:files refid="files" dir="${basedir}/lib/xyna" layout="{artifactId}-{classifier}-{version}.{extension}"/>
           <!--resolver:files refid="files" dir="${basedir}/lib" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/-->
         </resolver:resolve>

diff --git a/server/build.xml b/server/build.xml
@@ -39,8 +39,7 @@
 
   <target name="resolve">
     <resolver:resolve>
-        <resolver:dependencies pomRef="pom"/>
-      <resolver:remoterepos refid="xyna.repository"/>
+      <resolver:dependencies pomRef="pom"/>
       <resolver:files refid="files" dir="${target.dir}" layout="{artifactId}-{classifier}-{version}.{extension}" /> <!--scopes="compile"-->
       <resolver:files refid="internalFiles" dir="${target.dir}/internal_xyna" layout="{artifactId}-{classifier}-{version}.{extension}" scopes="runtime"/>
     </resolver:resolve>