[572274] Add/update jakarta.xml.bind build-time dependencies
Change-Id: I323ebb7761fe977f0f3ea35833a9e98224a169be
diff --git a/common/features/org.eclipse.jpt.common.tests.feature/feature.xml b/common/features/org.eclipse.jpt.common.tests.feature/feature.xml
index 0e6d74d..8ac9514 100644
--- a/common/features/org.eclipse.jpt.common.tests.feature/feature.xml
+++ b/common/features/org.eclipse.jpt.common.tests.feature/feature.xml
@@ -15,7 +15,7 @@
<feature
id="org.eclipse.jpt.common.tests.feature"
label="%featureName"
- version="1.4.0.qualifier"
+ version="1.4.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
diff --git a/common/features/org.eclipse.jpt.common.tests.feature/pom.xml b/common/features/org.eclipse.jpt.common.tests.feature/pom.xml
index 8c04a40..2b004ae 100644
--- a/common/features/org.eclipse.jpt.common.tests.feature/pom.xml
+++ b/common/features/org.eclipse.jpt.common.tests.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.tests.feature</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/common/tests/org.eclipse.jpt.common.core.tests/META-INF/MANIFEST.MF b/common/tests/org.eclipse.jpt.common.core.tests/META-INF/MANIFEST.MF
index 225cfa3..04ab1e7 100644
--- a/common/tests/org.eclipse.jpt.common.core.tests/META-INF/MANIFEST.MF
+++ b/common/tests/org.eclipse.jpt.common.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.common.core.tests;singleton:=true
-Bundle-Version: 1.5.1.qualifier
+Bundle-Version: 1.5.2.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
@@ -14,6 +14,7 @@
org.eclipse.jpt.common.core,
org.eclipse.jpt.common.utility,
org.eclipse.jpt.common.utility.tests,
+ org.eclipse.jst.common.project.facet.core,
org.eclipse.wst.common.project.facet.core,
org.eclipse.wst.validation,
org.junit
diff --git a/common/tests/org.eclipse.jpt.common.core.tests/pom.xml b/common/tests/org.eclipse.jpt.common.core.tests/pom.xml
index 88d1ced..fc932c5 100644
--- a/common/tests/org.eclipse.jpt.common.core.tests/pom.xml
+++ b/common/tests/org.eclipse.jpt.common.core.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.core.tests</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.5.2-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/common/tests/org.eclipse.jpt.common.core.tests/src/org/eclipse/jpt/common/core/tests/internal/projects/JavaProjectTestHarness.java b/common/tests/org.eclipse.jpt.common.core.tests/src/org/eclipse/jpt/common/core/tests/internal/projects/JavaProjectTestHarness.java
index 6e9b60b..8682b29 100644
--- a/common/tests/org.eclipse.jpt.common.core.tests/src/org/eclipse/jpt/common/core/tests/internal/projects/JavaProjectTestHarness.java
+++ b/common/tests/org.eclipse.jpt.common.core.tests/src/org/eclipse/jpt/common/core/tests/internal/projects/JavaProjectTestHarness.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0, which accompanies this distribution
* and is available at https://www.eclipse.org/legal/epl-2.0/.
@@ -19,6 +19,7 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.common.utility.internal.ArrayTools;
+import org.eclipse.jst.common.project.facet.core.internal.FacetCorePlugin;
/**
* This builds and holds a "Java" project.
@@ -43,7 +44,7 @@
super(projectName, autoBuild);
this.installFacet("jst.java", "5.0");
this.javaProject = JavaCore.create(this.getProject());
- this.sourceFolder = this.javaProject.getPackageFragmentRoot(this.getProject().getFolder("src"));
+ this.sourceFolder = this.javaProject.getPackageFragmentRoot(this.getProject().getFolder(FacetCorePlugin.DEFAULT_SOURCE_FOLDER));
}
public void addJar(String jarPath) throws JavaModelException {
diff --git a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/feature.xml b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/feature.xml
index 77f84bb..292d5dd 100644
--- a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/feature.xml
+++ b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/feature.xml
@@ -15,7 +15,7 @@
<feature
id="org.eclipse.jpt.jaxb.eclipselink.feature"
label="%featureName"
- version="1.4.202.qualifier"
+ version="1.4.203.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jpt.jaxb.eclipselink.branding"
license-feature="org.eclipse.license"
diff --git a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/pom.xml b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/pom.xml
index fbac17f..d23139e 100644
--- a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/pom.xml
+++ b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.eclipselink.feature</artifactId>
- <version>1.4.202-SNAPSHOT</version>
+ <version>1.4.203-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml b/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml
index 31c5cb0..c999664 100644
--- a/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml
+++ b/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml
@@ -11,11 +11,10 @@
Contributors:
IBM Corporation - initial API and implementation
-->
-
<feature
id="org.eclipse.jpt.jaxb.feature"
label="%featureName"
- version="1.5.200.qualifier"
+ version="1.5.201.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jpt.jaxb.branding"
license-feature="org.eclipse.license"
diff --git a/jaxb/features/org.eclipse.jpt.jaxb.feature/pom.xml b/jaxb/features/org.eclipse.jpt.jaxb.feature/pom.xml
index ceeb75e..3589e1d 100644
--- a/jaxb/features/org.eclipse.jpt.jaxb.feature/pom.xml
+++ b/jaxb/features/org.eclipse.jpt.jaxb.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.feature</artifactId>
- <version>1.5.200-SNAPSHOT</version>
+ <version>1.5.201-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/META-INF/MANIFEST.MF
index c361195..e4e12a0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.core.schemagen;singleton:=true
-Bundle-Version: 1.1.201.qualifier
+Bundle-Version: 1.1.202.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/pom.xml
index 1674ee2..e6dc0ab 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/pom.xml
@@ -22,6 +22,27 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.core.schemagen</artifactId>
- <version>1.1.201-SNAPSHOT</version>
+ <version>1.1.202-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>jakarta.xml.bind</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/META-INF/MANIFEST.MF
index d5742bc..374fe7b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.eclipselink.core.schemagen;singleton:=true
-Bundle-Version: 1.2.201.qualifier
+Bundle-Version: 1.2.202.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/pom.xml
index 7d4d5ba..6dc2cfc 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.eclipselink.core.schemagen</artifactId>
- <version>1.2.201-SNAPSHOT</version>
+ <version>1.2.202-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
@@ -35,7 +35,7 @@
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
- <id>javax.xml.bind</id>
+ <id>jakarta.xml.bind</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
