Skip to content

Commit b034752

Browse files
committed
update dependencies while keeping Java 8 compatibility
* unify versions org.apache.cxf, org.eclipse.jetty * consistently update Eclipse EMF dependencies (build was broken) * downgrade rometools to last Java 8 compatible version
1 parent 01d736a commit b034752

6 files changed

Lines changed: 9 additions & 11 deletions

File tree

BimServer/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>com.rometools</groupId>
8888
<artifactId>rome</artifactId>
89-
<version>2.1.0</version>
89+
<version>1.19.0</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>org.quartz-scheduler</groupId>
@@ -126,7 +126,7 @@
126126
<dependency>
127127
<groupId>org.apache.cxf</groupId>
128128
<artifactId>cxf-rt-javascript</artifactId>
129-
<version>3.5.8</version>
129+
<version>${cxf.version}</version>
130130
</dependency>
131131
<dependency>
132132
<groupId>org.apache.oltu.oauth2</groupId>

BimServerClientLib/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<artifactId>parent</artifactId>
99
<version>1.5.187-SNAPSHOT</version>
1010
</parent>
11-
<properties>
12-
<cxf.version>3.5.8</cxf.version>
13-
</properties>
1411
<build>
1512
<sourceDirectory>src</sourceDirectory>
1613
<testSourceDirectory>test</testSourceDirectory>

BimServerJar/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<dependency>
102102
<groupId>org.eclipse.jetty</groupId>
103103
<artifactId>jetty-alpn-java-client</artifactId>
104-
<version>9.4.56.v20240826</version>
104+
<version>${jetty.version}</version>
105105
</dependency>
106106
<dependency>
107107
<groupId>ch.qos.logback</groupId>

PluginBase/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@
163163
<dependency>
164164
<groupId>org.eclipse.emf</groupId>
165165
<artifactId>org.eclipse.emf.common</artifactId>
166-
<version>2.15.0</version>
166+
<version>2.40.0</version>
167167
</dependency>
168168
<dependency>
169169
<groupId>org.eclipse.emf</groupId>
170170
<artifactId>org.eclipse.emf.ecore</artifactId>
171-
<version>2.15.0</version>
171+
<version>2.38.0</version>
172172
</dependency>
173173
<dependency>
174174
<groupId>org.eclipse.emf</groupId>

Tests/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.opensourcebim</groupId>
77
<artifactId>parent</artifactId>
8-
<version>1.5.184-SNAPSHOT</version>
8+
<version>1.5.187-SNAPSHOT</version>
99
</parent>
1010
<build>
1111
<sourceDirectory>src</sourceDirectory>
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>org.opensourcebim</groupId>
3535
<artifactId>bimserverjar</artifactId>
36-
<version>1.5.184-SNAPSHOT</version>
36+
<version>1.5.187-SNAPSHOT</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.slf4j</groupId>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>org.opensourcebim</groupId>
4545
<artifactId>ifcplugins</artifactId>
46-
<version>0.0.101-SNAPSHOT</version>
46+
<version>0.0.104-SNAPSHOT</version>
4747
<scope>test</scope>
4848
</dependency>
4949
</dependencies>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1010
<jetty.version>9.4.56.v20240826</jetty.version>
11+
<cxf.version>3.5.10</cxf.version>
1112
</properties>
1213
<scm>
1314
<url>https://github.com/opensourceBIM/BIMserver.git</url>

0 commit comments

Comments
 (0)