From 75861fef9406b221bf7d7994ec97f34385d823eb Mon Sep 17 00:00:00 2001
From: Federico Bertolini <5268372+zabuTNT@users.noreply.github.com>
Date: Thu, 30 Mar 2023 22:36:43 +0200
Subject: [PATCH 1/8] Create package-info.java

---
 package-info.java | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 package-info.java

diff --git a/package-info.java b/package-info.java
new file mode 100644
index 0000000..16ae522
--- /dev/null
+++ b/package-info.java
@@ -0,0 +1,9 @@
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.siri.org.uk/siri", 
+elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
+xmlns = {
+		@XmlNs(prefix="siri", namespaceURI="http://www.siri.org.uk/siri"),
+		@XmlNs(prefix="ojp", namespaceURI="http://www.vdv.de/ojp")
+})
+package com.bliksemlabs.ojp.model;
+
+import javax.xml.bind.annotation.XmlNs;

From 4ce6d75e51b72804e92ed6d3bc55443beb5b06de Mon Sep 17 00:00:00 2001
From: zabuTNT <f.bertolini@riseup.net>
Date: Thu, 18 Apr 2024 16:16:54 +0200
Subject: [PATCH 2/8] fix namespaces with package-info

---
 bindings.xjb      |  9 +++++----
 package-info.java | 22 ++++++++++++++--------
 pom.xml           | 23 +++++++++++++++++++++--
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/bindings.xjb b/bindings.xjb
index 8291388..30b9178 100644
--- a/bindings.xjb
+++ b/bindings.xjb
@@ -1,8 +1,10 @@
 <jxb:bindings xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
               xmlns:xs="http://www.w3.org/2001/XMLSchema"
               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-              xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" jxb:version="3.0" jxb:extensionBindingPrefixes="xjc">
-    
+              xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+							jxb:version="3.0"
+							jxb:extensionBindingPrefixes="xjc">
+
 	<jxb:bindings>
 		<jxb:globalBindings underscoreBinding="asCharInWord">
 <!--			<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.LocalDateTimeISO8601XmlAdapter" /> -->
@@ -17,8 +19,7 @@
 
 	<jxb:bindings schemaLocation="./src/main/resources/xsd/1.0.3/OJP.xsd">
 		<jxb:schemaBindings>
-			<jxb:package name="de.vdv.ojp.model" />
+			<jxb:package name="de.vdv.ojp.model"/>
 		</jxb:schemaBindings>
 	</jxb:bindings>
-
 </jxb:bindings>
diff --git a/package-info.java b/package-info.java
index 16ae522..5905224 100644
--- a/package-info.java
+++ b/package-info.java
@@ -1,9 +1,15 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.siri.org.uk/siri", 
-elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
-xmlns = {
-		@XmlNs(prefix="siri", namespaceURI="http://www.siri.org.uk/siri"),
-		@XmlNs(prefix="ojp", namespaceURI="http://www.vdv.de/ojp")
-})
-package com.bliksemlabs.ojp.model;
+@jakarta.xml.bind.annotation.XmlSchema(
+    namespace = "http://www.siri.org.uk/siri",
+    elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED,
+    xmlns = {
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "ojp", namespaceURI = "http://www.vdv.de/ojp"),
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "ifopt", namespaceURI = "http://www.ifopt.org.uk/ifopt"),
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "acsb", namespaceURI = "http://www.ifopt.org.uk/acsb"),
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "siri", namespaceURI = "http://www.siri.org.uk/siri")
+    }
+)
+package de.vdv.ojp.model;
 
-import javax.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
diff --git a/pom.xml b/pom.xml
index 87f853e..e028cad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,7 +323,26 @@
                     </dependency>
                 </dependencies>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-package-info</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <copy file="${project.basedir}/package-info.java"
+                                    todir="${project.build.directory}/generated-sources/xjc/de/vdv/ojp/model" overwrite="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -462,7 +481,7 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${maven-surefire-plugin.version}</version>
 		</plugin>
-		
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>

From 7323ffccd2657f5d4fd2d1a4ec3c6720812314c4 Mon Sep 17 00:00:00 2001
From: zabuTNT <f.bertolini@riseup.net>
Date: Thu, 18 Apr 2024 16:22:40 +0200
Subject: [PATCH 3/8] better position for package-info.java

---
 pom.xml                                                         | 2 +-
 .../main/java/de/vdv/ojp/model/package-info.java                | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package-info.java => src/main/java/de/vdv/ojp/model/package-info.java (100%)

diff --git a/pom.xml b/pom.xml
index e028cad..57600c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,7 +336,7 @@
                         </goals>
                         <configuration>
                             <target>
-                                <copy file="${project.basedir}/package-info.java"
+                                <copy file="${project.basedir}/src/main/de/vdv/ojp/model/package-info.java"
                                     todir="${project.build.directory}/generated-sources/xjc/de/vdv/ojp/model" overwrite="true"/>
                             </target>
                         </configuration>
