Skip to content

Commit

Permalink
Use Maven CI friendly versions (frankframework#2685)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ricardovh
ricardovh authored Feb 14, 2022
1 parent 4a199ae commit 5e7a94b
Show file tree
Hide file tree
Showing 28 changed files with 86 additions and 59 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ bin
.factorypath

**/META-INF/maven
**/META-INF/MANIFEST.MF
**/META-INF/MANIFEST.MF
.flattened-pom.xml
2 changes: 1 addition & 1 deletion akamai/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-akamai</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aspose/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-aspose</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cmis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-cmis</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coolgen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-coolgen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion credentialProvider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>credentialprovider</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions docker/appserver/Jboss-WildFly/example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-docker-as-jboss-wildfly</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-example</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<classifier>resources</classifier>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-example</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<classifier>configurations</classifier>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-example</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<classifier>scenarios</classifier>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion docker/appserver/Jboss-WildFly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-ear</artifactId>
<version>${iaf.version}</version>
<type>ear</type>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions docker/appserver/Jboss-WildFly/test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-docker-as-jboss-wildfly</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-test</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<classifier>full-configuration</classifier>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-test</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<classifier>scenarios</classifier>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions docker/appserver/Tomcat/example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
<config.tag>example</config.tag>
<config.groupid>org.ibissource</config.groupid>
<config.project>ibis-adapterframework-${config.tag}</config.project>
<config.project.version>${iaf.version}</config.project.version>
<config.project.version>${project.version}</config.project.version>
</properties>


<dependencies>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-docker-as-tomcat</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion docker/appserver/Tomcat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>credentialprovider</artifactId>
<version>${revision}</version> <!-- Make the version overridable -->
</dependency>
<dependency>
<groupId>${oracle.driver.groupid}</groupId>
Expand Down
4 changes: 2 additions & 2 deletions docker/appserver/Tomcat/test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
<config.tag>test</config.tag>
<config.groupid>org.ibissource</config.groupid>
<config.project>ibis-adapterframework-${config.tag}</config.project>
<config.project.version>${iaf.version}</config.project.version>
<config.project.version>${project.version}</config.project.version>
</properties>


<dependencies>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-docker-as-tomcat</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
Expand Down
7 changes: 3 additions & 4 deletions docker/appserver/WebSphere/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,24 @@
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-ear</artifactId>
<version>${iaf.version}</version>
<type>ear</type>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-test</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<classifier>resources</classifier>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-test</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<classifier>configurations</classifier>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-test</artifactId>
<version>${iaf.version}</version>
<version>${project.version}</version>
<classifier>scenarios</classifier>
</dependency>
<dependency>
Expand Down
6 changes: 2 additions & 4 deletions docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@
<packaging>pom</packaging>
<artifactId>ibis-adapterframework-docker</artifactId>
<name>Ibis AdapterFramework Docker images</name>
<version>${revision}</version>

<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<properties>
<iaf.version>7.8-SNAPSHOT</iaf.version>
<revision>${iaf.version}</revision>
<iaf.version>${revision}</iaf.version>
<oracle.driver.groupid>com.oracle.database.jdbc</oracle.driver.groupid>
<oracle.driver.version>18.3.0.0</oracle.driver.version>
<oracle.driver.jdkversion>8</oracle.driver.jdkversion>
Expand Down
2 changes: 1 addition & 1 deletion ear/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-ear</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-example</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ibm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-ibm</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion idin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-idin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ifsa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-ifsa</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ladybug/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-ladybug</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion larva/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>7.8-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-larva</artifactId>
Expand Down
Loading

0 comments on commit 5e7a94b

Please sign in to comment.