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.

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

Bump pom versions to resolve httpclient-osgi and commons-codec #81

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 full/pom2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-full-maven-repo2</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
Expand Down
40 changes: 6 additions & 34 deletions full/pom3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,55 +7,27 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-full-maven-repo3</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
<galasa.target.repo>file:${project.build.directory}/repo</galasa.target.repo>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.14</version>
<type>jar</type>
</dependency>
<!--
The following POMs are used to resolve dev.galasa.wrapping.httpclient-osgi
-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-core</artifactId>
<version>4.4.14</version>
<version>4.4.16</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.13</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
<version>4.5.13</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<version>4.5.13</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
<version>4.5.13</version>
<version>4.5.14</version>
<type>pom</type>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion full/pom4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-full-maven-repo4</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
Expand Down
17 changes: 13 additions & 4 deletions full/pom5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-full-maven-repo5</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -45,19 +45,28 @@
<artifactId>biz.aQute.bnd.builder.gradle.plugin</artifactId>
<version>5.3.0</version>
</dependency>

<!--
The following POMs are used to resolve commons-codec:1.16.1
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
<version>52</version>
<version>66</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>23</version>
<version>31</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.1</version>
<type>pom</type>
</dependency>

</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion full/pom6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-full-maven-repo6</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion mvp/pom2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-mvp-maven-repo2</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
Expand Down
39 changes: 6 additions & 33 deletions mvp/pom3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,54 +7,27 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-mvp-maven-repo3</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
<galasa.target.repo>file:${project.build.directory}/repo</galasa.target.repo>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.14</version>
<type>jar</type>
</dependency>
<!--
The following POMs are used to resolve dev.galasa.wrapping.httpclient-osgi
-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-core</artifactId>
<version>4.4.14</version>
<version>4.4.16</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.13</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
<version>4.5.13</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<version>4.5.13</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
<version>4.5.13</version>
<version>4.5.14</version>
<type>pom</type>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion mvp/pom4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-mvp-maven-repo4</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
Expand Down
16 changes: 13 additions & 3 deletions mvp/pom5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-mvp-maven-repo5</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -45,18 +45,28 @@
<artifactId>biz.aQute.bnd.builder.gradle.plugin</artifactId>
<version>5.3.0</version>
</dependency>

<!--
The following POMs are used to resolve commons-codec:1.16.1
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
<version>52</version>
<version>66</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>23</version>
<version>31</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.1</version>
<type>pom</type>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion mvp/pom6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>dev.galasa</groupId>
<artifactId>galasa-isolated-mvp-maven-repo5</artifactId>
<version>0.16.0</version>
<version>0.38.0</version>
<packaging>pom</packaging>

<properties>
Expand Down