Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update project dependencies #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update project dependencies #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion feature-matcher-generator-e2e-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
<version>2.3.1</version>
<scope>provided</scope>
</dependency>

Expand Down
6 changes: 4 additions & 2 deletions ...r/src/main/java/ru/yandex/qatools/processors/matcher/gen/util/PropsClasspathProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ public <T> Properties provide(T bean, Properties properties) {
Class<?> clazz = bean.getClass();

if (have(clazz, Resource.Classpath.class)) {
String path = classpath(clazz, properties);
properties.putAll(readProperties(getResourceAsStream(clazz, path)));
String[] paths = classpath(clazz, properties);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this class will be removed with new props lib

for (String path : paths) {
properties.putAll(readProperties(getResourceAsStream(clazz, path)));
}
}

properties.putAll(System.getProperties());
Expand Down
7 changes: 5 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@

<packaging>pom</packaging>


<name>Yandex QATools Annotation Processors</name>
<url>https://github.com/yandex-qatools/annotation-processors/</url>

<prerequisites>
<maven>2.2.1</maven>
</prerequisites>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down Expand Up @@ -147,7 +150,7 @@
<dependency>
<groupId>ru.yandex.qatools.properties</groupId>
<artifactId>properties-loader</artifactId>
<version>1.5</version>
<version>1.6</version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this version is deprecated. We will migrate on this one - https://github.com/qatools/properties after stable release

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it will be interesting for you: https://github.com/lviggiano/owner

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the link!

</dependency>

</dependencies>
Expand Down