Skip to content

Commit 1e7a202

Browse files
sbernheimsbernheim
authored
Change package name to com.applitools.imagetester (#13)
Changed the project package name from com.yanirta to com.applitools.imagetester, and updated the EyesUtilities dependency references to use the com.applitools.eyesutilities package name change submitted to that project. Altered the EyesUtilities dependency reference to load the dependency JAR from the local Maven repository and package it within the JAR artifact produced by the Maven package goal rather than requiring the end-user to install it as a system dependency. Also a few minor cleanup items.
1 parent 3a2c6a0 commit 1e7a202

35 files changed

+136
-115
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ debug/
88
src/test/java/Private/
99
TestData/Private/
1010
output
11-
dependency-reduced-pom.xml
11+
dependency-reduced-pom.xml
12+
.classpath
13+
.project
14+
.settings/**

‎pom.xml‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,29 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>com.yanirta</groupId>
7+
<groupId>com.applitools.imagetester</groupId>
88
<artifactId>ImageTester</artifactId>
9-
<version>3.1.3</version>
9+
<version>3.1.4-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111
<properties>
1212
<maven.compiler.source>1.8</maven.compiler.source>
1313
<maven.compiler.target>1.8</maven.compiler.target>
1414
</properties>
1515

1616
<dependencies>
17-
<dependency>
18-
<groupId>com.yanirta</groupId>
19-
<artifactId>EyesUtilities</artifactId>
20-
<version> 1.5.1 </version>
21-
<scope>system</scope>
22-
<systemPath>${project.basedir}/jars/EyesUtilities_1.5.1.jar</systemPath>
23-
</dependency>
2417
<dependency>
2518
<groupId>junit</groupId>
2619
<artifactId>junit</artifactId>
2720
<version>4.13.2</version>
21+
<scope>test</scope>
22+
</dependency>
23+
24+
<dependency>
25+
<groupId>com.applitools.eyesutilities</groupId>
26+
<artifactId>EyesUtilities</artifactId>
27+
<version>1.5.10-SNAPSHOT</version>
28+
<!-- scope>system</scope>
29+
<systemPath>${project.basedir}/jars/EyesUtilities_1.5.10-SNAPSHOT.jar</systemPath -->
2830
</dependency>
2931
<dependency>
3032
<groupId>org.apache.pdfbox</groupId>
@@ -74,7 +76,7 @@
7476
</dependency>
7577
</dependencies>
7678
<build>
77-
<finalName>../jars/${artifactId}_${project.version}</finalName>
79+
<finalName>../jars/${project.artifactId}_${project.version}</finalName>
7880
<plugins>
7981
<plugin>
8082
<groupId>org.apache.maven.plugins</groupId>
@@ -89,13 +91,12 @@
8991
<!-- Use lifecycle package to generate uber jar -->
9092
<groupId>org.apache.maven.plugins</groupId>
9193
<artifactId>maven-shade-plugin</artifactId>
92-
<version>3.2.4</version>
94+
<version>3.4.1</version>
9395
<configuration>
94-
<!-- put your configurations here -->
9596
<transformers>
9697
<transformer
9798
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
98-
<MainClass>com.yanirta.ImageTester</MainClass>
99+
<MainClass>com.applitools.imagetester.ImageTester</MainClass>
99100
</transformer>
100101
</transformers>
101102
</configuration>
@@ -108,7 +109,7 @@
108109
</execution>
109110
</executions>
110111
</plugin>
111-
<plugin>
112+
<!-- plugin>
112113
<groupId>org.owasp</groupId>
113114
<artifactId>dependency-check-maven</artifactId>
114115
<version>7.1.1</version>
@@ -119,11 +120,12 @@
119120
</goals>
120121
</execution>
121122
</executions>
122-
</plugin>
123+
</plugin -->
123124
<plugin>
124125
<!-- This plugin required to control version addition to the manifest so it will be consumable on runtime -->
125126
<groupId>org.apache.maven.plugins</groupId>
126127
<artifactId>maven-jar-plugin</artifactId>
128+
<version>3.2.2</version>
127129
<configuration>
128130
<archive>
129131
<manifest>
@@ -136,11 +138,12 @@
136138
<plugin>
137139
<groupId>org.apache.maven.plugins</groupId>
138140
<artifactId>maven-compiler-plugin</artifactId>
141+
<version>3.10.1</version>
139142
<configuration>
140143
<source>1.8</source>
141144
<target>1.8</target>
142145
</configuration>
143146
</plugin>
144147
</plugins>
145148
</build>
146-
</project>
149+
</project>

‎src/main/java/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Manifest-Version: 1.0
2-
Main-Class: com.yanirta.ImageTester
2+
Main-Class: com.applitools.imagetester.ImageTester
33
Implementation-Version: 3.1.3
44

src/main/java/com/yanirta/BatchMapper/BatchMapDeserializer.java renamed to src/main/java/com/applitools/imagetester/BatchMapper/BatchMapDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.yanirta.BatchMapper;
1+
package com.applitools.imagetester.BatchMapper;
22

33
import com.fasterxml.jackson.databind.MappingIterator;
44
import com.fasterxml.jackson.dataformat.csv.CsvMapper;

src/main/java/com/yanirta/BatchMapper/BatchMapPojo.java renamed to src/main/java/com/applitools/imagetester/BatchMapper/BatchMapPojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.yanirta.BatchMapper;
1+
package com.applitools.imagetester.BatchMapper;
22

33
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
44

src/main/java/com/yanirta/BatchObjects/Batch.java renamed to src/main/java/com/applitools/imagetester/BatchObjects/Batch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.yanirta.BatchObjects;
1+
package com.applitools.imagetester.BatchObjects;
22

33
import com.applitools.eyes.BatchInfo;
4-
import com.yanirta.lib.Config;
4+
import com.applitools.imagetester.lib.Config;
55

66
import java.io.File;
77

src/main/java/com/yanirta/BatchObjects/BatchBase.java renamed to src/main/java/com/applitools/imagetester/BatchObjects/BatchBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.yanirta.BatchObjects;
1+
package com.applitools.imagetester.BatchObjects;
22

3-
import com.yanirta.TestObjects.TestBase;
43
import com.applitools.eyes.BatchInfo;
5-
import com.yanirta.lib.TestExecutor;
4+
import com.applitools.imagetester.TestObjects.TestBase;
5+
import com.applitools.imagetester.lib.TestExecutor;
66

77
import java.util.ArrayList;
88
import java.util.List;

src/main/java/com/yanirta/BatchObjects/IBatch.java renamed to src/main/java/com/applitools/imagetester/BatchObjects/IBatch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.yanirta.BatchObjects;
1+
package com.applitools.imagetester.BatchObjects;
22

33
import com.applitools.eyes.BatchInfo;
4-
import com.yanirta.lib.TestExecutor;
4+
import com.applitools.imagetester.lib.TestExecutor;
55

66
public interface IBatch {
77
boolean isEmpty();

src/main/java/com/yanirta/BatchObjects/PDFFileBatch.java renamed to src/main/java/com/applitools/imagetester/BatchObjects/PDFFileBatch.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
package com.yanirta.BatchObjects;
1+
package com.applitools.imagetester.BatchObjects;
22

33
import com.applitools.eyes.images.ImagesCheckSettings;
4-
import com.yanirta.TestObjects.IDisposable;
5-
import com.yanirta.TestObjects.ImagesCheckSettingsFactory;
6-
import com.yanirta.TestObjects.TestBase;
4+
import com.applitools.imagetester.TestObjects.IDisposable;
5+
import com.applitools.imagetester.TestObjects.ImagesCheckSettingsFactory;
6+
import com.applitools.imagetester.TestObjects.TestBase;
7+
import com.applitools.imagetester.lib.Config;
8+
import com.applitools.imagetester.lib.Logger;
9+
import com.applitools.imagetester.lib.Utils;
710
import com.applitools.eyes.BatchInfo;
811
import com.applitools.eyes.TestResults;
912
import com.applitools.eyes.images.Eyes;
10-
import com.yanirta.lib.Config;
11-
import com.yanirta.lib.Logger;
12-
import com.yanirta.lib.Utils;
13+
1314
import org.apache.pdfbox.pdmodel.PDDocument;
1415
import org.apache.pdfbox.rendering.PDFRenderer;
1516

src/main/java/com/yanirta/Constants/ApplitoolsConstants.java renamed to src/main/java/com/applitools/imagetester/Constants/ApplitoolsConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.yanirta.Constants;
1+
package com.applitools.imagetester.Constants;
22

33
public class ApplitoolsConstants {
44
public static final String APPLITOOLS_API_KEY = "APPLITOOLS_API_KEY";

0 commit comments

Comments
 (0)