Skip to content

Commit

Permalink
Finish restructuring net.sghill.jenkins -> org.openrewrite.jenkins
Browse files Browse the repository at this point in the history
Issue #4
  • Loading branch information
sghill committed Jun 29, 2023
1 parent 9c1ef31 commit 849c8d8
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.sghill.jenkins.rewrite;
package org.openrewrite.jenkins;

import lombok.EqualsAndHashCode;
import lombok.Value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.sghill.jenkins.rewrite;
package org.openrewrite.jenkins;

import lombok.EqualsAndHashCode;
import lombok.Value;
Expand All @@ -22,7 +22,6 @@
import org.openrewrite.Preconditions;
import org.openrewrite.ScanningRecipe;
import org.openrewrite.TreeVisitor;
import org.openrewrite.jenkins.BomLookup;
import org.openrewrite.marker.SearchResult;
import org.openrewrite.maven.AddManagedDependency;
import org.openrewrite.maven.AddManagedDependencyVisitor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.openrewrite.jenkins;

import net.sghill.jenkins.rewrite.Jenkins;
import org.openrewrite.ExecutionContext;
import org.openrewrite.Preconditions;
import org.openrewrite.ScanningRecipe;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/openrewrite/jenkins/IsJenkinsPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import lombok.EqualsAndHashCode;
import lombok.Value;
import net.sghill.jenkins.rewrite.Jenkins;
import org.openrewrite.*;
import org.openrewrite.marker.SearchResult;
import org.openrewrite.semver.Semver;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.sghill.jenkins.rewrite;
package org.openrewrite.jenkins;

import org.openrewrite.SourceFile;
import org.openrewrite.internal.lang.Nullable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@

