Skip to content

Commit 7df38cd

Browse files
committed
TEIIDTOOLS-779: upgrade of the CXF version
1 parent d8c7ffa commit 7df38cd

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@
33
# Mobile Tools for Java (J2ME)
44
.mtj.tmp/
55
.settings
6+
bin/
7+
**/.classpath
68
.project
79
.classpath
810
target
9-
11+
.metadata
12+
.settings
13+
.classpath
14+
.project
1015
# Package Files #
1116
*.jar
1217
*.war

odata-core/.classpath

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,21 @@
1010
<attributes>
1111
<attribute name="optional" value="true"/>
1212
<attribute name="maven.pomderived" value="true"/>
13+
<attribute name="test" value="true"/>
1314
</attributes>
1415
</classpathentry>
1516
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
1617
<attributes>
1718
<attribute name="maven.pomderived" value="true"/>
19+
<attribute name="test" value="true"/>
1820
</attributes>
1921
</classpathentry>
2022
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
2123
<attributes>
2224
<attribute name="maven.pomderived" value="true"/>
2325
</attributes>
2426
</classpathentry>
25-
<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
27+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
2628
<attributes>
2729
<attribute name="maven.pomderived" value="true"/>
2830
</attributes>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<mockito.version>1.9.0</mockito.version>
110110
<hsqldb.version>1.8.0.10</hsqldb.version>
111111
<jersey.version>1.1.5</jersey.version>
112-
<cxf.version>2.6.0</cxf.version>
112+
<cxf.version>3.2.7</cxf.version>
113113
<jetty.version>7.5.3.v20111011</jetty.version>
114114
<httpclient.version>4.2.1</httpclient.version>
115115
<slf4j.version>1.6.4</slf4j.version>

test-integration/.classpath

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,22 @@
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
</attributes>
13+
</classpathentry>
914
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
1015
<attributes>
1116
<attribute name="optional" value="true"/>
1217
<attribute name="maven.pomderived" value="true"/>
18+
<attribute name="test" value="true"/>
1319
</attributes>
1420
</classpathentry>
1521
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
1622
<attributes>
1723
<attribute name="maven.pomderived" value="true"/>
24+
<attribute name="test" value="true"/>
1825
</attributes>
1926
</classpathentry>
2027
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
@@ -27,10 +34,5 @@
2734
<attribute name="maven.pomderived" value="true"/>
2835
</attributes>
2936
</classpathentry>
30-
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
31-
<attributes>
32-
<attribute name="maven.pomderived" value="true"/>
33-
</attributes>
34-
</classpathentry>
3537
<classpathentry kind="output" path="target/classes"/>
3638
</classpath>

0 commit comments

Comments
 (0)