Joal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/256952
Change subject: Clean refinery-camus from unnecessary avro files
......................................................................
Clean refinery-camus from unnecessary avro files
Bug: T119893
Change-Id: Ieef5a50fb89e55d8465d3699611dc70f15c7837e
---
M refinery-camus/pom.xml
D refinery-camus/src/test/avro/TestSchema.avsc
D refinery-camus/src/test/avro/TestTimestampSchema.avsc
3 files changed, 1 insertion(+), 91 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source
refs/changes/52/256952/1
diff --git a/refinery-camus/pom.xml b/refinery-camus/pom.xml
index da9e72f..3306ae1 100644
--- a/refinery-camus/pom.xml
+++ b/refinery-camus/pom.xml
@@ -78,24 +78,13 @@
<version>1.7.7</version>
<executions>
<execution>
- <id>main</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>schema</goal>
- </goals>
- <configuration>
-
<sourceDirectory>${project.basedir}/src/main/avro/</sourceDirectory>
-
<outputDirectory>${project.basedir}/src/generated/java/</outputDirectory>
- </configuration>
- </execution>
- <execution>
<id>test</id>
<phase>generate-sources</phase>
<goals>
<goal>schema</goal>
</goals>
<configuration>
-
<sourceDirectory>${project.basedir}/src/test/avro/</sourceDirectory>
+
<sourceDirectory>${project.basedir}/src/test/resources/avro_schema_repo</sourceDirectory>
<outputDirectory>${project.basedir}/src/generated/java/</outputDirectory>
</configuration>
</execution>
@@ -175,13 +164,5 @@
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/avro</directory>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
</build>
</project>
diff --git a/refinery-camus/src/test/avro/TestSchema.avsc
b/refinery-camus/src/test/avro/TestSchema.avsc
deleted file mode 100644
index c7687f9..0000000
--- a/refinery-camus/src/test/avro/TestSchema.avsc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "namespace": "org.wikimedia.analytics.schemas",
- "type": "record",
- "name": "TestSchema",
- "doc": "Logs for really important stuff.",
- "fields": [
- {
- "name": "id",
- "type": "long",
- "default": 0
- },
- {
- "name": "name",
- "type": "string",
- "default": ""
- },
- {
- "name": "someInfo",
- "type": {"type": "map", "values": "string"},
- "default": {}
- }
- ]
-}
\ No newline at end of file
diff --git a/refinery-camus/src/test/avro/TestTimestampSchema.avsc
b/refinery-camus/src/test/avro/TestTimestampSchema.avsc
deleted file mode 100644
index bf80fe5..0000000
--- a/refinery-camus/src/test/avro/TestTimestampSchema.avsc
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "namespace": "org.wikimedia.analytics.schemas",
- "type": "record",
- "name": "TestTimestampSchema",
- "doc": "Logs for really important stuff.",
- "fields": [
- {
- "name": "name",
- "type": "string",
- "default": ""
- },
- {
- "name": "timestamp",
- "type": "long",
- "doc": "default timestamp in millis"
- },
- {
- "name": "timestampInSeconds",
- "type": "long",
- "doc": "timestamp in seconds"
- },
- {
- "name": "timestampInSecondsAsInt",
- "type": "int",
- "doc": "timestamp in seconds"
- },
- {
- "name": "timestampISO",
- "type": "string",
- "doc": "timestamp in ISO8601 format"
- },
- {
- "name": "timestampBadISO",
- "type": "string",
- "doc": "timestamp in ISO8601 format but broken"
- },
- {
- "name": "timestampCustom",
- "type": "string",
- "doc": "timestamp with a custom SimpleDateFormat"
- },
- {
- "name": "timestampBadCustom",
- "type": "string",
- "doc": "timestamp with a custom SimpleDateFormat but broken"
- }
- ]
-}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/256952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieef5a50fb89e55d8465d3699611dc70f15c7837e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