import lombok.EqualsAndHashCode;
import lombok.Value;
import net.sghill.jenkins.rewrite.AddDependency;
import org.openrewrite.ExecutionContext;
import org.openrewrite.Recipe;
import org.openrewrite.TreeVisitor;
import org.openrewrite.maven.MavenVisitor;
import org.openrewrite.maven.RemoveDependency;
import org.openrewrite.maven.tree.ResolvedDependency;
import org.openrewrite.xml.AddCommentToXmlTag;
import org.openrewrite.xml.AddToTagVisitor;
import org.openrewrite.xml.XPathMatcher;
import org.openrewrite.xml.tree.Xml;
Expand Down
42 changes: 21 additions & 21 deletions src/main/resources/META-INF/rewrite/rewrite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ recipeList:
# matchOverrides: true
---
type: specs.openrewrite.org/v1beta/recipe
name: net.sghill.jenkins.rewrite.UpgradeParentPom_4_67
name: org.openrewrite.jenkins.UpgradeParentPom_4_67
displayName: Migrate to Parent POM 4.67
description: Upgrade to Parent POM 4.67
recipeList:
Expand All @@ -49,7 +49,7 @@ recipeList:
oldArtifactId: plugin
newVersion: 4.67
allowVersionDowngrades: false
- net.sghill.jenkins.rewrite.UpgradeParentPom_4_66
- org.openrewrite.jenkins.UpgradeParentPom_4_66
---
type: specs.openrewrite.org/v1beta/recipe
name: org.openrewrite.jenkins.UpgradeParentPom_4_66
Expand All @@ -61,11 +61,11 @@ recipeList:
oldArtifactId: plugin
newVersion: 4.66
allowVersionDowngrades: false
- net.sghill.jenkins.rewrite.UpgradeHtmlUnit_3_3_0
- net.sghill.jenkins.rewrite.UpgradeParentPom_4_55
- org.openrewrite.jenkins.UpgradeHtmlUnit_3_3_0
- org.openrewrite.jenkins.UpgradeParentPom_4_55
---
type: specs.openrewrite.org/v1beta/recipe
name: net.sghill.jenkins.rewrite.UpgradeParentPom_4_55
name: org.openrewrite.jenkins.UpgradeParentPom_4_55
displayName: Migrate to Parent POM 4.55
description: Upgrade to Parent POM 4.55
recipeList:
Expand All @@ -82,10 +82,10 @@ recipeList:
newVersion: 5.0.0
overrideManagedVersion: false
# TODO: More Mockito 5 migration
- net.sghill.jenkins.rewrite.UpgradeParentPom_4_52
- org.openrewrite.jenkins.UpgradeParentPom_4_52
---
type: specs.openrewrite.org/v1beta/recipe
name: net.sghill.jenkins.rewrite.UpgradeParentPom_4_52
name: org.openrewrite.jenkins.UpgradeParentPom_4_52
displayName: Migrate to Parent POM 4.52
description: Upgrade to Parent POM 4.52 (requires Java 11)
recipeList:
Expand All @@ -94,7 +94,7 @@ recipeList:
oldArtifactId: plugin
newVersion: 4.52
allowVersionDowngrades: false
- net.sghill.jenkins.rewrite.UpgradeVersionProperty:
- org.openrewrite.jenkins.UpgradeVersionProperty:
key: jenkins.version
minimumVersion: 2.361.4
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
Expand All @@ -103,10 +103,10 @@ recipeList:
newGroupId: io.jenkins.tools.bom
newArtifactId: bom-2.361.x
newVersion: latest.release
- net.sghill.jenkins.rewrite.UpgradeParentPom_4_50
- org.openrewrite.jenkins.UpgradeParentPom_4_50
---
type: specs.openrewrite.org/v1beta/recipe
name: net.sghill.jenkins.rewrite.UpgradeParentPom_4_50
name: org.openrewrite.jenkins.UpgradeParentPom_4_50
displayName: Migrate to Parent POM 4.50
description: Upgrade to Parent POM 4.50
recipeList:
Expand All @@ -115,11 +115,11 @@ recipeList:
oldArtifactId: plugin
newVersion: 4.50
allowVersionDowngrades: false
- net.sghill.jenkins.rewrite.UpgradeParentPom_4_49
- org.openrewrite.jenkins.UpgradeParentPom_4_49
# TODO: min jenkins 2.326 if jcip annotations used
---
type: specs.openrewrite.org/v1beta/recipe
name: net.sghill.jenkins.rewrite.UpgradeParentPom_4_49
name: org.openrewrite.jenkins.UpgradeParentPom_4_49
displayName: Migrate to Parent POM 4.49
description: Upgrade to Parent POM 4.49
recipeList:
Expand All @@ -128,11 +128,11 @@ recipeList:
oldArtifactId: plugin
newVersion: 4.49
allowVersionDowngrades: false
- net.sghill.jenkins.rewrite.UpgradeParentPom_4_46
- org.openrewrite.jenkins.UpgradeParentPom_4_46
# TODO: run build and check for you-must-override-the-yarn.version-property to know if properties must be added
---
type: specs.openrewrite.org/v1beta/recipe
name: net.sghill.jenkins.rewrite.UpgradeParentPom_4_46
name: org.openrewrite.jenkins.UpgradeParentPom_4_46
displayName: Migrate to Parent POM 4.46
description: Upgrade to Parent POM 4.46
recipeList:
Expand All @@ -145,10 +145,10 @@ recipeList:
groupPattern: junit
artifactPattern: junit
onlyIfVersionsMatch: false
- net.sghill.jenkins.rewrite.UpgradeParentPom_4_43_1
- org.openrewrite.jenkins.UpgradeParentPom_4_43_1
---
type: specs.openrewrite.org/v1beta/recipe
name: net.sghill.jenkins.rewrite.UpgradeParentPom_4_43_1
name: org.openrewrite.jenkins.UpgradeParentPom_4_43_1
displayName: Migrate to Parent POM 4.43.1
description: Upgrade to Parent POM 4.43.1
recipeList:
Expand All @@ -157,11 +157,11 @@ recipeList:
oldArtifactId: plugin
newVersion: 4.43.1
allowVersionDowngrades: false
- net.sghill.jenkins.rewrite.UpgradeParentPom_4_40
- org.openrewrite.jenkins.UpgradeParentPom_4_40
# TODO: jenkins.version 2.249.1 w/o downgrades
---
type: specs.openrewrite.org/v1beta/recipe
name: net.sghill.jenkins.rewrite.UpgradeParentPom_4_40
name: org.openrewrite.jenkins.UpgradeParentPom_4_40
displayName: Migrate to Parent POM 4.40
description: Upgrade to Parent POM 4.40
recipeList:
Expand All @@ -182,7 +182,7 @@ recipeList:
])
---
type: specs.openrewrite.org/v1beta/recipe
name: net.sghill.jenkins.RemoveDep
name: org.openrewrite.jenkins.RemoveDep
recipeList:
- org.openrewrite.maven.RemoveDependency:
groupId: org.jenkins-ci
Expand All @@ -208,14 +208,14 @@ recipeList:
- org.openrewrite.jenkins.ChangeJenkinsVersion:
parentPomVersion: "4.64"
jenkinsVersion: "2.332.1"
- net.sghill.jenkins.rewrite.AddPluginsBom:
- org.openrewrite.jenkins.AddPluginsBom:
bomName: bom-2.332.x
bomVersion: "1763.v092b_8980a_f5e"
- org.openrewrite.jenkins.DisableLocalResolutionForParentPom
- org.openrewrite.maven.RemoveProperty:
# as of parent pom 4.40 this is deprecated and unused
propertyName: java.level
- net.sghill.jenkins.RemoveDep
- org.openrewrite.jenkins.RemoveDep
- org.openrewrite.maven.security.UseHttpsForRepositories
---
type: specs.openrewrite.org/v1beta/recipe
Expand Down

0 comments on commit 849c8d8

Please sign in to comment.