diff options
Diffstat (limited to 'java/util')
-rw-r--r-- | java/util/pom.xml | 189 | ||||
-rw-r--r-- | java/util/src/test/proto/com/google/protobuf/util/json_test.proto (renamed from java/util/src/test/java/com/google/protobuf/util/json_test.proto) | 0 |
2 files changed, 47 insertions, 142 deletions
diff --git a/java/util/pom.xml b/java/util/pom.xml index 70401a4b..26c12c82 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,110 +4,73 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.google</groupId> - <artifactId>google</artifactId> - <version>1</version> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-parent</artifactId> + <version>3.0.0-beta-2</version> </parent> - <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java-util</artifactId> - <version>3.0.0-beta-2</version> <packaging>bundle</packaging> - <name>Protocol Buffer Java API</name> - <description> - Protocol Buffers are a way of encoding structured data in an efficient yet - extensible format. - </description> - <inceptionYear>2008</inceptionYear> - <url>https://developers.google.com/protocol-buffers/</url> - <licenses> - <license> - <name>New BSD license</name> - <url>http://www.opensource.org/licenses/bsd-license.php</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <url>https://github.com/google/protobuf</url> - <connection> - scm:git:https://github.com/google/protobuf.git - </connection> - </scm> + + <name>Protocol Buffers [Util]</name> + <description>Utilities for Protocol Buffers</description> + <dependencies> <dependency> - <groupId>com.google.protobuf</groupId> + <groupId>${project.groupId}</groupId> <artifactId>protobuf-java</artifactId> - <version>3.0.0-beta-2</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.3</version> - <scope>compile</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>2.2</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymockclassextension</artifactId> - <version>2.2.1</version> - <scope>test</scope> </dependency> </dependencies> + + <properties> + <!-- Use the core proto dir so that we can call the core generation script --> + <test.proto.dir>../core/src/test/proto</test.proto.dir> + </properties> + <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*Test.java</include> - <include>../src/main/java/com/google/protobuf/TestUtil.java</include> - </includes> - </configuration> - </plugin> - <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> + <!-- Generate the test protos --> <execution> <id>generate-test-sources</id> <phase>generate-test-sources</phase> <configuration> - <tasks> - <mkdir dir="target/generated-test-sources" /> - <exec executable="../../src/protoc"> - <arg value="--java_out=target/generated-test-sources" /> - <arg value="--proto_path=../../src" /> - <arg value="--proto_path=src/test/java" /> - <arg value="../../src/google/protobuf/unittest.proto" /> - <arg value="../../src/google/protobuf/unittest_import.proto" /> - <arg value="../../src/google/protobuf/unittest_import_public.proto" /> - <arg value="src/test/java/com/google/protobuf/util/json_test.proto" /> + <target> + <!-- Generate all of the test protos from the core module --> + <ant antfile="../core/generate-test-sources-build.xml"/> + + <!-- Generate additional test protos for this module --> + <exec executable="${protoc}"> + <arg value="--java_out=${generated.testsources.dir}" /> + <arg value="--proto_path=${protobuf.source.dir}" /> + <arg value="--proto_path=src/test/proto" /> + <arg value="src/test/proto/com/google/protobuf/util/json_test.proto" /> </exec> - </tasks> - <testSourceRoot>target/generated-test-sources</testSourceRoot> + </target> </configuration> <goals> <goal>run</goal> @@ -115,6 +78,16 @@ </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- Add the generated test sources to the build --> + <generatedTestSourcesDirectory>${generated.testsources.dir}</generatedTestSourcesDirectory> + </configuration> + </plugin> + + <!-- Configure the OSGI bundle --> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> @@ -123,88 +96,20 @@ <instructions> <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL> <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName> - <Export-Package>com.google.protobuf.util;version=3.0.0-beta-2</Export-Package> + <Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package> </instructions> </configuration> </plugin> + + <!-- Configure the fat jar to include all dependencies --> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> </plugin> </plugins> </build> - <profiles> - <profile> - <id>release</id> - <distributionManagement> - <snapshotRepository> - <id>sonatype-nexus-staging</id> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </snapshotRepository> - <repository> - <id>sonatype-nexus-staging</id> - <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> - </repository> - </distributionManagement> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.2.1</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.5</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.3</version> - <extensions>true</extensions> - <configuration> - <serverId>sonatype-nexus-staging</serverId> - <nexusUrl>https://oss.sonatype.org/</nexusUrl> - <autoReleaseAfterClose>false</autoReleaseAfterClose> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/java/util/src/test/java/com/google/protobuf/util/json_test.proto b/java/util/src/test/proto/com/google/protobuf/util/json_test.proto index 509c1d69..509c1d69 100644 --- a/java/util/src/test/java/com/google/protobuf/util/json_test.proto +++ b/java/util/src/test/proto/com/google/protobuf/util/json_test.proto |