Rooba
/
flatbuffers
mirror of https://github.com/google/flatbuffers.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3902 from rgilles/master 

Create a maven like project structure for java development + OSGi + generation for test
This commit is contained in:
Wouter van Oortmerssen 2016-07-18 14:13:36 -07:00 committed by GitHub
parent 410fb15a07 9605dc5981
commit e21a61d458
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -55,9 +55,10 @@ build/Xcode/FlatBuffers.xcodeproj/xcuserdata/**
FlatBuffers.xcodeproj/ FlatBuffers.xcodeproj/
java/.idea java/.idea
java/*.iml java/*.iml
java/target
**/*.pyc
.idea .idea
*.iml
target
**/*.pyc
build/VS2010/FlatBuffers.sdf build/VS2010/FlatBuffers.sdf
build/VS2010/FlatBuffers.opensdf build/VS2010/FlatBuffers.opensdf
build/VS2010/ipch/**/*.ipch build/VS2010/ipch/**/*.ipch

10
java/pom.xml → pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.google.flatbuffers</groupId> <groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-java</artifactId> <artifactId>flatbuffers-java</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.3.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>bundle</packaging>
<name>FlatBuffers Java API</name> <name>FlatBuffers Java API</name>
<description> <description>
Memory Efficient Serialization Library Memory Efficient Serialization Library
@ -33,7 +33,7 @@
<dependencies> <dependencies>
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>./</sourceDirectory> <sourceDirectory>java</sourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -78,6 +78,12 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.1</version>
<extensions>true</extensions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>