Skip to content

Merge protoc plugin #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Jun 12, 2014
Merged

Merge protoc plugin #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4441903
Initial import.
Feb 5, 2013
98a7ab6
Update to handle 64bit win
hfscomoyo Feb 5, 2013
faef0bc
Explicitly set java version
Feb 5, 2013
862bb27
Comment fixes.
argggh Feb 6, 2013
8762a96
Add readme.
argggh Feb 6, 2013
3afa2c7
Reduced java requirement to 1.6 to accommodate current capabilities o…
argggh Feb 6, 2013
bd32e38
Minor example fix.
argggh Feb 6, 2013
270810f
Move master forward to 1.1-SNAPSHOT.
argggh Feb 6, 2013
b5a5e6e
Add default values to README.
argggh Feb 6, 2013
053d6a1
Changed resolution to find protoc as an artifact instead of a resourc…
argggh Feb 7, 2013
8a54071
Add a crude build script, purely static Linux builds, and version 2.5.0.
argggh Feb 7, 2013
dfda4a5
Add protoc license conditions to source repo and protoc-bundled:help …
argggh Feb 7, 2013
d7a982c
Enforce dependency on Maven 3. Bump version in README example.
Mar 11, 2013
5602427
Slightly more useful error message.
Feb 7, 2013
605e248
Bump master to 1.2-SNAPSHOT.
Feb 7, 2013
9f93ca7
Assigning default-value attributes to multi-value properties apparent…
May 30, 2013
beb413a
Warn if users try to shoot their own foot, don't abort.
May 30, 2013
a110f8f
Added OS X binary for 2.5.0
Jun 5, 2013
6504aa1
Rename OS X 2.5.0 protoc to match naming scheme used by java system r…
Jun 5, 2013
e026dc0
Update pom.xml to deploy 2.5.0 protoc artifacts.
Jun 5, 2013
506c986
Update usage example for 1.2.0.
Jun 5, 2013
b1eb890
Bump master to 1.3-SNAPSHOT.
Jun 5, 2013
ad14f40
Enable compilation of test schemas.
May 16, 2014
df5f7ce
Update examples.
May 16, 2014
c03321a
Add license conditions.
May 16, 2014
3d5842b
Move to subdirectory in preparation for merge into commons.
Jun 12, 2014
a14067b
Merge branch 'master' of ../protoc-bundled-plugin into argggh/merge-p…
Jun 12, 2014
39fa35d
Adjust poms after inclusion of protoc-bundled-plugin; bump to 1.4-SNA…
Jun 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ The list of components currently reads as follows:
* [logging-context](logging-context) Structured application state/context for logging
* [logging-context-gelf](logging-context-gelf) Context-aware GELF log handler
* [logging-context-json](logging-context-json) Context-aware JSON/logstash log formatter
* [logging-utilities](logging-utilities) Helpers for logging. Sensible default exception handler which logs to jul.
* [logging-utilities](logging-utilities) Helpers for logging. Sensible default exception handler which logs to jul
* [pb-json](pb-json) Hassle-free conversion from Protobuf to JSON and back
* [protoc-bundled-plugin](protoc-bundled-plugin) Batteries included Protobuf compiler plugin for Maven
* [emjar](emjar) Class loader and supporting cast for using jar-in-jar embedded archives as part of classpath
* [emjar-maven-plugin](emjar-maven-plugin) Generate EmJar-enabled bundle archives from Maven
4 changes: 2 additions & 2 deletions amazonaws-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>commons</artifactId>
<groupId>com.comoyo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<name>amazonaws-utils - Tools for AWS</name>
Expand Down Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions emjar-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>commons</artifactId>
<groupId>com.comoyo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<name>emjar-maven-plugin -- for building executable embedded jar files</name>
Expand Down Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions emjar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>commons</artifactId>
<groupId>com.comoyo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<name>emjar -- for loading dependencies from embedded jar files</name>
Expand Down Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions logging-context-gelf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>commons</artifactId>
<groupId>com.comoyo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<name>logging-context-gelf - Logging with context to GELF</name>
Expand Down Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions logging-context-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.comoyo</groupId>
<artifactId>commons</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<groupId>com.comoyo.commons</groupId>
<artifactId>logging-context-json</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
<name>logging-context-json - Logging with context to json-event logs for logstash</name>
<url>http://github.com/comoyo/commons/</url>
<build>
Expand All @@ -32,7 +32,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -50,7 +50,7 @@
<dependency>
<groupId>com.comoyo.commons</groupId>
<artifactId>logging-context</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions logging-context/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>commons</artifactId>
<groupId>com.comoyo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<name>logging-context - Tools for logging with context</name>
Expand Down Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion logging-utilities/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>commons</artifactId>
<groupId>com.comoyo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 3 additions & 3 deletions pb-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>commons</artifactId>
<groupId>com.comoyo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<name>pb-json - Tools for working with Protobuf and Json</name>
Expand Down Expand Up @@ -41,7 +41,7 @@
<plugin>
<groupId>com.comoyo.maven.plugins</groupId>
<artifactId>protoc-bundled-plugin</artifactId>
<version>${protoc.plugin.version}</version>
<version>${project.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -57,7 +57,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<protoc.plugin.version>1.3.0</protoc.plugin.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<google.guava.version>14.0</google.guava.version>
<junit.version>4.11</junit.version>
</properties>

<name>Comoyo Commons Multi-Module POM</name>
<groupId>com.comoyo</groupId>
<artifactId>commons</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
<description>Collection of utility components</description>

<url>https://github.com/comoyo/commons</url>
Expand Down Expand Up @@ -70,6 +70,7 @@

<modules>
<module>pb-json</module>
<module>protoc-bundled-plugin</module>
<module>amazonaws-utils</module>
<module>logging-context</module>
<module>logging-context-gelf</module>
Expand Down
51 changes: 51 additions & 0 deletions protoc-bundled-plugin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
protoc-bundled-plugin
=====================

Maven Plugin Mojo for compiling Protobuf schema files. Protobuf compiler binaries for various platforms and protobuf versions are bundled with the plugin and used as required.

### Available parameters

* protobufVersion

Protobuf version to compile schema files for. If omitted, version is inferred from the project's depended-on `com.google.com:protobuf-java` artifact, if any. The inferred version must match the explicitly given version if both are present.

* inputDirectories

Directories containing *.proto files to compile. Defaults to `${project.basedir}/src/main/protobuf`.

* outputDirectory

Output directory for generated Java class files. Defaults to `${project.build.directory}/generated-sources/protobuf`.

* testInputDirectories

Directories containing test *.proto files to compile. Defaults to `${project.basedir}/src/test/protobuf`.

* testOutputDirectory

Output directory for generated Java class test files. Defaults to `${project.build.directory}/generated-test-sources/protobuf`.

* protocExec

Path to existing protoc to use. Overrides auto-detection and use of bundled protoc.

### Minimal usage example

```xml
<plugins>
...
<plugin>
<groupId>com.comoyo.maven.plugins</groupId>
<artifactId>protoc-bundled-plugin</artifactId>
<version>1.4.42</version>
<executions>
<execution>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
...
</plugins>
```
Loading