Updated Branches: refs/heads/master 24d15a968 -> f7b36dd4f
Get maven build to work Project: http://git-wip-us.apache.org/repos/asf/ode-jacob/repo Commit: http://git-wip-us.apache.org/repos/asf/ode-jacob/commit/f7b36dd4 Tree: http://git-wip-us.apache.org/repos/asf/ode-jacob/tree/f7b36dd4 Diff: http://git-wip-us.apache.org/repos/asf/ode-jacob/diff/f7b36dd4 Branch: refs/heads/master Commit: f7b36dd4f01b12d01b15c80e781693f5473d261a Parents: 24d15a9 Author: Hadrian Zbarcea <[email protected]> Authored: Tue Jan 29 17:31:37 2013 -0500 Committer: Hadrian Zbarcea <[email protected]> Committed: Tue Jan 29 17:31:37 2013 -0500 ---------------------------------------------------------------------- pom.xml | 103 +++++++-------- .../java/org/apache/ode/jacob/vpu/JacobVPU.java | 2 +- 2 files changed, 51 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/f7b36dd4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2454fd7..48f7644 100644 --- a/pom.xml +++ b/pom.xml @@ -19,60 +19,57 @@ --> <project> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.ode</groupId> - <artifactId>ode-jacob</artifactId> - <packaging>jar</packaging> - <name>ODE :: Java Concurrent Objects (JACOB)</name> - <parent> - <groupId>org.apache.ode</groupId> - <artifactId>ode</artifactId> - <version>1.4-SNAPSHOT</version> - </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.ode</groupId> + <artifactId>jacob</artifactId> + <version>1.4-SNAPSHOT</version> + <packaging>jar</packaging> + <name>ODE :: JACOB</name> + <properties> + <slf4j.version>1.7.2</slf4j.version> + <junit.version>4.11</junit.version> + </properties> + + <dependencyManagement> <dependencies> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-utils</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> </dependencies> - - <build> - <plugins> - <!-- uncomment it for @ChannelType classes regeneration --> - <!--plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>apt-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - <configuration> - <factory>org.apache.ode.jacob.ap.JacobAnnotationProcessorFactory</factory> - <outputDirectory>src/main/java</outputDirectory> - </configuration> - <executions> - <execution> - <goals> - <goal>process</goal> - <goal>test-process</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-jacob-ap</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin--> - </plugins> - </build> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <!-- test --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + </build> </project> http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/f7b36dd4/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java index ee7edf1..455431f 100644 --- a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java +++ b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java @@ -388,7 +388,7 @@ public final class JacobVPU { public void run() { assert _methodBody != null; assert _method != null; - assert _method.getDeclaringClass().isAssignableFrom(_methodBody.getClass()); + // assert _method.getDeclaringClass().isAssignableFrom(_methodBody.getClass()); LOG.trace(">> [{}] : {}", _cycle, _source);
