Skip to content

Commit

Permalink
Update p2 repo url in readme and baseline. Upversion to 1.6.0-SNAPSHOT
Browse files Browse the repository at this point in the history 
Signed-off-by: Fred Bricon <[email protected]>
  • Loading branch information
@fbricon
fbricon committed Jan 18, 2023
1 parent 396fcc2 commit c67a347
Show file tree
Hide file tree
Showing 16 changed files with 28 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pipeline {
options {
timeout(time: 180, unit: 'MINUTES')
timeout(time: 45, unit: 'MINUTES')
buildDiscarder(logRotator(numToKeepStr:'10'))
disableConcurrentBuilds(abortPrevious: true)
}
Expand All @@ -15,7 +15,7 @@ pipeline {
stage('Build') {
steps {
wrap([$class: 'Xvnc', useXauthority: true]) {
sh 'mvn clean verify -f pom.xml -B -Peclipse-sign,uts,its -Dtycho.surefire.timeout=7200'
sh 'mvn clean verify -f pom.xml -B -Peclipse-sign,uts,its,ci -Dtycho.surefire.timeout=7200'
}
}
post {
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maven Integration for Eclipse WTP, a.k.a m2e-wtp, aims at providing a tight inte

## 📥 Installation

[Install from p2 repository](https://download.eclipse.org/m2e-wtp/releases/latest)
[Install from p2 repository](https://download.eclipse.org/technology/m2e/m2e-wtp/releases/latest)

## Details

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.m2e.wtp.feature"
label="%featureName"
version="1.5.2.qualifier"
version="1.6.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.m2e.wtp"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.jaxrs.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.m2e.wtp.jaxrs.feature"
label="%featureName"
version="1.5.0.qualifier"
version="1.6.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.m2e.wtp.jaxrs"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.jaxrs/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.m2e.wtp.jaxrs;singleton:=true
Bundle-Version: 1.5.0.qualifier
Bundle-Version: 1.6.0.qualifier
Bundle-Activator: org.eclipse.m2e.wtp.jaxrs.internal.MavenJaxRsActivator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.jpa.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.m2e.wtp.jpa.feature"
label="%featureName"
version="1.5.0.qualifier"
version="1.6.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.m2e.wtp.jpa"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.jpa/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.m2e.wtp.jpa;singleton:=true
Bundle-Version: 1.5.0.qualifier
Bundle-Version: 1.6.0.qualifier
Bundle-Activator: org.eclipse.m2e.wtp.jpa.internal.MavenJpaActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.jsf.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.m2e.wtp.jsf.feature"
label="%featureName"
version="1.5.0.qualifier"
version="1.6.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.m2e.wtp.jsf"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.jsf/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.m2e.wtp.jsf;singleton:=true
Bundle-Version: 1.5.0.qualifier
Bundle-Version: 1.6.0.qualifier
Bundle-Activator: org.eclipse.m2e.wtp.jsf.internal.MavenJSFActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.overlay.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Overlay support for Eclipse WTP - UI
Bundle-SymbolicName: org.eclipse.m2e.wtp.overlay.ui;singleton:=true
Bundle-Version: 1.5.0.qualifier
Bundle-Version: 1.6.0.qualifier
Bundle-Activator: org.eclipse.m2e.wtp.overlay.internal.ui.OverlayUIPluginActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.overlay/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Overlay support for Eclipse WTP
Bundle-SymbolicName: org.eclipse.m2e.wtp.overlay;singleton:=true
Bundle-Version: 1.5.0.qualifier
Bundle-Version: 1.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.sdk.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.m2e.wtp.sdk.feature"
label="%featureName"
version="1.5.2.qualifier"
version="1.6.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp.target-platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.m2e.wtp</groupId>
<artifactId>org.eclipse.m2e.wtp.parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.m2e.wtp.target-platform</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.wtp/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Maven Integration for Eclipse WTP
Bundle-SymbolicName: org.eclipse.m2e.wtp;singleton:=true
Bundle-Version: 1.5.2.qualifier
Bundle-Version: 1.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.m2e.wtp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<parent>
<groupId>org.eclipse.m2e.wtp</groupId>
<artifactId>org.eclipse.m2e.wtp.parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.m2e.wtp</artifactId>
<packaging>eclipse-plugin</packaging>
<version>1.5.2-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>

<name>M2E-WTP :: Core</name>
</project>
15 changes: 11 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>org.eclipse.m2e.wtp</groupId>
<artifactId>org.eclipse.m2e.wtp.parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>M2E-WTP :: Parent</name>
Expand All @@ -23,7 +23,7 @@
<properties>
<tycho-version>3.0.1</tycho-version>
<tycho.scmUrl>scm:git:http://github.com/eclipse-m2e/m2e-wtp/m2e-wtp.git</tycho.scmUrl>

<git.dirtyWorkingTree>warning</git.dirtyWorkingTree>
<test.timeout>1800</test.timeout> <!-- 30 mins -->
<tycho.test.jvmArgs>-Xmx512m</tycho.test.jvmArgs>
<eclipse.target>latest</eclipse.target>
Expand Down Expand Up @@ -103,7 +103,7 @@
<artifact>
<groupId>org.eclipse.m2e.wtp</groupId>
<artifactId>org.eclipse.m2e.wtp.target-platform</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<classifier>m2e-wtp-latest</classifier>
</artifact>
</target>
Expand Down Expand Up @@ -133,7 +133,7 @@
</goals>
<configuration>
<baselines>
<baseline>https://download.eclipse.org/m2e-wtp/releases/latest/</baseline>
<baseline>https://download.eclipse.org/technology/m2e/m2e-wtp/releases/latest/</baseline>
</baselines>
</configuration>
</execution>
Expand Down Expand Up @@ -169,6 +169,7 @@
<sourceReferences>
<generate>true</generate>
</sourceReferences>
<jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>
pom.xml
Expand All @@ -193,6 +194,12 @@
</build>

<profiles>
<profile>
<id>ci</id>
<properties>
<git.dirtyWorkingTree>error</git.dirtyWorkingTree>
</properties>
</profile>
<profile>
<id>osx</id>
<activation>
Expand Down

1 comment on commit c67a347

@nitind
Copy link
Contributor

@nitind nitind commented on c67a347 May 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the repo also have declared a 1.6 release?

Please sign in to comment.