This is an automated email from the ASF dual-hosted git repository.
sblackmon pushed a commit to branch 553-move-pojos-to-schema-modules
in repository https://gitbox.apache.org/repos/asf/streams.git
commit 47c340c10c6c800931f9342626c1e1c6a03e9525
Author: Steve Blackmon
AuthorDate: Fri Feb 2 14:53:32 2024 -0600
fix: repackage pojos
fixes #553
---
pom.xml| 11 +---
streams-config/pom.xml | 25 +++-
streams-plugins/streams-plugin-pojo/pom.xml| 8 ---
.../plugins/StreamsPojoSourceGeneratorMojo.java| 14 ++---
.../test/StreamsPojoSourceGeneratorCLITest.java| 2 +
.../test/StreamsPojoSourceGeneratorTest.java | 4 +-
.../test/StreamsScalaSourceGeneratorCLITest.java | 2 +
.../test/StreamsScalaSourceGeneratorTest.java | 2 +
streams-pojo/pom.xml | 59 +-
streams-schemas/pom.xml| 72 ++
.../streams-schema-activitystreams/pom.xml | 64 ---
.../src/main/jsonschema/objectTypes/event.json | 2 +-
.../src/main/jsonschema/objectTypes/person.json| 2 +-
.../src/main/jsonschema/objectTypes/place.json | 2 +-
.../activitystreams/test/SchemaValidationTest.java | 4 +-
.../streams-schema-jsonschemaorg/pom.xml | 32 +-
16 files changed, 175 insertions(+), 130 deletions(-)
diff --git a/pom.xml b/pom.xml
index 14d57f4b26..13b75bffaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -570,13 +570,6 @@
org.apache.streams.plugins
streams-plugin-pojo
${project.version}
-
-
-
${project.basedir}/src/main/jsonschema
-
-
${project.basedir}/target/generated-sources/pojo
-org.apache.streams.pojo
-
generate-sources
@@ -802,7 +795,7 @@
unpack-schemas
-generate-sources
+initialize
unpack-dependencies
@@ -815,7 +808,7 @@
unpack-test-resources
-process-test-resources
+initialize
unpack-dependencies
diff --git a/streams-config/pom.xml b/streams-config/pom.xml
index dd0a69c958..912e4575f8 100644
--- a/streams-config/pom.xml
+++ b/streams-config/pom.xml
@@ -138,29 +138,18 @@
${project.version}
-${basedir}/src/main/jsonschema
+
${project.basedir}/src/main/jsonschema
-
${basedir}/target/generated-sources/pojo
+
${project.build.directory}/generated-sources/pojo
org.apache.streams.config
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-add-source
-generate-sources
-
-add-source
-
-
-
-
${basedir}/target/generated-sources/pojo
-
-
-
-
+maven-compiler-plugin
+
+
${project.build.directory}/generated-sources/pojo
+
${project.build.directory}/generated-sources/pojo
+
diff --git a/streams-plugins/streams-plugin-pojo/pom.xml
b/streams-plugins/streams-plugin-pojo/pom.xml
index dee6843f21..01d88b98c4 100644
--- a/streams-plugins/streams-plugin-pojo/pom.xml
+++ b/streams-plugins/streams-plugin-pojo/pom.xml
@@ -32,14 +32,6 @@
-
-org.apache.streams
-streams-schema-jsonschemaorg
-${project.version}
-zip
-schemas
-runtime
-
org.jsonschema2pojo
jsonschema2pojo-maven-plugin
diff --git
a/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoSourceGeneratorMojo.java
b/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoSourceGeneratorMojo.java
index 3927c6d244..a763b3459f 100644
---
