Skip to content

Commit 460628b

Browse files
committed
SQUASH: cannot get project to work with both java 5 and Java 6 compatibility. Bail on it.
1 parent da3a9fc commit 460628b

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>bridj</artifactId>
66
<name>BridJ (NativeLibs4Java C/C++ Interop Layer)</name>
77
<url>http://code.google.com/p/bridj/</url>
8-
<version>0.8.0-SNAPSHOT</version>
8+
<version>0.9.0-SNAPSHOT</version>
99
<packaging>bundle</packaging>
1010
<repositories>
1111
<repository>
@@ -25,8 +25,9 @@
2525
<properties>
2626
<versionSpecificSubPackage>v0_7_0</versionSpecificSubPackage>
2727
<maven.compiler.optimize>true</maven.compiler.optimize>
28-
<maven.compiler.testSource>6</maven.compiler.testSource>
29-
<maven.compiler.testTarget>6</maven.compiler.testTarget>
28+
<!--<maven.compiler.testSource>6</maven.compiler.testSource>-->
29+
<!--<maven.compiler.testTarget>6</maven.compiler.testTarget>-->
30+
<maven.javadoc.skip>true</maven.javadoc.skip>
3031
</properties>
3132
<scm>
3233
<connection>scm:git:git@github.com:nativelibs4java/BridJ.git</connection>
@@ -111,7 +112,7 @@
111112
</javahClassNames>
112113
</configuration>
113114
</plugin-->
114-
<plugin>
115+
<!--<plugin>
115116
<artifactId>maven-compiler-plugin</artifactId>
116117
<version>3.6.0</version>
117118
<executions>
@@ -127,7 +128,7 @@
127128
</configuration>
128129
</execution>
129130
</executions>
130-
</plugin>
131+
</plugin>-->
131132
<plugin>
132133
<groupId>org.apache.felix</groupId>
133134
<artifactId>maven-bundle-plugin</artifactId>

src/test/java/org/bridj/ObjectiveCTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public void testNativeDelegate() {
289289
testDelegate(new DelgImpl());
290290
}
291291
static class MyDelg extends ObjCProxy implements Delg {
292-
@Override
292+
//@Override
293293
public int add_to(int a, int b) {
294294
return a + b;
295295
}

0 commit comments

Comments
 (0)