From 0f45555436e44026a472b513b42584b6c1c60ef6 Mon Sep 17 00:00:00 2001 From: xtof Date: Sun, 29 Mar 2020 22:41:17 +0200 Subject: [PATCH 1/8] Appply refactoring sound modem --- .../amicalsat/cli/AmicalsatCli.java | 34 ++++++------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java b/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java index d376f39..7df2cb7 100644 --- a/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java +++ b/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java @@ -1,8 +1,5 @@ package org.josast.application.amicalsat.cli; -import java.util.Arrays; -import java.util.logging.Logger; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; @@ -10,11 +7,9 @@ import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.josast.ModuleSoundModem.KissException; import org.josast.ModuleSoundModem.SoundModemCli; import org.josast.ModuleSoundModem.SoundModemClient; import org.josast.ModuleSoundModem.SoundModemConfiguration; -import org.josast.ModuleSoundModem.kiss; import org.josast.amicalsat.Frame; import org.josast.amicalsat.FrameFactory; import org.josast.amicalsat.FrameTlmAmicalsat; @@ -22,16 +17,16 @@ import org.josast.amicalsat.FrameTlmAmicalsat; import io.kaitai.struct.ByteBufferKaitaiStream; public class AmicalsatCli { - private Logger log = Logger.getLogger(getClass().getName()); + // private Logger log = Logger.getLogger(getClass().getName()); + private String version = "0.2"; private String configurationfile = "defaultConfigFile.ini"; /* - * Utilisation d'un répertoire par défaut + * Utilisation d'un répertoire par défaut */ private String generateRepository = "DataReceived"; - - - byte[] cbuf = new byte[1000]; + + public String getVersion() { return version; @@ -56,7 +51,7 @@ public class AmicalsatCli { public AmicalsatCli() { // TODO Auto-generated constructor stub } - + private static Options configParameters() { final Option versionOption = Option.builder("V") @@ -121,24 +116,17 @@ public class AmicalsatCli { } - public void execute() { FrameFactory ff = new FrameFactory(); SoundModemConfiguration smconf = new SoundModemConfiguration(configurationfile); SoundModemClient sm = new SoundModemClient(smconf); while (true) { - int nb = sm.receiveData(cbuf); - sm.decode(cbuf, nb); - kiss k = new kiss(Arrays.copyOf(cbuf, nb)); - FrameTlmAmicalsat cube = null; - try { - cube = new FrameTlmAmicalsat(new ByteBufferKaitaiStream(k.toRaw())); - } catch (KissException e) { - log.severe(e.toString()); + byte[] temp = sm.receivedRawData(); + + FrameTlmAmicalsat cube = new FrameTlmAmicalsat(new ByteBufferKaitaiStream(temp)); - } System.out.print( "Source : " + cube.frameTlmEntrySat().ax25Header().srcCallsignRaw().srcCallsignRor().srcCallsign()); System.out.print("destination : " @@ -158,17 +146,15 @@ public class AmicalsatCli { } public static void main(String[] args) throws ParseException { - + final Options options = configParameters(); final CommandLineParser parser = new DefaultParser(); final CommandLine line = parser.parse(options, args); - AmicalsatCli cli = new AmicalsatCli(); - boolean helpMode = line.hasOption("help"); if (helpMode) { -- GitLab From 5de7b0d3eff9b5c41d7af7860bd1a5b22243a19e Mon Sep 17 00:00:00 2001 From: xtof Date: Sun, 29 Mar 2020 22:47:10 +0200 Subject: [PATCH 2/8] Apply Soundmodem refactoring --- .../CubesatSim/TLM/SoundmodemToInfluxDB.java | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/SoundmodemToInfluxDB.java b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/SoundmodemToInfluxDB.java index 1d5edc1..59b0eba 100644 --- a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/SoundmodemToInfluxDB.java +++ b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/SoundmodemToInfluxDB.java @@ -10,13 +10,10 @@ import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.josast.AX25.KissData; -import org.josast.AX25.KissFrame; import org.josast.CubesatSim.influxDB.DataCubesatSim; import org.josast.CubesatSim.influxDB.InfluxDBInstance; import org.josast.CubesatSim.influxDB.InfluxDatabaseConfig; import org.josast.ModuleSoundModem.SoundModemClient; -import org.josast.ModuleSoundModem.SoundModemConfiguration; import org.josast.kaitai.generated.Cubesatsim; import org.josast.kaitai.generated.Cubesatsim.CubesatsimAo7; import org.josast.kaitai.generated.Cubesatsim.CubesatsimData; @@ -29,16 +26,15 @@ import io.kaitai.struct.ByteBufferKaitaiStream; */ public class SoundmodemToInfluxDB { - private static String version = "1.0"; + private static String version = "1.1"; private static String configurationfile = "config.ini"; - + /** * */ public SoundmodemToInfluxDB() { - // TODO Auto-generated constructor stub + } - private static Options configParameters() { @@ -87,31 +83,27 @@ public class SoundmodemToInfluxDB { return options; } - + /** - * @param configurationfile + * @param configurationfile * @param args */ public void execute(String configurationfile) { - byte[] cbuf = new byte[1000]; // connection to Sound Modem InfluxDBInstance database = InfluxDBInstance.getInstance(); InfluxDatabaseConfig config = new InfluxDatabaseConfig(configurationfile); - + database.conect(config.getAdresse(), config.getLogin(), config.getPassword()); database.createDataBase("CubesatSim"); - - SoundModemConfiguration smconf = new SoundModemConfiguration (configurationfile); - SoundModemClient sm = new SoundModemClient(smconf); - + + SoundModemClient sm = new SoundModemClient(configurationfile); + // waiting data while (true) { - int nb = sm.receiveData(cbuf); - KissFrame kf = new KissFrame(); - KissData kissData = kf.extactMessage(cbuf, nb); + byte[] temp = sm.receivedRawData(); + Cubesatsim cube = new Cubesatsim(new ByteBufferKaitaiStream(temp)); - Cubesatsim cube = new Cubesatsim(new ByteBufferKaitaiStream(kissData.getData())); System.out.println(cube.ax25Header().srcAddress().srcAddressStr()); System.out.println(cube.ax25Header().destAddress().destAddressStr()); System.out.println(cube.ax25Header().ctrl()); @@ -183,8 +175,4 @@ public class SoundmodemToInfluxDB { smd.execute(configurationfile); } - - - - } -- GitLab From 942c77c2eaa94f239156af4e1be0672182f8e5fc Mon Sep 17 00:00:00 2001 From: xtof Date: Sun, 29 Mar 2020 22:50:56 +0200 Subject: [PATCH 3/8] minor remove unused import --- .../src/test/java/org/josast/equationKepler/KeplerTest.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java b/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java index 48bbc44..e767155 100644 --- a/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java +++ b/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java @@ -3,10 +3,6 @@ */ package org.josast.equationKepler; -import org.josast.equationKepler.Kepler; -import org.josast.equationKepler.KeplerFixPpoint; -import org.josast.equationKepler.KeplerNewton; - import junit.framework.Assert; import junit.framework.TestCase; -- GitLab From db9505209fd16543793af5048f92c6200e962ba1 Mon Sep 17 00:00:00 2001 From: xtof Date: Sun, 29 Mar 2020 22:53:31 +0200 Subject: [PATCH 4/8] Applique impact refactoring sound modem --- .../josast/application/amicalsat/cli/AmicalsatCli.java | 4 ++-- ModuleSoundModem/pom.xml | 8 +++++++- .../org/josast/ModuleSoundModem/SoundModemClient.java | 10 ++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java b/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java index 7df2cb7..98f1f4b 100644 --- a/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java +++ b/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java @@ -118,8 +118,8 @@ public class AmicalsatCli { public void execute() { FrameFactory ff = new FrameFactory(); - SoundModemConfiguration smconf = new SoundModemConfiguration(configurationfile); - SoundModemClient sm = new SoundModemClient(smconf); + + SoundModemClient sm = new SoundModemClient(configurationfile); while (true) { diff --git a/ModuleSoundModem/pom.xml b/ModuleSoundModem/pom.xml index 7bb0b40..164a1aa 100644 --- a/ModuleSoundModem/pom.xml +++ b/ModuleSoundModem/pom.xml @@ -40,7 +40,13 @@ commons-cli 1.4 - + +org.junit.jupiter + junit-jupiter-engine + 5.5.2 + test + + diff --git a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java index 66330cd..8b56c52 100644 --- a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java +++ b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java @@ -142,6 +142,16 @@ public class SoundModemClient { public boolean isOpen() { return open; } + public byte[] receivedRawData() { + byte[] temp = receivedKissData(); + kiss k = new kiss(temp); + try { + temp = k.toRaw(); + } catch (KissException e) { + log.log(Level.SEVERE, "Extract Raw data " + e.toString()); + } + return temp; + } -- GitLab From ca93afa53f8cefe110359a36c5805db540bc769c Mon Sep 17 00:00:00 2001 From: xtophe Date: Sun, 29 Mar 2020 23:29:41 +0200 Subject: [PATCH 5/8] bug correction --- .../src/main/java/org/josast/ModuleSoundModem/kiss.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java index eba3658..3f46182 100644 --- a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java +++ b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java @@ -43,13 +43,13 @@ public class kiss { rawData[cptraw++] = kissdata[i++]; } else { if (kissdata[i + 1] == TFEND) { - System.out.println("TFEND"); + rawData[cptraw++] = FEND; - i = i + 1; + i = i + 2; } else if (kissdata[i + 1] == TFESC) { - System.out.println("TFESC"); + rawData[cptraw++] = FESC; - i = i + 1; + i = i +2; } else { rawData[cptraw++] = kissdata[i++]; } -- GitLab From 7fa385f46585ebacd41b1ac802fe8be7fc99feff Mon Sep 17 00:00:00 2001 From: xtophe Date: Sun, 29 Mar 2020 23:30:09 +0200 Subject: [PATCH 6/8] add unit test --- .../org/josast/ModuleSoundModem/kissTest.java | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java diff --git a/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java b/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java new file mode 100644 index 0000000..2514392 --- /dev/null +++ b/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java @@ -0,0 +1,88 @@ +package org.josast.ModuleSoundModem; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class kissTest { + + @BeforeAll + static void setUpBeforeClass() throws Exception { + } + + @AfterAll + static void tearDownAfterClass() throws Exception { + } + + @BeforeEach + void setUp() throws Exception { + } + + @AfterEach + void tearDown() throws Exception { + } + + @Test + void testToRaw() { + byte [] temp = new byte [] { (byte)0xc0, 0x4f, (byte)0xd0, + 0x20, (byte)0xea, 0x3a, 0x69, 0x10, (byte)0xa2, (byte)0xd8, 0x08, 0x00, 0x2b, + 0x30, 0x30, (byte)0xc0}; + byte [] out = new byte [] { 0x4f, (byte)0xd0, + 0x20, (byte)0xea, 0x3a, 0x69, 0x10, (byte)0xa2, (byte)0xd8, 0x08, 0x00, 0x2b, + 0x30, 0x30, }; + kiss k = new kiss(temp); + try { + byte [] res = k.toRaw(); + assertArrayEquals(res,out); + + } catch (KissException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + @Test + void testToRawFEND() { + byte [] temp = new byte [] { (byte)0xc0, 0x4f, (byte)0xd0, + 0x20, (byte)0xea, 0x3a, 0x69,(byte) 0xDB, (byte)0xDC, (byte)0xd8, 0x08, 0x00, 0x2b, + 0x30, 0x30, (byte)0xc0}; + byte [] out = new byte [] { 0x4f, (byte)0xd0, + 0x20, (byte)0xea, 0x3a, 0x69,(byte) 0xC0, (byte)0xd8, 0x08, 0x00, 0x2b, + 0x30, 0x30, }; + kiss k = new kiss(temp); + try { + byte [] res = k.toRaw(); + assertArrayEquals(res,out); + + } catch (KissException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + + } + @Test + void testToRawFESC() { + byte [] temp = new byte [] { (byte)0xc0, 0x4f, (byte)0xd0, + 0x20, (byte)0xea, 0x3a, 0x69,(byte) 0xDB, (byte)0xDD, (byte)0xd8, 0x08, 0x00, 0x2b, + (byte) 0xDB, (byte)0xDD, (byte)0xc0}; + byte [] out = new byte [] { 0x4f, (byte)0xd0, + 0x20, (byte)0xea, 0x3a, 0x69,(byte) 0xDB, (byte)0xd8, 0x08, 0x00, 0x2b, + (byte) 0xDB, }; + kiss k = new kiss(temp); + try { + byte [] res = k.toRaw(); + assertArrayEquals(res,out); + + } catch (KissException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + + } + +} -- GitLab From 5f80488d4dd7686d62b355e49c784f7325d1ce21 Mon Sep 17 00:00:00 2001 From: xtophe Date: Sun, 29 Mar 2020 23:31:37 +0200 Subject: [PATCH 7/8] update --- .../amicalsat/cli/AmicalsatCli.java | 1 - ApplicationEntrySatDecoder/pom.xml | 7 +- ModuleEntrySatTelemetry/pom.xml | 7 +- .../org/josast/util/date/GenericDateTest.java | 2 - .../org/josast/util/date/JulianDayTest.java | 4 +- ModuleSIDS/pom.xml | 2 +- pom.xml | 1380 ++++++++++++----- 7 files changed, 1021 insertions(+), 382 deletions(-) diff --git a/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java b/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java index 98f1f4b..53fceea 100644 --- a/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java +++ b/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java @@ -9,7 +9,6 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.josast.ModuleSoundModem.SoundModemCli; import org.josast.ModuleSoundModem.SoundModemClient; -import org.josast.ModuleSoundModem.SoundModemConfiguration; import org.josast.amicalsat.Frame; import org.josast.amicalsat.FrameFactory; import org.josast.amicalsat.FrameTlmAmicalsat; diff --git a/ApplicationEntrySatDecoder/pom.xml b/ApplicationEntrySatDecoder/pom.xml index 5e96d24..2b0b453 100644 --- a/ApplicationEntrySatDecoder/pom.xml +++ b/ApplicationEntrySatDecoder/pom.xml @@ -7,13 +7,12 @@ org.josast - JOSAST-parent - 0.0.1-SNAPSHOT + JOSAST-parent + 0.0.2-SNAPSHOT - org.josast + ApplicationEntrySatDecoder - 0.0.1-SNAPSHOT ApplicationEntrySatDecoder http://www.amsat-f.org diff --git a/ModuleEntrySatTelemetry/pom.xml b/ModuleEntrySatTelemetry/pom.xml index 6226219..0d401ef 100644 --- a/ModuleEntrySatTelemetry/pom.xml +++ b/ModuleEntrySatTelemetry/pom.xml @@ -5,17 +5,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - + org.josast JOSAST-parent - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT 4.0.0 - org.josast - ModuleEntrySatTelemetry - 0.0.1-SNAPSHOT ModuleEntrySatTelemetry diff --git a/ModuleJourJulien/src/test/java/org/josast/util/date/GenericDateTest.java b/ModuleJourJulien/src/test/java/org/josast/util/date/GenericDateTest.java index 5e2795f..2667bee 100644 --- a/ModuleJourJulien/src/test/java/org/josast/util/date/GenericDateTest.java +++ b/ModuleJourJulien/src/test/java/org/josast/util/date/GenericDateTest.java @@ -1,7 +1,5 @@ package org.josast.util.date; -import org.josast.util.date.GenericDate; - import junit.framework.TestCase; diff --git a/ModuleJourJulien/src/test/java/org/josast/util/date/JulianDayTest.java b/ModuleJourJulien/src/test/java/org/josast/util/date/JulianDayTest.java index e3aee24..a7af41c 100644 --- a/ModuleJourJulien/src/test/java/org/josast/util/date/JulianDayTest.java +++ b/ModuleJourJulien/src/test/java/org/josast/util/date/JulianDayTest.java @@ -5,8 +5,6 @@ import junit.framework.TestCase; import java.util.GregorianCalendar; -import org.josast.util.date.JulianDay; - /** * DOCUMENT ME! @@ -160,7 +158,7 @@ public class JulianDayTest extends TestCase { Assert.assertEquals(27183, JulianDay.diffdate(J2, J1), 0); // new test for bug ? - //Le problème rencontré est que lorsque j'essais de soustraire 1940-02-29 et 1940-01-01 j'ai comme résultat 57 alors que je m'attends à avoir 59. + //Le probl�me rencontr� est que lorsque j'essais de soustraire 1940-02-29 et 1940-01-01 j'ai comme r�sultat 57 alors que je m'attends � avoir 59. J1 = new GregorianCalendar(1940, GregorianCalendar.FEBRUARY, 29, 0, 0, 0); J2 = new GregorianCalendar(1940, GregorianCalendar.JANUARY, 1, 0, 0, 0); diff --git a/ModuleSIDS/pom.xml b/ModuleSIDS/pom.xml index a424825..53ee33e 100644 --- a/ModuleSIDS/pom.xml +++ b/ModuleSIDS/pom.xml @@ -1,4 +1,4 @@ -cd .. 4.0.0 diff --git a/pom.xml b/pom.xml index 4932a2b..1009af3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,372 +1,1020 @@ - - - 4.0.0 - - org.josast - JOSAST-parent - 0.0.2-SNAPSHOT - pom - josast Parent - https://code.electrolab.fr/xtof/josast - - - UTF-8 - - 1.8 - 1.8 - C:\Program Files\Java\jdk1.8.0_181\bin - - - 3.2.0 - 3.1.0 - 3.1.0 - 3.0.0 - 3.8.1 - 3.1.1 - 3.0.0-M1 - 3.0.5 - 3.1.1 - 3.12.0 - 2.5.3 - 3.8.2 - 2.3 - 3.2.0 - 3.0.0-M2 - 3.0.0-M2 - 3.0.0 - 2.7 - ${project.basedir}/code-analysis/checkstyle.xml - ${project.basedir}/../code-analysis/pmd.xml - false - false - false - false - - - - - junit - junit - 3.8.2 - test - - - - log4j - log4j - 1.2.17 - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${plugin.project-info-reports.version} - - - org.apache.maven.plugins - maven-pmd-plugin - ${plugin.pmd-plugin.version} - - - org.codehaus.mojo - findbugs-maven-plugin - ${plugin.findbugs-maven.version} - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${plugin.checkstyle.version} - - - - - - checkstyle - - - - - checkstyle-aggregate - false - - true - - - checkstyle-aggregate - - - - - - - org.codehaus.mojo - versions-maven-plugin - ${plugin.versions-maven.version} - - - - - - - - - - com.github.spotbugs - spotbugs-maven-plugin - - -Duser.language=en - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${plugin.project-info-reports.version} - - - - - org.apache.maven.plugins - maven-changelog-plugin - ${plugin.maven-changelog.version} - - - - org.apache.maven.plugins - maven-assembly-plugin - ${plugin.maven-assembly.version} - - - org.apache.maven.plugins - maven-resources-plugin - ${plugin.maven-resources.version} - - - UTF-8 - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - - org.apache.maven.plugins - maven-source-plugin - ${plugin.source.version} - - - org.apache.maven.plugins - maven-compiler-plugin - ${plugin.compiler.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - ${plugin.surefire.version} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${plugin.failsafe.version} - - - - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - ${plugin.pmd-plugin.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${plugin.javadoc.version} - - - org.codehaus.mojo - versions-maven-plugin - ${plugin.versions-maven.version} - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - ${plugin.findbugs-maven.version} - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - org.apache.maven.plugins - maven-release-plugin - ${plugin.release.version} - - - org.apache.maven.plugins - maven-dependency-plugin - ${plugin.dependency.version} - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.5 - - - - prepare-agent - - - - - report - test - - report - - - - - - org.apache.maven.plugins - maven-source-plugin - - true - - - - generate-sources - verify - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-site-plugin - ${plugin.site.version} - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${plugin.project-info-reports.version} - + + + + + 4.0.0 + + + org.josast + + + JOSAST-parent + + + 0.0.2-SNAPSHOT + + + pom + + + josast Parent + + + https://code.electrolab.fr/xtof/josast + + + + + + UTF-8 + + + 1.8 + + + 1.8 + + + C:\Program Files\Java\jdk1.8.0_181\bin + + + + + + 3.2.0 + + + 3.1.0 + + + 3.1.0 + + + 3.0.0 + + + 3.8.1 + + + 3.1.1 + + + 3.0.0-M1 + + + 3.0.5 + + + 3.1.1 + + + 3.12.0 + + + 2.5.3 + + + 3.8.2 + + + 2.3 + + + 3.2.0 + + + 3.0.0-M2 + + + 3.0.0-M2 + + + 3.0.0 + + + 2.7 + + + ${project.basedir}/code-analysis/checkstyle.xml + + + ${project.basedir}/../code-analysis/pmd.xml + + + false + + + false + + + false + + + false + + + + + + + + + + + + junit + + + junit + + + 3.8.2 + + + test + + + + + + + + + + + + log4j + + + log4j + + + 1.2.17 + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + + + maven-project-info-reports-plugin + + + ${plugin.project-info-reports.version} + + + + + + + + + org.apache.maven.plugins + + + maven-pmd-plugin + + + ${plugin.pmd-plugin.version} + + + + + + + + + org.codehaus.mojo + + + findbugs-maven-plugin + + + ${plugin.findbugs-maven.version} + + + + + + + + + org.apache.maven.plugins + + + maven-checkstyle-plugin + + + ${plugin.checkstyle.version} + + + + + + + + + + + + + + + checkstyle + + + + + + + + + + + + + + + checkstyle-aggregate + + + false + + + + + + true + + + + + + + + + checkstyle-aggregate + + + + + + + + + + + + + + + + + + org.codehaus.mojo + + + versions-maven-plugin + + + ${plugin.versions-maven.version} + + + + + + + + + + + + + + + + + + + + + + + + com.github.spotbugs + + + spotbugs-maven-plugin + + + + + -Duser.language=en + + + + + + + + + + + + org.apache.maven.plugins + + + maven-project-info-reports-plugin + + + + + + + + + + + + + + + org.apache.maven.plugins + + + maven-changelog-plugin + + + ${plugin.maven-changelog.version} + + + + + + + + + org.apache.maven.plugins + + + maven-assembly-plugin + + + ${plugin.maven-assembly.version} + + + + + + + + + org.apache.maven.plugins + + + maven-resources-plugin + + + ${plugin.maven-resources.version} + + + + + + UTF-8 + + + + + + + + + + + + + + + org.apache.maven.plugins + + + maven-jar-plugin + + + 3.2.0 + + + + + + + + + org.apache.maven.plugins + + + maven-source-plugin + + + ${plugin.source.version} + + + + + + + + + org.apache.maven.plugins + + + maven-compiler-plugin + + + ${plugin.compiler.version} + + + + + + + + + org.apache.maven.plugins + + + maven-surefire-plugin + + + ${plugin.surefire.version} + + + + + + + + + org.apache.maven.plugins + + + maven-failsafe-plugin + + + ${plugin.failsafe.version} + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + + + maven-pmd-plugin + + + ${plugin.pmd-plugin.version} + + + + + + + + + org.apache.maven.plugins + + + maven-javadoc-plugin + + + ${plugin.javadoc.version} + + + + + + + + + org.codehaus.mojo + + + versions-maven-plugin + + + ${plugin.versions-maven.version} + + + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo + + + findbugs-maven-plugin + + + ${plugin.findbugs-maven.version} + + + + + + + + + org.codehaus.mojo + + + taglist-maven-plugin + + + 2.4 + + + + + + + + + org.apache.maven.plugins + + + maven-release-plugin + + + ${plugin.release.version} + + + + + + + + + org.apache.maven.plugins + + + maven-dependency-plugin + + + ${plugin.dependency.version} + + + + + + + + + org.apache.maven.plugins + + + maven-deploy-plugin + + + ${plugin.deploy.version} + + + + + + + + + + + + + + + + + + org.jacoco + + + jacoco-maven-plugin + + + 0.8.5 + + + + + + + + + + + + prepare-agent + + + + + + + + + + + + + + + report + + + test + + + + + + report + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + + + maven-source-plugin + + + + + + true + + + + + + + + + + + + generate-sources + + + verify + + + + + + jar-no-fork + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + + + maven-site-plugin + + + ${plugin.site.version} + + + + + + + + + org.apache.maven.plugins + + + maven-project-info-reports-plugin + + + ${plugin.project-info-reports.version} + + + + - - org.apache.maven.plugins - maven-javadoc-plugin - - - false - ${javadocs.skip} - - - - org.apache.maven.plugins - maven-surefire-plugin - - + + + false + + + ${javadocs.skip} + + + + + + + + + + + + org.apache.maven.plugins + + + maven-surefire-plugin + + + + + + - alphabetical - false - ${surefire.jvm.args} - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - integration-test - - integration-test - - - - verify - - verify - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - ${pmd.skip} - ${maven.compiler.source} - ${project.build.sourceEncoding} - - - - /category/java/bestpractices.xml - - - false - - - - verify - - check - cpd-check - - - - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.26 - - 5 - foo - 9999 - - - - - - - - - + + + alphabetical + + + false + + + ${surefire.jvm.args} + + + + + + + + + + + + org.apache.maven.plugins + + + maven-failsafe-plugin + + + + + + + + + integration-test + + + + + + integration-test + + + + + + + + + + + + verify + + + + + + verify + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + + + maven-pmd-plugin + + + + + + ${pmd.skip} + + + ${maven.compiler.source} + + + ${project.build.sourceEncoding} + + + + + + + + + + + + /category/java/bestpractices.xml + + + + + + + + + false + + + + + + + + + + + + verify + + + + + + check + + + cpd-check + + + + + + + + + + + + + + + + + + org.mortbay.jetty + + + maven-jetty-plugin + + + 6.1.26 + + + + + + 5 + + + foo + + + 9999 + + + + + + + + + + + + + + + + + + ModuleAmicalsat + + + AplicationAmicalsat + + + - -- GitLab From 7b2782cdcdd1a1052eaf8c403fed822014b25a2d Mon Sep 17 00:00:00 2001 From: xtophe Date: Sun, 29 Mar 2020 23:43:46 +0200 Subject: [PATCH 8/8] minor update --- ModuleEntrySatTelemetry/pom.xml | 569 +++++++++++++++++++++++++++++++- 1 file changed, 558 insertions(+), 11 deletions(-) diff --git a/ModuleEntrySatTelemetry/pom.xml b/ModuleEntrySatTelemetry/pom.xml index 0d401ef..06aa53c 100644 --- a/ModuleEntrySatTelemetry/pom.xml +++ b/ModuleEntrySatTelemetry/pom.xml @@ -3,16 +3,11 @@ - - - - org.josast - JOSAST-parent - 0.0.2-SNAPSHOT - - 4.0.0 + org.josast + ModuleEntrySatTelemetry + 0.0.1-SNAPSHOT ModuleEntrySatTelemetry @@ -24,12 +19,46 @@ 1.8 ${env.JAVA_HOME} + + 2.8 + 2.3.2 + 2.8 + 2.8 + 1.3 + 2.8.1 + 2.3 + 3.12.0 + 2.2.2 + 3.4 + 2.3 + 2.1.2 + 2.13 + 2.12 + 2.2 + 2.6 + 1.3.1 + + ${project.basedir}/code-analysis/checkstyle.xml + + ${project.basedir}/code-analysis/pmd.xml + + false + false + false + false + false - + + junit + junit + 4.11 + test + + commons-cli @@ -66,10 +95,528 @@ - + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.8 + + + - + + + + org.apache.maven.plugins + maven-changelog-plugin + ${plugin.maven-changelog.version} + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + org.apache.maven.plugins + maven-source-plugin + ${plugin.source.version} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${plugin.enforcer.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${plugin.compiler.version} + + + org.apache.maven.plugins + maven-surefire-plugin + ${plugin.surefire.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${plugin.failsafe.version} + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + + org.apache.maven.plugins + maven-jxr-plugin + ${plugin.jxr.version} + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${plugin.checkstyle.version} + + + org.apache.maven.plugins + maven-pmd-plugin + ${plugin.pmd-plugin.version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${plugin.javadoc.version} + + + org.codehaus.mojo + versions-maven-plugin + ${plugin.versions-maven.version} + + + org.codehaus.mojo + cobertura-maven-plugin + ${plugin.cobertura-maven.version} + + + org.codehaus.mojo + findbugs-maven-plugin + 2.4.0 + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + org.apache.maven.plugins + maven-release-plugin + ${plugin.release.version} + + + org.apache.maven.plugins + maven-dependency-plugin + ${plugin.dependency.version} + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + + + + + org.apache.maven.plugins + maven-source-plugin + + true + + + + generate-sources + verify + + jar-no-fork + + + + + + maven-site-plugin + ${plugin.site.version} + + + org.apache.maven.wagon + wagon-ssh + ${plugin.wagon-ssh.version} + + + + true + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + false + false + + + + + summary + project-team + dependencies + issue-tracking + + modules + plugins + + + + org.apache.maven.plugins + maven-jxr-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${checkstyle.skip} + ${maven-checkstyle-plugin.configLocation} + false + true + true + + + + org.apache.maven.plugins + maven-pmd-plugin + + ${pmd.skip} + ${maven.compiler.source} + ${project.build.sourceEncoding} + + + /rulesets/basic.xml + /rulesets/unnecessary.xml + + + false + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${javadocs.skip} + false + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + org.codehaus.mojo + versions-maven-plugin + + + + dependency-updates-report + plugin-updates-report + property-updates-report + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + ${cobertura.skip} + + + + org.codehaus.mojo + findbugs-maven-plugin + + ${findbugs.skip} + true + + + + org.codehaus.mojo + taglist-maven-plugin + + ${project.build.sourceEncoding} + en + + + + Code sections needing review + + + REVIEWREQUIRED + exact + + + + + Todo Work + + + todo + ignoreCase + + + @todo + ignoreCase + + + + + Noted Bugs + + fixme + ignoreCase + + + + Deprecated Items + + @deprecated + ignoreCase + + + + + + + + + + + attach-descriptor + + attach-descriptor + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + ${cobertura.skip} + 1024m + + html + xml + + + false + + 70 + 70 + + + + + + + + + + + + + + + **/*.class + + + **/model/*.class + + + + + + clean + clean + + clean + + + + package + package + + check + + + + + + + org.apache.maven.plugins + maven-jxr-plugin + + true + + + + process-resources + + jxr + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + false + ${javadocs.skip} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + alphabetical + false + ${surefire.jvm.args} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-test + + integration-test + + + + verify + + verify + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + + ${pmd.skip} + ${maven.compiler.source} + ${project.build.sourceEncoding} + + + ${maven-pmd-plugin.configLocation} + + false + + + + verify + + check + cpd-check + + + + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.10 + + 5 + foo + 9999 + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${checkstyle.skip} + ${maven-checkstyle-plugin.configLocation} + false + true + true + + + + run-checkstyle + verify + + checkstyle + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-property + generate-sources + + enforce + + + + + java.16.home + + + Required 'java.16.home' property not defined. + Typically found in + settings.xml + + + + true + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + true + true + + ${java.16.home}/bin/javac + ${jdk.version} + ${maven.compiler.source} + ${maven.compiler.target} + 128m + 512m + Cp1252 + + + -- GitLab