Skip to content

Commit 02d6897

Browse files
committed
remove JAXB for jdk11
1 parent 8a85ca8 commit 02d6897

File tree

348 files changed

+2235
-2453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

348 files changed

+2235
-2453
lines changed

pom.rb

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,24 @@
2222
:connection => 'scm:git:git://github.com/ruby-processing/toxiclibs.git',
2323
:developer_connection => 'scm:git:[email protected]:ruby-processing/toxiclibs.git' )
2424

25-
properties( 'target.release' => '11',
25+
properties( 'source.directory' => 'src',
26+
'target.release' => '11',
2627
'project.build.sourceEncoding' => 'UTF-8',
27-
'maven.compiler.target' => '1.8',
2828
'polyglot.dump.pom' => 'pom.xml'
2929
)
3030

31-
jar 'args4j:args4j:2.0.31'
3231
jar 'org.processing:core:3.3.7'
33-
jar 'javax.xml.bind:jaxb-api:2.3.0'
34-
35-
plugin( :compiler, '3.8.1',
36-
'release' => '${target.release}' )
37-
plugin( :jar, '3.1.1',
38-
'archive' => {
39-
'manifestFile' => 'MANIFEST.MF'
40-
} )
32+
33+
34+
plugin(:compiler, '3.8.1',
35+
'release' => '${target.release}')
36+
plugin(:javadoc, '2.10.4',
37+
'detectOfflineLinks' => 'false',
38+
'links' => ['${processing.api}',
39+
'${jruby.api}'])
40+
plugin :jdeps, '3.1.2' do
41+
execute_goals 'jdkinternals', 'test-jdkinternals'
42+
end
4143
plugin :resources, '3.1.0'
4244
plugin :dependency, '3.1.1' do
4345
execute_goals( :id => 'default-cli',
@@ -50,8 +52,11 @@
5052

5153

5254
build do
55+
resource do
56+
excludes '**/**/*.java'
57+
end
5358
default_goal 'package'
54-
source_directory 'src'
59+
source_directory '${source.directory}/main/java'
5560
final_name 'toxiclibs'
5661
end
5762
end

pom.xml

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DO NOT MODIFIY - GENERATED CODE
66
77
88
-->
9-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
9+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
1010
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>ruby-processing</groupId>
@@ -44,31 +44,29 @@ DO NOT MODIFIY - GENERATED CODE
4444
<url>https://github.com/ruby-processing/toxiclibs/issues</url>
4545
</issueManagement>
4646
<properties>
47-
<maven.compiler.target>1.8</maven.compiler.target>
4847
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
4948
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
49+
<source.directory>src</source.directory>
5050
<target.release>11</target.release>
5151
</properties>
5252
<dependencies>
53-
<dependency>
54-
<groupId>args4j</groupId>
55-
<artifactId>args4j</artifactId>
56-
<version>2.0.31</version>
57-
</dependency>
5853
<dependency>
5954
<groupId>org.processing</groupId>
6055
<artifactId>core</artifactId>
6156
<version>3.3.7</version>
6257
</dependency>
63-
<dependency>
64-
<groupId>javax.xml.bind</groupId>
65-
<artifactId>jaxb-api</artifactId>
66-
<version>2.3.0</version>
67-
</dependency>
6858
</dependencies>
6959
<build>
70-
<sourceDirectory>src</sourceDirectory>
60+
<sourceDirectory>${source.directory}/main/java</sourceDirectory>
7161
<defaultGoal>package</defaultGoal>
62+
<resources>
63+
<resource>
64+
<directory>${basedir}</directory>
65+
<excludes>
66+
<exclude>**/**/*.java</exclude>
67+
</excludes>
68+
</resource>
69+
</resources>
7270
<finalName>toxiclibs</finalName>
7371
<plugins>
7472
<plugin>
@@ -79,14 +77,28 @@ DO NOT MODIFIY - GENERATED CODE
7977
</configuration>
8078
</plugin>
8179
<plugin>
82-
<artifactId>maven-jar-plugin</artifactId>
83-
<version>3.1.1</version>
80+
<artifactId>maven-javadoc-plugin</artifactId>
81+
<version>2.10.4</version>
8482
<configuration>
85-
<archive>
86-
<manifestFile>MANIFEST.MF</manifestFile>
87-
</archive>
83+
<detectOfflineLinks>false</detectOfflineLinks>
84+
<links>
85+
<link>${processing.api}</link>
86+
<link>${jruby.api}</link>
87+
</links>
8888
</configuration>
8989
</plugin>
90+
<plugin>
91+
<artifactId>maven-jdeps-plugin</artifactId>
92+
<version>3.1.2</version>
93+
<executions>
94+
<execution>
95+
<goals>
96+
<goal>jdkinternals</goal>
97+
<goal>test-jdkinternals</goal>
98+
</goals>
99+
</execution>
100+
</executions>
101+
</plugin>
90102
<plugin>
91103
<artifactId>maven-resources-plugin</artifactId>
92104
<version>3.1.0</version>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
import java.util.Iterator;
3434
import java.util.List;
3535

36-
import javax.xml.bind.annotation.XmlElement;
37-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
36+
3837

3938
import toxi.color.theory.ColorTheoryRegistry;
4039
import toxi.color.theory.ColorTheoryStrategy;
@@ -160,8 +159,7 @@ public static final ColorList createUsingStrategy(String name, TColor c) {
160159
/**
161160
*
162161
*/
163-
@XmlElement(name = "col")
164-
@XmlJavaTypeAdapter(TColorAdapter.class)
162+
165163
protected List<TColor> colors;
166164

167165
/**

0 commit comments

Comments
 (0)