diff --git a/package-info.java b/src/main/java/de/vdv/ojp/model/package-info.java
similarity index 100%
rename from package-info.java
rename to src/main/java/de/vdv/ojp/model/package-info.java

From 55cdba633eb25c2b39eb9a9fe574c57ad63780a8 Mon Sep 17 00:00:00 2001
From: zabuTNT <f.bertolini@riseup.net>
Date: Thu, 18 Apr 2024 16:24:07 +0200
Subject: [PATCH 4/8] fix typo

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 57600c6..efd1069 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,7 +336,7 @@
                         </goals>
                         <configuration>
                             <target>
-                                <copy file="${project.basedir}/src/main/de/vdv/ojp/model/package-info.java"
+                                <copy file="${project.basedir}/src/main/java/de/vdv/ojp/model/package-info.java"
                                     todir="${project.build.directory}/generated-sources/xjc/de/vdv/ojp/model" overwrite="true"/>
                             </target>
                         </configuration>

From b3cac6f1766878304b7dca85978cf16a788a29c9 Mon Sep 17 00:00:00 2001
From: zabuTNT <f.bertolini@riseup.net>
Date: Thu, 18 Apr 2024 16:30:13 +0200
Subject: [PATCH 5/8] restore previous location

---
 pom.xml                                          |  2 +-
 src/main/java/de/vdv/ojp/model/package-info.java | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 src/main/java/de/vdv/ojp/model/package-info.java

diff --git a/pom.xml b/pom.xml
index efd1069..e028cad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,7 +336,7 @@
                         </goals>
                         <configuration>
                             <target>
-                                <copy file="${project.basedir}/src/main/java/de/vdv/ojp/model/package-info.java"
+                                <copy file="${project.basedir}/package-info.java"
                                     todir="${project.build.directory}/generated-sources/xjc/de/vdv/ojp/model" overwrite="true"/>
                             </target>
                         </configuration>
diff --git a/src/main/java/de/vdv/ojp/model/package-info.java b/src/main/java/de/vdv/ojp/model/package-info.java
deleted file mode 100644
index 5905224..0000000
--- a/src/main/java/de/vdv/ojp/model/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-@jakarta.xml.bind.annotation.XmlSchema(
-    namespace = "http://www.siri.org.uk/siri",
-    elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED,
-    xmlns = {
-        @jakarta.xml.bind.annotation.XmlNs(prefix = "ojp", namespaceURI = "http://www.vdv.de/ojp"),
-        @jakarta.xml.bind.annotation.XmlNs(prefix = "ifopt", namespaceURI = "http://www.ifopt.org.uk/ifopt"),
-        @jakarta.xml.bind.annotation.XmlNs(prefix = "acsb", namespaceURI = "http://www.ifopt.org.uk/acsb"),
-        @jakarta.xml.bind.annotation.XmlNs(prefix = "siri", namespaceURI = "http://www.siri.org.uk/siri")
-    }
-)
-package de.vdv.ojp.model;
-
-import jakarta.xml.bind.annotation.XmlNs;
-import jakarta.xml.bind.annotation.XmlNsForm;
-import jakarta.xml.bind.annotation.XmlSchema;

From 23d3cfc5bb750e523a9063cd7d7add321d2944fa Mon Sep 17 00:00:00 2001
From: zabuTNT <f.bertolini@riseup.net>
Date: Thu, 18 Apr 2024 16:31:18 +0200
Subject: [PATCH 6/8] add junkyard to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ddac564..be195c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 profile
+junkyard/
 .idea
 *.iml
 src/main/resources/xsd/

From fc99900551e4aa5ae9255d912a6ab0818e0ff89f Mon Sep 17 00:00:00 2001
From: zabuTNT <f.bertolini@riseup.net>
Date: Thu, 18 Apr 2024 16:43:41 +0200
Subject: [PATCH 7/8] restore previous location

---
 package-info.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package-info.java

diff --git a/package-info.java b/package-info.java
new file mode 100644
index 0000000..5905224
--- /dev/null
+++ b/package-info.java
@@ -0,0 +1,15 @@
+@jakarta.xml.bind.annotation.XmlSchema(
+    namespace = "http://www.siri.org.uk/siri",
+    elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED,
+    xmlns = {
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "ojp", namespaceURI = "http://www.vdv.de/ojp"),
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "ifopt", namespaceURI = "http://www.ifopt.org.uk/ifopt"),
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "acsb", namespaceURI = "http://www.ifopt.org.uk/acsb"),
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "siri", namespaceURI = "http://www.siri.org.uk/siri")
+    }
+)
+package de.vdv.ojp.model;
+
+import jakarta.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;

From 601b25918ec9e7e45aca87361c3cd64a93d7102d Mon Sep 17 00:00:00 2001
From: zabuTNT <f.bertolini@riseup.net>
Date: Fri, 19 Apr 2024 08:37:08 +0200
Subject: [PATCH 8/8] ignore .zip files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index be195c0..ceb4a31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ profile
 junkyard/
 .idea
 *.iml
+*.zip
 src/main/resources/xsd/