fix: update properties

jeremylong · Nov 4, 2023 · 58d64b6 · 58d64b6
1 parent 174835a
commit 58d64b6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 70 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -389,18 +389,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
                             <systemPropertyVariables>
-                                <property>
-                                    <name>data.driver_path</name>
-                                    <value>${driver_path}</value>
-                                </property>
-                                <property>
-                                    <name>data.driver_name</name>
-                                    <value>${driver_name}</value>
-                                </property>
-                                <property>
-                                    <name>data.connection_string</name>
-                                    <value>${connection_string}</value>
-                                </property>
+                                <data.driver_path>${driver_path}</data.driver_path>
+                                <data.driver_name>${driver_name}</data.driver_name>
+                                <data.connection_string>${connection_string}</data.connection_string>
                             </systemPropertyVariables>
                             <includes>
                                 <include>**/*MySqlIT.java</include>
@@ -439,18 +430,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
                             <systemPropertyVariables>
-                                <property>
-                                    <name>data.driver_path</name>
-                                    <value>${driver_path}</value>
-                                </property>
-                                <property>
-                                    <name>data.driver_name</name>
-                                    <value>${driver_name}</value>
-                                </property>
-                                <property>
-                                    <name>data.connection_string</name>
-                                    <value>${connection_string}</value>
-                                </property>
+                                <data.driver_path>${driver_path}</data.driver_path>
+                                <data.driver_name>${driver_name}</data.driver_name>
+                                <data.connection_string>${connection_string}</data.connection_string>
                             </systemPropertyVariables>
                             <includes>
                                 <include>**/*MySqlIT.java</include>

diff --git a/pom.xml b/pom.xml
@@ -657,26 +657,9 @@ Copyright (c) 2012 - Jeremy Long
                 <configuration>
                     <argLine>@{surefireArgLine} -Dfile.encoding=UTF-8 -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar</argLine>
                     <systemPropertyVariables>
-                        <property>
-                            <name>data.directory</name>
-                            <value>${project.build.directory}/data</value>
-                        </property>
-                        <property>
-                            <name>temp.directory</name>
-                            <value>${project.build.directory}/temp</value>
-                        </property>
-                        <property>
-                            <name>analyzer.assembly.dotnet.path</name>
-                            <value>${odc.dotnet.path}</value>
-                        </property>
-                        <property>
-                            <name>cve.url.base</name>
-                            <value>${odc.cve.url.base}</value>
-                        </property>
-                        <property>
-                            <name>cve.url.modified</name>
-                            <value>${odc.cve.url.modified}</value>
-                        </property>
+                        <data.directory>${project.build.directory}/data</data.directory>
+                        <temp.directory>${project.build.directory}/temp</temp.directory>
+                        <analyzer.assembly.dotnet.path>${odc.dotnet.path}</analyzer.assembly.dotnet.path>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -686,26 +669,9 @@ Copyright (c) 2012 - Jeremy Long
                 <configuration>
                     <argLine>@{failsafeArgLine} -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar</argLine>
                     <systemPropertyVariables>
-                        <property>
-                            <name>data.directory</name>
-                            <value>${project.build.directory}/data</value>
-                        </property>
-                        <property>
-                            <name>temp.directory</name>
-                            <value>${project.build.directory}/temp</value>
-                        </property>
-                        <property>
-                            <name>analyzer.assembly.dotnet.path</name>
-                            <value>${odc.dotnet.path}</value>
-                        </property>
-                        <property>
-                            <name>cve.url.base</name>
-                            <value>${odc.cve.url.base}</value>
-                        </property>
-                        <property>
-                            <name>cve.url.modified</name>
-                            <value>${odc.cve.url.modified}</value>
-                        </property>
+                        <data.directory>${project.build.directory}/data</data.directory>
+                        <temp.directory>${project.build.directory}/temp</temp.directory>
+                        <analyzer.assembly.dotnet.path>${odc.dotnet.path}</analyzer.assembly.dotnet.path>
                     </systemPropertyVariables>
                     <excludes>
                         <exclude>**/*MySqlIT.java</exclude>

diff --git a/settings.xml b/settings.xml
@@ -13,12 +13,7 @@
         <profile>
             <id>default</id>
             <properties>
-                <!-- 
-                The following are used during testing - when testing locally some developers have a local mirror. 
-                However, as travis-ci does not have a local mirror we need to set the original values.
-                -->
-                <odc.cve.url.base>https://nvd.nist.gov/feeds/json/cve/1.1/nvdcve-1.1-%d.json.gz</odc.cve.url.base>
-                <odc.cve.url.modified>https://nvd.nist.gov/feeds/json/cve/1.1/nvdcve-1.1-modified.json.gz</odc.cve.url.modified>
+
             </properties>
         </profile>
     </profiles>