Skip to content

Commit b695af4

Browse files
palemieuxpalemieux
committed
Fixed deployment
1 parent a048ff5 commit b695af4

File tree

7 files changed

+72
-76
lines changed

7 files changed

+72
-76
lines changed

‎class-generator/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<dependency>
1919
<groupId>org.junit.jupiter</groupId>
2020
<artifactId>junit-jupiter-api</artifactId>
21-
<version>5.12.1</version>
2221
<scope>test</scope>
2322
</dependency>
2423
<dependency>

‎class-generator/src/main/java/com/sandflow/smpte/mxf/ClassGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
import jakarta.xml.bind.JAXBException;
116116

117117
public class ClassGenerator {
118-
static final Handlebars handlebars = new Handlebars().with(EscapingStrategy.HTML_ENTITY);
118+
static final Handlebars handlebars = new Handlebars();
119119
static final Template classTemplate;
120120
static final Template enumerationTemplate;
121121
static final Template recordTemplate;
@@ -128,7 +128,7 @@ public class ClassGenerator {
128128

129129
static {
130130
try {
131-
classTemplate = handlebars.compile("hbs/Class.java");
131+
classTemplate = handlebars.with(EscapingStrategy.HTML_ENTITY).compile("hbs/Class.java");
132132
enumerationTemplate = handlebars.compile("hbs/Enumeration.java");
133133
recordTemplate = handlebars.compile("hbs/Record.java");
134134
classFactoryTemplate = handlebars.compile("hbs/ClassFactoryInitializer.java");

‎class-generator/src/main/resources/hbs/Class.java.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import com.sandflow.smpte.klv.Set;
4848

4949

5050
/**
51-
* {{#if isAbstract}}<<abstract>> {{/if}}{{className}}
51+
* {{#if isAbstract}}&lt;&lt;abstract&gt;&gt; {{/if}}{{className}}
5252
*{{#each allMembers}}
5353
* - {{symbol}} : {{typeDefinition}}{{#if isOptional}} [0..1]{{/if}}{{/each}}
5454
*/

‎common/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<dependency>
1414
<groupId>org.junit.jupiter</groupId>
1515
<artifactId>junit-jupiter-api</artifactId>
16-
<version>5.12.1</version>
1716
<scope>test</scope>
1817
</dependency>
1918
<dependency>

‎library/pom.xml‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<dependency>
5454
<groupId>org.junit.jupiter</groupId>
5555
<artifactId>junit-jupiter-api</artifactId>
56-
<version>5.12.1</version>
5756
<scope>test</scope>
5857
</dependency>
5958
<dependency>
@@ -163,73 +162,4 @@
163162
</plugins>
164163
</build>
165164

166-
<profiles>
167-
<profile>
168-
<id>release</id>
169-
<distributionManagement>
170-
<snapshotRepository>
171-
<id>ossrh</id>
172-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
173-
</snapshotRepository>
174-
<repository>
175-
<id>ossrh</id>
176-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
177-
</repository>
178-
</distributionManagement>
179-
<build>
180-
<plugins>
181-
<plugin>
182-
<groupId>org.apache.maven.plugins</groupId>
183-
<artifactId>maven-source-plugin</artifactId>
184-
<version>2.2.1</version>
185-
<executions>
186-
<execution>
187-
<id>attach-sources</id>
188-
<goals>
189-
<goal>jar-no-fork</goal>
190-
</goals>
191-
</execution>
192-
</executions>
193-
</plugin>
194-
<plugin>
195-
<groupId>org.apache.maven.plugins</groupId>
196-
<artifactId>maven-javadoc-plugin</artifactId>
197-
<version>2.9.1</version>
198-
<executions>
199-
<execution>
200-
<id>attach-javadocs</id>
201-
<goals>
202-
<goal>jar</goal>
203-
</goals>
204-
</execution>
205-
</executions>
206-
</plugin>
207-
<plugin>
208-
<groupId>org.apache.maven.plugins</groupId>
209-
<artifactId>maven-gpg-plugin</artifactId>
210-
<version>1.5</version>
211-
<executions>
212-
<execution>
213-
<id>sign-artifacts</id>
214-
<phase>verify</phase>
215-
<goals>
216-
<goal>sign</goal>
217-
</goals>
218-
</execution>
219-
</executions>
220-
</plugin>
221-
<plugin>
222-
<groupId>org.sonatype.central</groupId>
223-
<artifactId>central-publishing-maven-plugin</artifactId>
224-
<version>0.8.0</version>
225-
<extensions>true</extensions>
226-
<configuration>
227-
<publishingServerId>central</publishingServerId>
228-
</configuration>
229-
</plugin>
230-
</plugins>
231-
</build>
232-
</profile>
233-
</profiles>
234-
235165
</project>

‎library/src/test/java/com/sandflow/smpte/mxf/TestUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static Identification makeIdentification(UIDGenerator uidg) {
8787

8888
private static final String outputDirPath = "target/test-output/";
8989

90-
{
90+
static {
9191
File outputDir = new File(outputDirPath);
9292
if (!outputDir.exists()) {
9393
outputDir.mkdirs();

‎pom.xml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,73 @@
2121
<module>library</module>
2222
</modules>
2323

24+
<dependencyManagement>
25+
<dependencies>
26+
<dependency>
27+
<groupId>org.junit.jupiter</groupId>
28+
<artifactId>junit-jupiter-api</artifactId>
29+
<version>5.14.0</version>
30+
<scope>test</scope>
31+
</dependency>
32+
</dependencies>
33+
</dependencyManagement>
2434

35+
<profiles>
36+
<profile>
37+
<id>release</id>
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-source-plugin</artifactId>
43+
<version>3.4.0</version>
44+
<executions>
45+
<execution>
46+
<id>attach-sources</id>
47+
<goals>
48+
<goal>jar-no-fork</goal>
49+
</goals>
50+
</execution>
51+
</executions>
52+
</plugin>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-javadoc-plugin</artifactId>
56+
<version>3.12.0</version>
57+
<executions>
58+
<execution>
59+
<id>attach-javadocs</id>
60+
<goals>
61+
<goal>jar</goal>
62+
</goals>
63+
</execution>
64+
</executions>
65+
</plugin>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-gpg-plugin</artifactId>
69+
<version>3.2.8</version>
70+
<executions>
71+
<execution>
72+
<id>sign-artifacts</id>
73+
<phase>verify</phase>
74+
<goals>
75+
<goal>sign</goal>
76+
</goals>
77+
</execution>
78+
</executions>
79+
</plugin>
80+
<plugin>
81+
<groupId>org.sonatype.central</groupId>
82+
<artifactId>central-publishing-maven-plugin</artifactId>
83+
<version>0.9.0</version>
84+
<extensions>true</extensions>
85+
<configuration>
86+
<publishingServerId>central</publishingServerId>
87+
</configuration>
88+
</plugin>
89+
</plugins>
90+
</build>
91+
</profile>
92+
</profiles>
2593
</project>

0 commit comments

Comments
 (0)