-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #18 from Andrew-Archer/Closes_#17
Closes #17 Fix logging
- Loading branch information
Showing
7 changed files
with
425 additions
and
476 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,3 +49,8 @@ test-run | |
|
|
||
| ###Custom### | ||
| db/ | ||
| /bin/ | ||
| /.theia/ | ||
| /.settings/ | ||
| /.project | ||
| /.classpath | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,127 +1,154 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>NojaborskDefectoscope</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <packaging>jar</packaging> | ||
| <build> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <version>3.3.0</version> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <executions> | ||
| <execution> | ||
| <id>make-executable-jar-with-dependencies</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <archive> | ||
| <manifest> | ||
| <addClasspath>true</addClasspath> | ||
| <mainClass>ru.npptmk.bazaTest.defect.MainFrame</mainClass> | ||
| </manifest> | ||
| </archive> | ||
| <descriptorRefs> | ||
| <descriptorRef>jar-with-dependencies</descriptorRef> | ||
| </descriptorRefs> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <dependencies> | ||
| <!-- https://mvnrepository.com/artifact/org.apache.derby/derbyclient --> | ||
| <dependency> | ||
| <groupId>org.apache.derby</groupId> | ||
| <artifactId>derbyclient</artifactId> | ||
| <version>10.11.1.1</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/org.apache.derby/derbytools --> | ||
| <dependency> | ||
| <groupId>org.apache.derby</groupId> | ||
| <artifactId>derbytools</artifactId> | ||
| <version>10.11.1.1</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/org.apache.derby/derbynet --> | ||
| <dependency> | ||
| <groupId>org.apache.derby</groupId> | ||
| <artifactId>derbynet</artifactId> | ||
| <version>10.11.1.1</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/org.netbeans.external/AbsoluteLayout --> | ||
| <dependency> | ||
| <groupId>org.netbeans.external</groupId> | ||
| <artifactId>AbsoluteLayout</artifactId> | ||
| <version>RELEASE122</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/net.sf.jasperreports/jasperreports --> | ||
| <dependency> | ||
| <groupId>net.sf.jasperreports</groupId> | ||
| <artifactId>jasperreports</artifactId> | ||
| <version>6.5.1</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.jpa --> | ||
| <dependency> | ||
| <groupId>org.eclipse.persistence</groupId> | ||
| <artifactId>org.eclipse.persistence.jpa</artifactId> | ||
| <version>2.7.8</version> | ||
| </dependency> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>NojaborskDefectoscope</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <packaging>jar</packaging> | ||
| <build> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <version>3.3.0</version> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
|
|
||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>CommonObjects</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>UltrasonicDefectDetection</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>MagneticDefectDetection</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>SortoscopeDriver</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>j2mod</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>Transport</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| </dependencies> | ||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <maven.compiler.source>1.8</maven.compiler.source> | ||
| <maven.compiler.target>1.8</maven.compiler.target> | ||
| </properties> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <executions> | ||
| <execution> | ||
| <id>make-executable-jar-with-dependencies</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <archive> | ||
| <manifest> | ||
| <addClasspath>true</addClasspath> | ||
| <mainClass>ru.npptmk.bazaTest.defect.MainFrame</mainClass> | ||
| </manifest> | ||
| </archive> | ||
| <descriptorRefs> | ||
| <descriptorRef>jar-with-dependencies</descriptorRef> | ||
| </descriptorRefs> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <dependencies> | ||
| <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api --> | ||
| <dependency> | ||
| <groupId>javax.xml.bind</groupId> | ||
| <artifactId>jaxb-api</artifactId> | ||
| <version>2.2.8</version> | ||
| </dependency> | ||
| <!-- slf4J api --> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| <version>1.7.30</version> | ||
| </dependency> | ||
|
|
||
| <!-- Logback --> | ||
| <dependency> | ||
| <groupId>ch.qos.logback</groupId> | ||
| <artifactId>logback-core</artifactId> | ||
| <version>1.2.3</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ch.qos.logback</groupId> | ||
| <artifactId>logback-classic</artifactId> | ||
| <version>1.2.3</version> | ||
| </dependency> | ||
|
|
||
|
|
||
| <!-- https://mvnrepository.com/artifact/org.apache.derby/derbyclient --> | ||
| <dependency> | ||
| <groupId>org.apache.derby</groupId> | ||
| <artifactId>derbyclient</artifactId> | ||
| <version>10.11.1.1</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/org.apache.derby/derbytools --> | ||
| <dependency> | ||
| <groupId>org.apache.derby</groupId> | ||
| <artifactId>derbytools</artifactId> | ||
| <version>10.11.1.1</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/org.apache.derby/derbynet --> | ||
| <dependency> | ||
| <groupId>org.apache.derby</groupId> | ||
| <artifactId>derbynet</artifactId> | ||
| <version>10.11.1.1</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/org.netbeans.external/AbsoluteLayout --> | ||
| <dependency> | ||
| <groupId>org.netbeans.external</groupId> | ||
| <artifactId>AbsoluteLayout</artifactId> | ||
| <version>RELEASE122</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/net.sf.jasperreports/jasperreports --> | ||
| <dependency> | ||
| <groupId>net.sf.jasperreports</groupId> | ||
| <artifactId>jasperreports</artifactId> | ||
| <version>6.5.1</version> | ||
| </dependency> | ||
| <!-- https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.jpa --> | ||
| <dependency> | ||
| <groupId>org.eclipse.persistence</groupId> | ||
| <artifactId>org.eclipse.persistence.jpa</artifactId> | ||
| <version>2.7.8</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>CommonObjects</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>UltrasonicDefectDetection</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>MagneticDefectDetection</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>SortoscopeDriver</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>j2mod</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ru.npptmk.common</groupId> | ||
| <artifactId>Transport</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| </dependencies> | ||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <maven.compiler.source>1.8</maven.compiler.source> | ||
| <maven.compiler.target>1.8</maven.compiler.target> | ||
| </properties> | ||
| </project> |
Oops, something went wrong.